diff --git a/go/vt/sqlparser/parse_test.go b/go/vt/sqlparser/parse_test.go
index be86d96a6df..8877e6b003a 100644
--- a/go/vt/sqlparser/parse_test.go
+++ b/go/vt/sqlparser/parse_test.go
@@ -670,6 +670,9 @@ var (
 	}, {
 		input:  "set charset default",
 		output: "set ",
+	}, {
+		input:  "set wait_timeout = 3600, names 'utf8'",
+		output: "set wait_timeout = 3600",
 	}, {
 		input:  "set session wait_timeout = 3600",
 		output: "set session wait_timeout = 3600",
diff --git a/go/vt/sqlparser/sql.go b/go/vt/sqlparser/sql.go
index 4f644a55bcb..dcfadcebca7 100644
--- a/go/vt/sqlparser/sql.go
+++ b/go/vt/sqlparser/sql.go
@@ -543,264 +543,253 @@ var yyExca = [...]int{
 	5, 27,
 	-2, 4,
 	-1, 215,
-	109, 526,
-	-2, 522,
-	-1, 216,
 	109, 527,
 	-2, 523,
+	-1, 216,
+	109, 528,
+	-2, 524,
 	-1, 283,
-	80, 667,
-	109, 667,
-	-2, 52,
-	-1, 284,
-	80, 640,
-	109, 640,
+	80, 668,
+	109, 668,
 	-2, 53,
+	-1, 284,
+	80, 641,
+	109, 641,
+	-2, 54,
 	-1, 285,
-	80, 627,
-	109, 627,
-	-2, 47,
+	80, 628,
+	109, 628,
+	-2, 48,
 	-1, 287,
-	80, 654,
-	109, 654,
-	-2, 49,
+	80, 655,
+	109, 655,
+	-2, 50,
 	-1, 651,
-	109, 529,
-	-2, 525,
-	-1, 835,
+	109, 530,
+	-2, 526,
+	-1, 837,
 	5, 28,
-	-2, 351,
-	-1, 855,
+	-2, 352,
+	-1, 857,
 	5, 27,
-	-2, 474,
-	-1, 1041,
-	5, 28,
 	-2, 475,
-	-1, 1080,
-	5, 27,
-	-2, 477,
-	-1, 1128,
+	-1, 1045,
 	5, 28,
+	-2, 476,
+	-1, 1084,
+	5, 27,
 	-2, 478,
+	-1, 1132,
+	5, 28,
+	-2, 479,
 }
 
 const yyPrivate = 57344
 
-const yyLast = 8819
+const yyLast = 9095
 
 var yyAct = [...]int{
 
-	246, 47, 1119, 783, 596, 965, 220, 279, 490, 1047,
-	987, 725, 893, 780, 966, 320, 741, 535, 194, 777,
-	489, 3, 962, 907, 740, 222, 872, 944, 764, 858,
-	686, 533, 53, 676, 827, 910, 750, 861, 653, 683,
-	706, 537, 282, 423, 245, 773, 292, 522, 47, 738,
-	52, 435, 698, 443, 188, 270, 199, 429, 203, 218,
-	1147, 1137, 274, 269, 1145, 1126, 758, 1143, 193, 784,
-	288, 322, 1136, 1106, 456, 455, 465, 466, 458, 459,
-	460, 461, 462, 463, 464, 457, 957, 273, 467, 1035,
-	207, 296, 1096, 268, 57, 889, 1125, 313, 189, 190,
-	191, 192, 502, 757, 1059, 1073, 765, 1030, 992, 993,
-	994, 1028, 303, 187, 415, 416, 1144, 995, 1142, 59,
-	60, 61, 62, 63, 1120, 929, 707, 945, 685, 304,
-	752, 299, 1094, 155, 752, 456, 455, 465, 466, 458,
-	459, 460, 461, 462, 463, 464, 457, 602, 421, 467,
-	726, 728, 154, 595, 155, 947, 871, 870, 293, 315,
-	300, 317, 883, 157, 158, 159, 869, 479, 480, 1111,
-	294, 216, 319, 319, 319, 319, 167, 319, 319, 828,
-	156, 1044, 926, 876, 319, 314, 316, 949, 928, 953,
-	821, 948, 625, 946, 553, 447, 308, 894, 951, 467,
-	47, 457, 74, 622, 467, 1107, 164, 950, 442, 164,
-	1010, 552, 952, 954, 959, 476, 699, 599, 478, 1001,
-	432, 751, 660, 727, 765, 751, 749, 748, 1095, 1093,
-	431, 628, 629, 164, 164, 887, 658, 659, 657, 164,
-	699, 74, 845, 477, 1114, 488, 312, 492, 493, 494,
-	495, 496, 497, 498, 996, 501, 503, 503, 503, 503,
-	503, 503, 503, 503, 511, 512, 513, 514, 1124, 1002,
-	440, 839, 306, 838, 437, 534, 918, 441, 440, 927,
-	1064, 925, 213, 1063, 441, 440, 442, 288, 547, 441,
-	440, 918, 441, 440, 442, 433, 319, 549, 50, 961,
-	273, 442, 319, 840, 916, 754, 442, 1130, 656, 442,
-	755, 319, 319, 319, 319, 319, 319, 319, 319, 916,
-	643, 645, 646, 153, 902, 644, 164, 901, 164, 818,
-	819, 820, 164, 460, 461, 462, 463, 464, 457, 164,
-	677, 467, 678, 74, 74, 74, 74, 890, 74, 74,
-	1076, 441, 440, 1062, 318, 74, 900, 1000, 607, 504,
-	505, 506, 507, 508, 509, 510, 989, 917, 442, 1133,
-	422, 1084, 1117, 919, 912, 913, 920, 915, 914, 884,
-	609, 74, 917, 422, 267, 1084, 422, 422, 919, 912,
-	913, 920, 915, 914, 922, 786, 456, 455, 465, 466,
-	458, 459, 460, 461, 462, 463, 464, 457, 679, 911,
-	467, 1084, 1085, 1099, 1056, 1055, 319, 319, 593, 456,
+	246, 47, 596, 1123, 490, 782, 785, 213, 220, 279,
+	968, 896, 489, 3, 725, 991, 969, 910, 743, 194,
+	1051, 779, 965, 535, 533, 421, 947, 860, 742, 874,
+	282, 245, 188, 766, 676, 913, 829, 548, 863, 686,
+	698, 53, 752, 683, 423, 429, 653, 281, 47, 537,
+	292, 706, 775, 522, 270, 435, 199, 443, 203, 269,
+	193, 322, 274, 740, 52, 1151, 1141, 502, 218, 800,
+	1149, 1130, 288, 1147, 786, 1140, 189, 190, 191, 192,
+	960, 1039, 1129, 799, 296, 1100, 268, 57, 892, 759,
+	1063, 767, 313, 1034, 1077, 1032, 318, 187, 1146, 207,
+	996, 997, 998, 415, 416, 1148, 1124, 932, 707, 999,
+	804, 754, 59, 60, 61, 62, 63, 303, 304, 798,
+	1098, 299, 155, 929, 209, 948, 726, 728, 154, 931,
+	155, 157, 158, 159, 754, 602, 595, 873, 300, 293,
+	1110, 456, 455, 465, 466, 458, 459, 460, 461, 462,
+	463, 464, 457, 950, 315, 467, 317, 1115, 872, 222,
+	871, 167, 886, 294, 156, 479, 480, 795, 792, 793,
+	1048, 791, 319, 319, 319, 319, 879, 319, 319, 823,
+	314, 316, 625, 553, 319, 952, 622, 956, 447, 951,
+	308, 949, 1005, 897, 802, 805, 954, 442, 685, 727,
+	47, 457, 753, 467, 467, 953, 1014, 751, 750, 552,
+	955, 957, 432, 767, 962, 476, 1099, 1097, 478, 699,
+	930, 273, 928, 441, 440, 753, 599, 441, 440, 797,
+	964, 481, 482, 483, 484, 485, 486, 487, 842, 431,
+	442, 312, 1006, 796, 442, 488, 1000, 492, 493, 494,
+	495, 496, 497, 498, 1128, 501, 503, 503, 503, 503,
+	503, 503, 503, 503, 511, 512, 513, 514, 801, 412,
+	413, 414, 1111, 417, 418, 534, 890, 306, 660, 803,
+	420, 440, 173, 624, 1118, 50, 441, 440, 433, 288,
+	547, 437, 658, 659, 657, 656, 319, 442, 699, 153,
+	847, 1068, 319, 442, 921, 756, 183, 820, 821, 822,
+	757, 319, 319, 319, 319, 319, 319, 319, 319, 623,
+	426, 430, 1067, 216, 504, 505, 506, 507, 508, 509,
+	510, 905, 919, 628, 629, 441, 440, 448, 921, 456,
 	455, 465, 466, 458, 459, 460, 461, 462, 463, 464,
-	457, 982, 422, 467, 524, 527, 528, 529, 525, 164,
-	526, 530, 1043, 422, 862, 863, 164, 164, 164, 21,
-	630, 1007, 1006, 74, 458, 459, 460, 461, 462, 463,
-	464, 457, 310, 650, 467, 1004, 1003, 74, 833, 422,
-	164, 305, 164, 74, 293, 164, 655, 1098, 164, 47,
-	164, 997, 74, 74, 74, 74, 74, 74, 74, 74,
-	519, 422, 632, 492, 518, 654, 546, 649, 647, 688,
-	422, 555, 554, 244, 688, 198, 481, 482, 483, 484,
-	485, 486, 487, 690, 1039, 544, 934, 23, 519, 651,
-	274, 274, 274, 274, 274, 288, 709, 412, 413, 414,
-	963, 417, 418, 546, 72, 534, 54, 729, 420, 680,
-	681, 853, 519, 274, 854, 273, 273, 273, 273, 273,
-	696, 859, 703, 288, 1009, 690, 545, 23, 543, 833,
-	273, 1005, 23, 877, 50, 624, 859, 289, 273, 737,
-	742, 833, 626, 297, 732, 833, 711, 712, 722, 714,
-	730, 631, 731, 710, 1079, 50, 713, 74, 74, 734,
-	200, 164, 597, 519, 1068, 759, 766, 767, 768, 778,
-	781, 623, 745, 735, 50, 976, 74, 319, 546, 50,
-	164, 880, 779, 862, 863, 991, 74, 441, 440, 774,
-	769, 65, 691, 692, 963, 651, 695, 903, 865, 760,
-	761, 762, 763, 605, 442, 775, 776, 50, 687, 689,
-	702, 650, 704, 705, 770, 771, 772, 419, 719, 717,
-	594, 822, 701, 720, 718, 721, 601, 528, 529, 74,
-	638, 868, 867, 716, 715, 610, 611, 612, 613, 614,
-	615, 616, 617, 74, 811, 321, 321, 321, 321, 1141,
-	321, 321, 724, 655, 810, 204, 205, 321, 164, 1135,
-	931, 164, 164, 164, 164, 164, 823, 651, 807, 1140,
-	816, 815, 654, 164, 436, 895, 164, 856, 857, 551,
-	164, 311, 1116, 445, 164, 164, 886, 209, 434, 235,
-	234, 237, 238, 239, 240, 1115, 74, 855, 236, 241,
-	1077, 881, 652, 1037, 1069, 661, 662, 663, 664, 665,
-	666, 667, 668, 669, 670, 671, 672, 673, 674, 675,
-	844, 866, 424, 787, 604, 436, 742, 878, 532, 201,
-	202, 874, 875, 195, 425, 814, 817, 164, 1104, 196,
-	618, 619, 54, 813, 164, 1103, 1071, 164, 74, 896,
-	897, 898, 859, 319, 289, 321, 882, 438, 1108, 891,
-	892, 524, 527, 528, 529, 525, 1060, 526, 530, 321,
-	908, 621, 56, 58, 542, 321, 319, 51, 1, 785,
-	906, 792, 1118, 832, 321, 321, 321, 321, 321, 321,
-	321, 321, 986, 747, 739, 842, 921, 291, 830, 64,
-	746, 899, 831, 1092, 1058, 753, 888, 936, 756, 835,
-	836, 837, 990, 909, 841, 1113, 885, 558, 559, 847,
-	557, 848, 849, 850, 851, 968, 561, 47, 560, 938,
-	288, 964, 937, 556, 943, 175, 280, 531, 956, 548,
-	978, 979, 980, 955, 439, 958, 66, 969, 924, 923,
-	788, 298, 475, 812, 972, 281, 970, 627, 428, 1102,
-	1070, 973, 936, 742, 843, 742, 985, 499, 697, 967,
-	221, 74, 984, 642, 998, 999, 233, 983, 230, 232,
-	231, 633, 74, 426, 430, 852, 449, 219, 211, 321,
-	321, 272, 515, 523, 521, 520, 277, 864, 860, 271,
-	448, 933, 1034, 1105, 637, 274, 25, 55, 634, 206,
-	19, 824, 825, 826, 18, 17, 20, 16, 445, 15,
-	14, 321, 29, 74, 74, 13, 74, 12, 1033, 11,
-	273, 806, 10, 1018, 491, 1011, 1019, 9, 8, 1026,
-	7, 500, 6, 5, 4, 197, 1013, 74, 22, 1016,
-	2, 942, 0, 0, 164, 0, 0, 1038, 1049, 1050,
-	1051, 682, 1046, 74, 0, 0, 0, 0, 0, 1052,
-	742, 878, 1054, 0, 0, 700, 0, 0, 0, 319,
-	0, 0, 1023, 1024, 0, 1025, 0, 0, 1027, 0,
-	1029, 981, 289, 0, 0, 908, 742, 1067, 74, 74,
-	0, 0, 1061, 1066, 0, 0, 0, 0, 0, 0,
-	968, 0, 0, 1081, 0, 0, 0, 0, 74, 74,
-	289, 74, 74, 1072, 1078, 1057, 0, 321, 321, 0,
-	0, 0, 0, 1080, 1089, 0, 0, 1091, 0, 1090,
-	1101, 0, 0, 0, 1097, 164, 0, 0, 1100, 0,
-	968, 0, 47, 74, 967, 1109, 1020, 0, 0, 0,
-	0, 0, 0, 1022, 74, 164, 0, 0, 0, 0,
-	0, 74, 1110, 0, 1031, 1032, 164, 0, 0, 0,
-	321, 940, 941, 1122, 0, 288, 1127, 1040, 1041, 1042,
-	0, 1045, 1131, 0, 967, 0, 0, 798, 0, 321,
-	0, 0, 0, 0, 0, 1138, 1139, 905, 0, 275,
-	0, 797, 0, 0, 0, 1146, 0, 0, 74, 0,
-	74, 74, 74, 164, 74, 0, 74, 0, 640, 641,
-	930, 0, 0, 0, 0, 0, 0, 0, 802, 0,
-	0, 0, 0, 0, 161, 0, 0, 796, 0, 0,
-	74, 74, 74, 1075, 455, 465, 466, 458, 459, 460,
-	461, 462, 463, 464, 457, 0, 0, 467, 1086, 1087,
-	1088, 0, 278, 0, 0, 0, 0, 295, 0, 0,
-	491, 0, 0, 693, 694, 74, 74, 0, 0, 0,
-	0, 0, 1021, 0, 0, 793, 790, 791, 74, 789,
-	0, 0, 0, 873, 0, 0, 0, 0, 0, 0,
-	74, 0, 427, 0, 321, 0, 0, 0, 0, 0,
-	0, 0, 800, 803, 1123, 0, 74, 0, 0, 1128,
-	0, 0, 0, 0, 0, 0, 0, 1132, 0, 0,
-	736, 0, 0, 0, 0, 0, 0, 162, 0, 0,
-	186, 0, 0, 74, 0, 904, 321, 795, 321, 0,
-	0, 0, 74, 0, 301, 0, 302, 1150, 1151, 0,
-	307, 794, 210, 0, 162, 162, 290, 309, 0, 321,
-	162, 0, 0, 0, 0, 0, 1074, 0, 0, 0,
-	0, 0, 0, 0, 0, 321, 799, 465, 466, 458,
-	459, 460, 461, 462, 463, 464, 457, 801, 0, 467,
-	0, 808, 809, 0, 430, 23, 24, 48, 26, 27,
-	0, 0, 0, 0, 0, 0, 0, 289, 0, 0,
-	971, 873, 0, 1065, 42, 0, 0, 0, 0, 28,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	321, 321, 0, 321, 988, 0, 0, 0, 37, 0,
-	0, 0, 50, 0, 0, 0, 0, 162, 0, 162,
-	0, 0, 0, 162, 0, 0, 834, 517, 0, 0,
-	162, 0, 0, 0, 0, 1012, 541, 846, 0, 0,
-	0, 0, 0, 0, 0, 0, 1014, 0, 0, 1148,
-	0, 0, 0, 1017, 0, 0, 0, 0, 598, 0,
-	600, 0, 0, 603, 0, 0, 606, 0, 0, 0,
-	0, 30, 31, 33, 32, 35, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	36, 43, 44, 0, 939, 45, 46, 34, 0, 0,
-	1048, 0, 1048, 1048, 1048, 0, 1053, 173, 321, 38,
-	39, 0, 40, 41, 456, 455, 465, 466, 458, 459,
-	460, 461, 462, 463, 464, 457, 829, 0, 467, 0,
-	162, 183, 321, 321, 321, 0, 0, 162, 539, 162,
-	0, 0, 0, 290, 0, 0, 456, 455, 465, 466,
-	458, 459, 460, 461, 462, 463, 464, 457, 0, 0,
-	467, 162, 0, 162, 0, 0, 162, 1082, 1083, 162,
-	0, 608, 49, 0, 0, 0, 0, 0, 0, 620,
-	988, 168, 0, 960, 0, 0, 0, 170, 0, 0,
-	0, 0, 1048, 176, 172, 0, 0, 974, 639, 0,
-	975, 0, 0, 977, 0, 0, 0, 0, 1112, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 174,
-	0, 0, 178, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 289, 0, 0, 1129, 0, 0, 0, 0,
-	0, 0, 0, 0, 1134, 0, 0, 0, 0, 0,
-	169, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 564, 0, 0, 0, 0, 0, 0, 171,
-	177, 179, 180, 181, 182, 0, 708, 185, 184, 0,
-	0, 0, 162, 0, 0, 0, 0, 0, 0, 0,
-	576, 0, 0, 0, 0, 0, 0, 0, 0, 1036,
-	0, 162, 0, 733, 0, 0, 491, 0, 0, 0,
-	608, 581, 582, 583, 584, 585, 586, 587, 0, 588,
-	589, 590, 591, 592, 577, 578, 579, 580, 562, 563,
-	0, 0, 565, 0, 566, 567, 568, 569, 570, 571,
-	572, 573, 574, 575, 0, 0, 0, 0, 0, 0,
-	0, 210, 0, 0, 0, 782, 210, 210, 0, 0,
-	210, 0, 804, 0, 0, 805, 0, 0, 0, 0,
-	0, 0, 0, 0, 210, 210, 210, 210, 0, 162,
-	0, 290, 162, 162, 162, 162, 162, 0, 0, 0,
-	0, 0, 0, 0, 723, 0, 0, 162, 0, 0,
-	0, 539, 0, 0, 0, 162, 162, 0, 0, 290,
-	451, 0, 454, 0, 0, 0, 608, 0, 468, 469,
-	470, 471, 472, 473, 474, 0, 452, 453, 450, 456,
+	457, 904, 442, 467, 74, 677, 168, 678, 164, 893,
+	267, 164, 170, 1134, 1080, 1066, 919, 1004, 176, 172,
+	609, 491, 607, 903, 1137, 422, 422, 477, 500, 441,
+	440, 1088, 1121, 830, 993, 164, 164, 1088, 422, 1103,
+	760, 164, 594, 74, 174, 920, 442, 178, 601, 1088,
+	1089, 922, 915, 916, 923, 918, 917, 610, 611, 612,
+	613, 614, 615, 616, 617, 887, 319, 319, 643, 645,
+	646, 788, 925, 644, 841, 169, 840, 1060, 1059, 920,
+	985, 422, 1047, 422, 273, 922, 915, 916, 923, 918,
+	917, 679, 441, 440, 171, 177, 179, 180, 181, 182,
+	593, 630, 185, 184, 1011, 1010, 914, 652, 631, 442,
+	661, 662, 663, 664, 665, 666, 667, 668, 669, 670,
+	671, 672, 673, 674, 675, 244, 1008, 1007, 164, 47,
+	164, 310, 654, 305, 164, 835, 422, 519, 422, 688,
+	422, 164, 632, 492, 320, 74, 74, 74, 74, 544,
+	74, 74, 647, 555, 554, 690, 72, 74, 293, 651,
+	1102, 649, 618, 619, 23, 687, 689, 21, 1001, 54,
+	274, 274, 274, 274, 274, 23, 937, 288, 709, 701,
+	736, 966, 861, 74, 736, 534, 518, 729, 855, 289,
+	545, 856, 543, 274, 861, 297, 688, 690, 680, 681,
+	1043, 519, 1083, 1013, 696, 288, 703, 23, 835, 724,
+	519, 50, 200, 1009, 880, 640, 641, 732, 835, 835,
+	626, 546, 50, 198, 519, 711, 712, 735, 714, 710,
+	50, 737, 713, 1072, 722, 597, 736, 761, 730, 780,
+	979, 164, 883, 731, 734, 864, 865, 783, 164, 164,
+	164, 768, 769, 770, 50, 74, 747, 319, 776, 50,
+	655, 771, 65, 995, 781, 651, 966, 491, 906, 74,
+	693, 694, 164, 867, 164, 74, 605, 164, 419, 638,
+	164, 870, 164, 869, 74, 74, 74, 74, 74, 74,
+	74, 74, 777, 778, 1145, 716, 715, 321, 321, 321,
+	321, 824, 321, 321, 721, 1139, 528, 529, 934, 321,
+	235, 234, 237, 238, 239, 240, 826, 827, 828, 236,
+	241, 719, 812, 717, 809, 813, 720, 738, 718, 273,
+	273, 273, 273, 273, 436, 445, 1144, 651, 818, 654,
+	204, 205, 691, 692, 273, 817, 695, 898, 434, 424,
+	551, 311, 273, 808, 825, 832, 889, 858, 859, 833,
+	702, 425, 704, 705, 1120, 1119, 837, 838, 839, 857,
+	1081, 843, 884, 1041, 1073, 789, 849, 604, 850, 851,
+	852, 853, 532, 201, 202, 436, 816, 195, 846, 74,
+	74, 1107, 1108, 164, 815, 288, 196, 1075, 810, 811,
+	54, 430, 868, 861, 438, 1112, 289, 321, 74, 876,
+	877, 881, 164, 1064, 621, 56, 58, 735, 74, 542,
+	51, 321, 878, 1, 787, 909, 549, 321, 794, 1122,
+	899, 900, 901, 990, 749, 319, 321, 321, 321, 321,
+	321, 321, 321, 321, 885, 741, 894, 895, 465, 466,
+	458, 459, 460, 461, 462, 463, 464, 457, 319, 291,
+	467, 74, 64, 836, 748, 902, 1096, 655, 1062, 755,
+	891, 758, 994, 912, 848, 74, 1117, 888, 924, 460,
+	461, 462, 463, 464, 457, 558, 819, 467, 943, 944,
+	164, 559, 557, 164, 164, 164, 164, 164, 561, 560,
+	556, 175, 280, 531, 439, 164, 66, 971, 164, 47,
+	945, 927, 164, 941, 288, 967, 164, 164, 940, 959,
+	926, 972, 981, 982, 983, 946, 958, 790, 74, 298,
+	475, 908, 814, 834, 973, 627, 961, 428, 970, 975,
+	1106, 321, 321, 1074, 845, 844, 499, 697, 221, 642,
+	984, 989, 976, 233, 933, 230, 1002, 1003, 232, 988,
+	634, 987, 231, 633, 854, 449, 219, 211, 986, 164,
+	445, 272, 515, 321, 523, 521, 164, 520, 277, 164,
+	74, 866, 862, 524, 527, 528, 529, 525, 274, 526,
+	530, 271, 650, 864, 865, 936, 1015, 1038, 1109, 637,
+	1025, 25, 55, 762, 763, 764, 765, 1017, 206, 19,
+	1020, 1037, 1023, 682, 1022, 18, 1024, 17, 772, 773,
+	774, 20, 963, 1026, 1030, 275, 16, 700, 15, 14,
+	29, 13, 12, 11, 1035, 1036, 977, 10, 9, 978,
+	1042, 8, 980, 7, 289, 6, 1050, 1044, 1045, 1046,
+	5, 1049, 1053, 1054, 1055, 4, 1058, 881, 1056, 197,
+	161, 22, 2, 319, 458, 459, 460, 461, 462, 463,
+	464, 457, 289, 0, 467, 0, 0, 0, 0, 321,
+	321, 1070, 0, 1071, 0, 0, 0, 0, 278, 0,
+	0, 1065, 0, 295, 971, 1078, 0, 1085, 739, 744,
+	0, 0, 0, 74, 0, 0, 0, 0, 74, 1084,
+	1082, 0, 1076, 0, 1079, 1094, 74, 0, 0, 0,
+	0, 1093, 0, 0, 1105, 970, 1095, 1101, 0, 1090,
+	1091, 1092, 321, 0, 971, 0, 47, 0, 0, 1040,
+	0, 0, 0, 1104, 1113, 0, 491, 273, 1114, 0,
+	0, 321, 0, 0, 0, 0, 0, 74, 74, 1069,
+	74, 0, 0, 1126, 0, 970, 0, 0, 0, 0,
+	650, 288, 1131, 0, 1135, 0, 0, 0, 0, 427,
+	301, 74, 302, 0, 0, 1127, 307, 0, 164, 0,
+	1132, 1143, 1142, 309, 0, 0, 0, 74, 1136, 1150,
+	524, 527, 528, 529, 525, 0, 526, 530, 1152, 0,
+	0, 0, 0, 0, 162, 0, 0, 186, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1154, 1155,
+	0, 0, 74, 74, 0, 0, 0, 0, 0, 210,
+	0, 162, 162, 290, 0, 0, 0, 162, 0, 0,
+	0, 0, 0, 74, 74, 875, 74, 74, 0, 0,
+	321, 0, 289, 0, 0, 0, 0, 0, 321, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 549,
+	164, 0, 1125, 491, 0, 0, 0, 744, 74, 0,
+	0, 0, 0, 517, 0, 0, 0, 0, 0, 74,
+	164, 0, 541, 0, 0, 0, 74, 0, 0, 907,
+	321, 164, 321, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 598, 0, 600, 0, 0, 603,
+	0, 911, 606, 321, 162, 0, 162, 0, 0, 0,
+	162, 0, 0, 0, 0, 0, 0, 162, 0, 321,
+	0, 0, 0, 74, 0, 74, 74, 74, 164, 74,
+	0, 0, 74, 0, 0, 0, 0, 0, 939, 456,
 	455, 465, 466, 458, 459, 460, 461, 462, 463, 464,
-	457, 1121, 491, 467, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 113, 0, 0, 162, 0,
-	217, 0, 0, 0, 90, 162, 214, 0, 162, 100,
-	254, 102, 0, 0, 124, 109, 0, 0, 0, 0,
-	247, 248, 0, 0, 0, 0, 0, 0, 608, 0,
-	50, 0, 422, 215, 235, 234, 237, 238, 239, 240,
-	210, 0, 84, 236, 241, 242, 243, 0, 0, 212,
-	228, 0, 253, 0, 0, 0, 0, 0, 0, 0,
+	457, 289, 0, 467, 974, 875, 74, 74, 74, 1027,
+	1028, 0, 1029, 0, 0, 1031, 0, 1033, 0, 0,
+	0, 0, 0, 0, 0, 321, 321, 0, 321, 992,
+	455, 465, 466, 458, 459, 460, 461, 462, 463, 464,
+	457, 74, 74, 467, 939, 744, 0, 744, 0, 422,
+	0, 0, 0, 1061, 74, 0, 0, 0, 0, 0,
+	1016, 0, 0, 0, 0, 620, 74, 162, 0, 0,
+	0, 1018, 0, 0, 162, 539, 162, 0, 1021, 0,
+	290, 0, 74, 0, 639, 456, 455, 465, 466, 458,
+	459, 460, 461, 462, 463, 464, 457, 0, 162, 467,
+	162, 0, 0, 162, 0, 0, 162, 0, 608, 74,
+	0, 0, 0, 0, 0, 942, 0, 0, 74, 0,
+	0, 0, 0, 0, 0, 1052, 0, 1052, 1052, 1052,
+	0, 1057, 0, 0, 321, 456, 455, 465, 466, 458,
+	459, 460, 461, 462, 463, 464, 457, 0, 0, 467,
+	0, 0, 0, 744, 0, 0, 0, 0, 321, 321,
+	321, 0, 708, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 911, 744,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 733,
+	0, 0, 0, 1086, 1087, 0, 0, 0, 0, 0,
+	0, 831, 0, 0, 0, 0, 992, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 1052, 162,
+	0, 456, 455, 465, 466, 458, 459, 460, 461, 462,
+	463, 464, 457, 0, 1116, 467, 0, 0, 162, 0,
+	0, 784, 0, 0, 0, 0, 0, 608, 806, 0,
+	0, 807, 23, 24, 48, 26, 27, 0, 289, 0,
+	0, 1133, 0, 0, 0, 0, 0, 0, 0, 0,
+	1138, 42, 0, 0, 0, 0, 28, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 210, 0,
+	0, 0, 0, 210, 210, 37, 0, 210, 0, 50,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 225, 226, 0, 0, 0, 0, 265, 0,
-	227, 0, 0, 223, 224, 229, 0, 210, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 165, 0, 210,
-	263, 0, 116, 0, 0, 127, 95, 94, 0, 0,
-	0, 86, 932, 121, 114, 139, 0, 115, 120, 103,
-	131, 117, 138, 166, 145, 129, 144, 76, 128, 137,
-	85, 122, 78, 135, 126, 107, 97, 98, 77, 0,
-	119, 89, 93, 88, 112, 132, 133, 87, 151, 81,
-	143, 80, 82, 142, 111, 130, 136, 108, 105, 79,
-	134, 106, 104, 99, 91, 0, 0, 0, 125, 140,
-	152, 0, 0, 146, 147, 148, 149, 110, 83, 96,
-	123, 255, 264, 261, 262, 259, 260, 258, 257, 256,
-	266, 249, 250, 252, 0, 251, 75, 0, 101, 150,
-	118, 92, 141, 1008, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 162, 0, 0, 0, 0,
-	0, 0, 0, 1015, 0, 210, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 210, 0, 0, 0,
+	0, 210, 210, 210, 210, 0, 162, 0, 290, 162,
+	162, 162, 162, 162, 0, 0, 0, 0, 0, 0,
+	0, 723, 0, 0, 162, 0, 0, 0, 539, 0,
+	0, 0, 162, 162, 0, 0, 290, 0, 0, 0,
+	0, 0, 0, 608, 0, 0, 0, 0, 30, 31,
+	33, 32, 35, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 36, 43, 44,
+	0, 0, 45, 46, 34, 0, 0, 0, 0, 0,
+	0, 564, 0, 0, 0, 162, 38, 39, 0, 40,
+	41, 0, 162, 0, 0, 162, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 576,
+	0, 0, 0, 0, 0, 608, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 210, 0, 0,
+	581, 582, 583, 584, 585, 586, 587, 0, 588, 589,
+	590, 591, 592, 577, 578, 579, 580, 562, 563, 49,
+	935, 565, 0, 566, 567, 568, 569, 570, 571, 572,
+	573, 574, 575, 0, 0, 0, 0, 0, 0, 0,
+	0, 451, 0, 454, 210, 0, 0, 0, 0, 468,
+	469, 470, 471, 472, 473, 474, 210, 452, 453, 450,
+	456, 455, 465, 466, 458, 459, 460, 461, 462, 463,
+	464, 457, 0, 0, 467, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 290, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 1012, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 1019, 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, 162, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 210, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 210, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 290, 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,
@@ -812,42 +801,20 @@ var yyAct = [...]int{
 	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, 539, 0, 0, 0, 0, 401,
-	391, 0, 364, 403, 342, 356, 411, 357, 358, 385,
-	330, 372, 113, 354, 0, 345, 325, 351, 326, 343,
-	366, 90, 369, 341, 393, 375, 100, 409, 102, 380,
-	0, 124, 109, 0, 0, 368, 395, 370, 390, 363,
-	386, 335, 379, 404, 355, 383, 405, 0, 0, 0,
-	73, 0, 743, 744, 0, 0, 0, 0, 0, 84,
-	0, 382, 400, 353, 384, 324, 381, 0, 328, 331,
-	410, 398, 348, 349, 879, 0, 0, 0, 0, 0,
-	0, 367, 371, 387, 361, 0, 0, 0, 0, 0,
-	0, 0, 0, 346, 0, 378, 0, 0, 0, 332,
-	329, 0, 365, 0, 0, 0, 334, 0, 347, 388,
-	0, 323, 396, 362, 165, 399, 360, 359, 402, 116,
-	0, 290, 127, 95, 94, 394, 344, 352, 86, 350,
-	121, 114, 139, 377, 115, 120, 103, 131, 117, 138,
-	166, 145, 129, 144, 76, 128, 137, 85, 122, 78,
-	135, 126, 107, 97, 98, 77, 0, 119, 89, 93,
-	88, 112, 132, 133, 87, 151, 81, 143, 80, 82,
-	142, 111, 130, 136, 108, 105, 79, 134, 106, 104,
-	99, 91, 0, 327, 0, 125, 140, 152, 340, 397,
-	146, 147, 148, 149, 110, 83, 96, 123, 338, 339,
-	336, 337, 373, 374, 406, 407, 408, 389, 333, 0,
-	0, 392, 376, 75, 0, 101, 150, 118, 92, 141,
+	0, 0, 0, 0, 539, 0, 0, 0, 0, 0,
 	401, 391, 0, 364, 403, 342, 356, 411, 357, 358,
 	385, 330, 372, 113, 354, 0, 345, 325, 351, 326,
 	343, 366, 90, 369, 341, 393, 375, 100, 409, 102,
 	380, 0, 124, 109, 0, 0, 368, 395, 370, 390,
 	363, 386, 335, 379, 404, 355, 383, 405, 0, 0,
-	0, 73, 0, 743, 744, 0, 0, 0, 0, 0,
+	0, 73, 0, 745, 746, 0, 0, 0, 0, 0,
 	84, 0, 382, 400, 353, 384, 324, 381, 0, 328,
-	331, 410, 398, 348, 349, 0, 0, 0, 0, 0,
+	331, 410, 398, 348, 349, 882, 0, 0, 0, 0,
 	0, 0, 367, 371, 387, 361, 0, 0, 0, 0,
 	0, 0, 0, 0, 346, 0, 378, 0, 0, 0,
 	332, 329, 0, 365, 0, 0, 0, 334, 0, 347,
 	388, 0, 323, 396, 362, 165, 399, 360, 359, 402,
-	116, 0, 0, 127, 95, 94, 394, 344, 352, 86,
+	116, 0, 290, 127, 95, 94, 394, 344, 352, 86,
 	350, 121, 114, 139, 377, 115, 120, 103, 131, 117,
 	138, 166, 145, 129, 144, 76, 128, 137, 85, 122,
 	78, 135, 126, 107, 97, 98, 77, 0, 119, 89,
@@ -861,8 +828,8 @@ var yyAct = [...]int{
 	358, 385, 330, 372, 113, 354, 0, 345, 325, 351,
 	326, 343, 366, 90, 369, 341, 393, 375, 100, 409,
 	102, 380, 0, 124, 109, 0, 0, 368, 395, 370,
-	390, 363, 386, 335, 379, 404, 355, 383, 405, 50,
-	0, 0, 73, 0, 0, 0, 0, 0, 0, 0,
+	390, 363, 386, 335, 379, 404, 355, 383, 405, 0,
+	0, 0, 73, 0, 745, 746, 0, 0, 0, 0,
 	0, 84, 0, 382, 400, 353, 384, 324, 381, 0,
 	328, 331, 410, 398, 348, 349, 0, 0, 0, 0,
 	0, 0, 0, 367, 371, 387, 361, 0, 0, 0,
@@ -884,11 +851,11 @@ var yyAct = [...]int{
 	351, 326, 343, 366, 90, 369, 341, 393, 375, 100,
 	409, 102, 380, 0, 124, 109, 0, 0, 368, 395,
 	370, 390, 363, 386, 335, 379, 404, 355, 383, 405,
-	0, 0, 0, 73, 0, 0, 0, 0, 0, 0,
+	50, 0, 0, 73, 0, 0, 0, 0, 0, 0,
 	0, 0, 84, 0, 382, 400, 353, 384, 324, 381,
 	0, 328, 331, 410, 398, 348, 349, 0, 0, 0,
 	0, 0, 0, 0, 367, 371, 387, 361, 0, 0,
-	0, 0, 0, 0, 935, 0, 346, 0, 378, 0,
+	0, 0, 0, 0, 0, 0, 346, 0, 378, 0,
 	0, 0, 332, 329, 0, 365, 0, 0, 0, 334,
 	0, 347, 388, 0, 323, 396, 362, 165, 399, 360,
 	359, 402, 116, 0, 0, 127, 95, 94, 394, 344,
@@ -906,11 +873,11 @@ var yyAct = [...]int{
 	325, 351, 326, 343, 366, 90, 369, 341, 393, 375,
 	100, 409, 102, 380, 0, 124, 109, 0, 0, 368,
 	395, 370, 390, 363, 386, 335, 379, 404, 355, 383,
-	405, 0, 0, 0, 215, 0, 0, 0, 0, 0,
+	405, 0, 0, 0, 73, 0, 0, 0, 0, 0,
 	0, 0, 0, 84, 0, 382, 400, 353, 384, 324,
 	381, 0, 328, 331, 410, 398, 348, 349, 0, 0,
 	0, 0, 0, 0, 0, 367, 371, 387, 361, 0,
-	0, 0, 0, 0, 0, 648, 0, 346, 0, 378,
+	0, 0, 0, 0, 0, 938, 0, 346, 0, 378,
 	0, 0, 0, 332, 329, 0, 365, 0, 0, 0,
 	334, 0, 347, 388, 0, 323, 396, 362, 165, 399,
 	360, 359, 402, 116, 0, 0, 127, 95, 94, 394,
@@ -950,11 +917,11 @@ var yyAct = [...]int{
 	0, 345, 325, 351, 326, 343, 366, 90, 369, 341,
 	393, 375, 100, 409, 102, 380, 0, 124, 109, 0,
 	0, 368, 395, 370, 390, 363, 386, 335, 379, 404,
-	355, 383, 405, 0, 0, 0, 73, 0, 0, 0,
+	355, 383, 405, 0, 0, 0, 215, 0, 0, 0,
 	0, 0, 0, 0, 0, 84, 0, 382, 400, 353,
 	384, 324, 381, 0, 328, 331, 410, 398, 348, 349,
 	0, 0, 0, 0, 0, 0, 0, 367, 371, 387,
-	361, 0, 0, 0, 0, 0, 0, 0, 0, 346,
+	361, 0, 0, 0, 0, 0, 0, 648, 0, 346,
 	0, 378, 0, 0, 0, 332, 329, 0, 365, 0,
 	0, 0, 334, 0, 347, 388, 0, 323, 396, 362,
 	165, 399, 360, 359, 402, 116, 0, 0, 127, 95,
@@ -972,7 +939,7 @@ var yyAct = [...]int{
 	354, 0, 345, 325, 351, 326, 343, 366, 90, 369,
 	341, 393, 375, 100, 409, 102, 380, 0, 124, 109,
 	0, 0, 368, 395, 370, 390, 363, 386, 335, 379,
-	404, 355, 383, 405, 0, 0, 0, 215, 0, 0,
+	404, 355, 383, 405, 0, 0, 0, 73, 0, 0,
 	0, 0, 0, 0, 0, 0, 84, 0, 382, 400,
 	353, 384, 324, 381, 0, 328, 331, 410, 398, 348,
 	349, 0, 0, 0, 0, 0, 0, 0, 367, 371,
@@ -994,7 +961,7 @@ var yyAct = [...]int{
 	113, 354, 0, 345, 325, 351, 326, 343, 366, 90,
 	369, 341, 393, 375, 100, 409, 102, 380, 0, 124,
 	109, 0, 0, 368, 395, 370, 390, 363, 386, 335,
-	379, 404, 355, 383, 405, 0, 0, 0, 163, 0,
+	379, 404, 355, 383, 405, 0, 0, 0, 215, 0,
 	0, 0, 0, 0, 0, 0, 0, 84, 0, 382,
 	400, 353, 384, 324, 381, 0, 328, 331, 410, 398,
 	348, 349, 0, 0, 0, 0, 0, 0, 0, 367,
@@ -1011,53 +978,54 @@ var yyAct = [...]int{
 	0, 327, 0, 125, 140, 152, 340, 397, 146, 147,
 	148, 149, 110, 83, 96, 123, 338, 339, 336, 337,
 	373, 374, 406, 407, 408, 389, 333, 0, 0, 392,
-	376, 75, 0, 101, 150, 118, 92, 141, 113, 0,
-	0, 684, 0, 217, 0, 0, 0, 90, 0, 214,
-	0, 0, 100, 254, 102, 0, 0, 124, 109, 0,
-	0, 0, 0, 247, 248, 0, 0, 0, 0, 0,
-	0, 0, 0, 50, 0, 0, 215, 235, 234, 237,
-	238, 239, 240, 0, 0, 84, 236, 241, 242, 243,
-	0, 0, 212, 228, 0, 253, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 225, 226, 208, 0, 0,
-	0, 265, 0, 227, 0, 0, 223, 224, 229, 0,
+	376, 75, 0, 101, 150, 118, 92, 141, 401, 391,
+	0, 364, 403, 342, 356, 411, 357, 358, 385, 330,
+	372, 113, 354, 0, 345, 325, 351, 326, 343, 366,
+	90, 369, 341, 393, 375, 100, 409, 102, 380, 0,
+	124, 109, 0, 0, 368, 395, 370, 390, 363, 386,
+	335, 379, 404, 355, 383, 405, 0, 0, 0, 163,
+	0, 0, 0, 0, 0, 0, 0, 0, 84, 0,
+	382, 400, 353, 384, 324, 381, 0, 328, 331, 410,
+	398, 348, 349, 0, 0, 0, 0, 0, 0, 0,
+	367, 371, 387, 361, 0, 0, 0, 0, 0, 0,
+	0, 0, 346, 0, 378, 0, 0, 0, 332, 329,
+	0, 365, 0, 0, 0, 334, 0, 347, 388, 0,
+	323, 396, 362, 165, 399, 360, 359, 402, 116, 0,
+	0, 127, 95, 94, 394, 344, 352, 86, 350, 121,
+	114, 139, 377, 115, 120, 103, 131, 117, 138, 166,
+	145, 129, 144, 76, 128, 137, 85, 122, 78, 135,
+	126, 107, 97, 98, 77, 0, 119, 89, 93, 88,
+	112, 132, 133, 87, 151, 81, 143, 80, 82, 142,
+	111, 130, 136, 108, 105, 79, 134, 106, 104, 99,
+	91, 0, 327, 0, 125, 140, 152, 340, 397, 146,
+	147, 148, 149, 110, 83, 96, 123, 338, 339, 336,
+	337, 373, 374, 406, 407, 408, 389, 333, 0, 0,
+	392, 376, 75, 0, 101, 150, 118, 92, 141, 113,
+	0, 0, 684, 0, 217, 0, 0, 0, 90, 0,
+	214, 0, 0, 100, 254, 102, 0, 0, 124, 109,
+	0, 0, 0, 0, 247, 248, 0, 0, 0, 0,
+	0, 0, 0, 0, 50, 0, 0, 215, 235, 234,
+	237, 238, 239, 240, 0, 0, 84, 236, 241, 242,
+	243, 0, 0, 212, 228, 0, 253, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	165, 0, 0, 263, 0, 116, 0, 0, 127, 95,
-	94, 0, 0, 0, 86, 0, 121, 114, 139, 0,
-	115, 120, 103, 131, 117, 138, 166, 145, 129, 144,
-	76, 128, 137, 85, 122, 78, 135, 126, 107, 97,
-	98, 77, 0, 119, 89, 93, 88, 112, 132, 133,
-	87, 151, 81, 143, 80, 82, 142, 111, 130, 136,
-	108, 105, 79, 134, 106, 104, 99, 91, 0, 0,
-	0, 125, 140, 152, 0, 0, 146, 147, 148, 149,
-	110, 83, 96, 123, 255, 264, 261, 262, 259, 260,
-	258, 257, 256, 266, 249, 250, 252, 0, 251, 75,
-	0, 101, 150, 118, 92, 141, 113, 0, 0, 0,
-	0, 217, 0, 0, 0, 90, 0, 214, 0, 0,
-	100, 254, 102, 0, 0, 124, 109, 0, 0, 0,
-	0, 247, 248, 0, 0, 0, 0, 0, 0, 0,
-	0, 50, 0, 0, 215, 235, 234, 237, 238, 239,
-	240, 0, 0, 84, 236, 241, 242, 243, 0, 0,
-	212, 228, 0, 253, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 225, 226, 208, 0,
+	0, 0, 265, 0, 227, 0, 0, 223, 224, 229,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 225, 226, 208, 0, 0, 0, 265,
-	0, 227, 0, 0, 223, 224, 229, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 165, 0,
-	0, 263, 0, 116, 0, 0, 127, 95, 94, 0,
-	0, 0, 86, 0, 121, 114, 139, 0, 115, 120,
-	103, 131, 117, 138, 166, 145, 129, 144, 76, 128,
-	137, 85, 122, 78, 135, 126, 107, 97, 98, 77,
-	0, 119, 89, 93, 88, 112, 132, 133, 87, 151,
-	81, 143, 80, 82, 142, 111, 130, 136, 108, 105,
-	79, 134, 106, 104, 99, 91, 0, 0, 0, 125,
-	140, 152, 0, 0, 146, 147, 148, 149, 110, 83,
-	96, 123, 255, 264, 261, 262, 259, 260, 258, 257,
-	256, 266, 249, 250, 252, 23, 251, 75, 0, 101,
-	150, 118, 92, 141, 0, 0, 0, 113, 0, 0,
+	0, 165, 0, 0, 263, 0, 116, 0, 0, 127,
+	95, 94, 0, 0, 0, 86, 0, 121, 114, 139,
+	0, 115, 120, 103, 131, 117, 138, 166, 145, 129,
+	144, 76, 128, 137, 85, 122, 78, 135, 126, 107,
+	97, 98, 77, 0, 119, 89, 93, 88, 112, 132,
+	133, 87, 151, 81, 143, 80, 82, 142, 111, 130,
+	136, 108, 105, 79, 134, 106, 104, 99, 91, 0,
+	0, 0, 125, 140, 152, 0, 0, 146, 147, 148,
+	149, 110, 83, 96, 123, 255, 264, 261, 262, 259,
+	260, 258, 257, 256, 266, 249, 250, 252, 0, 251,
+	75, 0, 101, 150, 118, 92, 141, 113, 0, 0,
 	0, 0, 217, 0, 0, 0, 90, 0, 214, 0,
 	0, 100, 254, 102, 0, 0, 124, 109, 0, 0,
 	0, 0, 247, 248, 0, 0, 0, 0, 0, 0,
-	0, 0, 50, 0, 0, 215, 235, 234, 237, 238,
+	0, 0, 50, 0, 422, 215, 235, 234, 237, 238,
 	239, 240, 0, 0, 84, 236, 241, 242, 243, 0,
 	0, 212, 228, 0, 253, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1082,7 +1050,7 @@ var yyAct = [...]int{
 	0, 0, 84, 236, 241, 242, 243, 0, 0, 212,
 	228, 0, 253, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 225, 226, 0, 0, 0, 0, 265, 0,
+	0, 0, 225, 226, 208, 0, 0, 0, 265, 0,
 	227, 0, 0, 223, 224, 229, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 165, 0, 0,
 	263, 0, 116, 0, 0, 127, 95, 94, 0, 0,
@@ -1094,19 +1062,41 @@ var yyAct = [...]int{
 	134, 106, 104, 99, 91, 0, 0, 0, 125, 140,
 	152, 0, 0, 146, 147, 148, 149, 110, 83, 96,
 	123, 255, 264, 261, 262, 259, 260, 258, 257, 256,
-	266, 249, 250, 252, 113, 251, 75, 0, 101, 150,
-	118, 92, 141, 90, 0, 0, 0, 0, 100, 254,
+	266, 249, 250, 252, 23, 251, 75, 0, 101, 150,
+	118, 92, 141, 0, 0, 0, 113, 0, 0, 0,
+	0, 217, 0, 0, 0, 90, 0, 214, 0, 0,
+	100, 254, 102, 0, 0, 124, 109, 0, 0, 0,
+	0, 247, 248, 0, 0, 0, 0, 0, 0, 0,
+	0, 50, 0, 0, 215, 235, 234, 237, 238, 239,
+	240, 0, 0, 84, 236, 241, 242, 243, 0, 0,
+	212, 228, 0, 253, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 225, 226, 0, 0, 0, 0, 265,
+	0, 227, 0, 0, 223, 224, 229, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 165, 0,
+	0, 263, 0, 116, 0, 0, 127, 95, 94, 0,
+	0, 0, 86, 0, 121, 114, 139, 0, 115, 120,
+	103, 131, 117, 138, 166, 145, 129, 144, 76, 128,
+	137, 85, 122, 78, 135, 126, 107, 97, 98, 77,
+	0, 119, 89, 93, 88, 112, 132, 133, 87, 151,
+	81, 143, 80, 82, 142, 111, 130, 136, 108, 105,
+	79, 134, 106, 104, 99, 91, 0, 0, 0, 125,
+	140, 152, 0, 0, 146, 147, 148, 149, 110, 83,
+	96, 123, 255, 264, 261, 262, 259, 260, 258, 257,
+	256, 266, 249, 250, 252, 0, 251, 75, 0, 101,
+	150, 118, 92, 141, 113, 0, 0, 0, 0, 217,
+	0, 0, 0, 90, 0, 214, 0, 0, 100, 254,
 	102, 0, 0, 124, 109, 0, 0, 0, 0, 247,
 	248, 0, 0, 0, 0, 0, 0, 0, 0, 50,
 	0, 0, 215, 235, 234, 237, 238, 239, 240, 0,
-	0, 84, 236, 241, 242, 243, 0, 0, 0, 228,
+	0, 84, 236, 241, 242, 243, 0, 0, 212, 228,
 	0, 253, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 225, 226, 0, 0, 0, 0, 265, 0, 227,
 	0, 0, 223, 224, 229, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 165, 0, 0, 263,
 	0, 116, 0, 0, 127, 95, 94, 0, 0, 0,
-	86, 0, 121, 114, 139, 1149, 115, 120, 103, 131,
+	86, 0, 121, 114, 139, 0, 115, 120, 103, 131,
 	117, 138, 166, 145, 129, 144, 76, 128, 137, 85,
 	122, 78, 135, 126, 107, 97, 98, 77, 0, 119,
 	89, 93, 88, 112, 132, 133, 87, 151, 81, 143,
@@ -1126,7 +1116,7 @@ var yyAct = [...]int{
 	0, 223, 224, 229, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 165, 0, 0, 263, 0,
 	116, 0, 0, 127, 95, 94, 0, 0, 0, 86,
-	0, 121, 114, 139, 0, 115, 120, 103, 131, 117,
+	0, 121, 114, 139, 1153, 115, 120, 103, 131, 117,
 	138, 166, 145, 129, 144, 76, 128, 137, 85, 122,
 	78, 135, 126, 107, 97, 98, 77, 0, 119, 89,
 	93, 88, 112, 132, 133, 87, 151, 81, 143, 80,
@@ -1135,16 +1125,16 @@ var yyAct = [...]int{
 	0, 146, 147, 148, 149, 110, 83, 96, 123, 255,
 	264, 261, 262, 259, 260, 258, 257, 256, 266, 249,
 	250, 252, 113, 251, 75, 0, 101, 150, 118, 92,
-	141, 90, 0, 0, 0, 0, 100, 0, 102, 0,
-	0, 124, 109, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	73, 0, 0, 0, 0, 0, 0, 0, 0, 84,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	141, 90, 0, 0, 0, 0, 100, 254, 102, 0,
+	0, 124, 109, 0, 0, 0, 0, 247, 248, 0,
+	0, 0, 0, 0, 0, 0, 0, 50, 0, 0,
+	215, 235, 234, 237, 238, 239, 240, 0, 0, 84,
+	236, 241, 242, 243, 0, 0, 0, 228, 0, 253,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 456, 455, 465, 466, 458,
-	459, 460, 461, 462, 463, 464, 457, 0, 0, 467,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 165, 0, 0, 0, 0, 116,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 225,
+	226, 0, 0, 0, 0, 265, 0, 227, 0, 0,
+	223, 224, 229, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 165, 0, 0, 263, 0, 116,
 	0, 0, 127, 95, 94, 0, 0, 0, 86, 0,
 	121, 114, 139, 0, 115, 120, 103, 131, 117, 138,
 	166, 145, 129, 144, 76, 128, 137, 85, 122, 78,
@@ -1152,72 +1142,72 @@ var yyAct = [...]int{
 	88, 112, 132, 133, 87, 151, 81, 143, 80, 82,
 	142, 111, 130, 136, 108, 105, 79, 134, 106, 104,
 	99, 91, 0, 0, 0, 125, 140, 152, 0, 0,
-	146, 147, 148, 149, 110, 83, 96, 123, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 75, 0, 101, 150, 118, 92, 141,
-	113, 0, 0, 0, 444, 0, 0, 0, 0, 90,
-	0, 0, 0, 0, 100, 0, 102, 0, 0, 124,
-	109, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 73, 0,
-	446, 0, 0, 0, 0, 0, 0, 84, 0, 0,
-	0, 0, 441, 440, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 442,
+	146, 147, 148, 149, 110, 83, 96, 123, 255, 264,
+	261, 262, 259, 260, 258, 257, 256, 266, 249, 250,
+	252, 113, 251, 75, 0, 101, 150, 118, 92, 141,
+	90, 0, 0, 0, 0, 100, 0, 102, 0, 0,
+	124, 109, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 73,
+	0, 0, 0, 0, 0, 0, 0, 0, 84, 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, 456, 455, 465, 466, 458, 459,
+	460, 461, 462, 463, 464, 457, 0, 0, 467, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 165, 0, 0, 0, 0, 116, 0, 0,
-	127, 95, 94, 0, 0, 0, 86, 0, 121, 114,
-	139, 0, 115, 120, 103, 131, 117, 138, 166, 145,
-	129, 144, 76, 128, 137, 85, 122, 78, 135, 126,
-	107, 97, 98, 77, 0, 119, 89, 93, 88, 112,
-	132, 133, 87, 151, 81, 143, 80, 82, 142, 111,
-	130, 136, 108, 105, 79, 134, 106, 104, 99, 91,
-	0, 0, 0, 125, 140, 152, 0, 113, 146, 147,
-	148, 149, 110, 83, 96, 123, 90, 0, 0, 0,
-	0, 100, 0, 102, 0, 0, 124, 109, 0, 0,
-	0, 75, 0, 101, 150, 118, 92, 141, 0, 0,
-	0, 0, 0, 0, 0, 73, 0, 0, 0, 0,
-	0, 0, 0, 0, 84, 0, 0, 0, 0, 68,
+	0, 0, 0, 165, 0, 0, 0, 0, 116, 0,
+	0, 127, 95, 94, 0, 0, 0, 86, 0, 121,
+	114, 139, 0, 115, 120, 103, 131, 117, 138, 166,
+	145, 129, 144, 76, 128, 137, 85, 122, 78, 135,
+	126, 107, 97, 98, 77, 0, 119, 89, 93, 88,
+	112, 132, 133, 87, 151, 81, 143, 80, 82, 142,
+	111, 130, 136, 108, 105, 79, 134, 106, 104, 99,
+	91, 0, 0, 0, 125, 140, 152, 0, 0, 146,
+	147, 148, 149, 110, 83, 96, 123, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 75, 0, 101, 150, 118, 92, 141, 113,
+	0, 0, 0, 444, 0, 0, 0, 0, 90, 0,
+	0, 0, 0, 100, 0, 102, 0, 0, 124, 109,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 73, 0, 446,
+	0, 0, 0, 0, 0, 0, 84, 0, 0, 0,
+	0, 441, 440, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 442, 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, 70, 0, 67,
-	0, 0, 0, 71, 116, 0, 0, 127, 95, 94,
-	0, 0, 0, 86, 0, 121, 114, 139, 0, 115,
-	120, 103, 131, 117, 138, 69, 145, 129, 144, 76,
-	128, 137, 85, 122, 78, 135, 126, 107, 97, 98,
-	77, 0, 119, 89, 93, 88, 112, 132, 133, 87,
-	151, 81, 143, 80, 82, 142, 111, 130, 136, 108,
-	105, 79, 134, 106, 104, 99, 91, 0, 0, 0,
-	125, 140, 152, 0, 0, 146, 147, 148, 149, 110,
-	83, 96, 123, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 75, 0,
-	101, 150, 118, 92, 141, 113, 0, 0, 0, 538,
-	0, 0, 0, 0, 90, 0, 0, 0, 0, 100,
-	0, 102, 0, 0, 124, 109, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 163, 0, 540, 0, 0, 0, 0,
-	0, 0, 84, 0, 0, 0, 0, 0, 0, 0,
+	0, 165, 0, 0, 0, 0, 116, 0, 0, 127,
+	95, 94, 0, 0, 0, 86, 0, 121, 114, 139,
+	0, 115, 120, 103, 131, 117, 138, 166, 145, 129,
+	144, 76, 128, 137, 85, 122, 78, 135, 126, 107,
+	97, 98, 77, 0, 119, 89, 93, 88, 112, 132,
+	133, 87, 151, 81, 143, 80, 82, 142, 111, 130,
+	136, 108, 105, 79, 134, 106, 104, 99, 91, 0,
+	0, 0, 125, 140, 152, 0, 113, 146, 147, 148,
+	149, 110, 83, 96, 123, 90, 0, 0, 0, 0,
+	100, 0, 102, 0, 0, 124, 109, 0, 0, 0,
+	75, 0, 101, 150, 118, 92, 141, 0, 0, 0,
+	0, 0, 0, 0, 73, 0, 0, 0, 0, 0,
+	0, 0, 0, 84, 0, 0, 0, 0, 68, 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, 165, 0, 0,
-	0, 0, 116, 0, 0, 127, 95, 94, 0, 0,
-	0, 86, 0, 121, 114, 139, 0, 115, 120, 103,
-	131, 117, 138, 166, 145, 129, 144, 76, 128, 137,
-	85, 122, 78, 135, 126, 107, 97, 98, 77, 0,
-	119, 89, 93, 88, 112, 132, 133, 87, 151, 81,
-	143, 80, 82, 142, 111, 130, 136, 108, 105, 79,
-	134, 106, 104, 99, 91, 0, 0, 0, 125, 140,
-	152, 0, 0, 146, 147, 148, 149, 110, 83, 96,
-	123, 0, 23, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 113, 0, 75, 0, 101, 150,
-	118, 92, 141, 90, 0, 0, 0, 0, 100, 0,
+	0, 0, 0, 0, 0, 0, 70, 0, 67, 0,
+	0, 0, 71, 116, 0, 0, 127, 95, 94, 0,
+	0, 0, 86, 0, 121, 114, 139, 0, 115, 120,
+	103, 131, 117, 138, 69, 145, 129, 144, 76, 128,
+	137, 85, 122, 78, 135, 126, 107, 97, 98, 77,
+	0, 119, 89, 93, 88, 112, 132, 133, 87, 151,
+	81, 143, 80, 82, 142, 111, 130, 136, 108, 105,
+	79, 134, 106, 104, 99, 91, 0, 0, 0, 125,
+	140, 152, 0, 0, 146, 147, 148, 149, 110, 83,
+	96, 123, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 75, 0, 101,
+	150, 118, 92, 141, 113, 0, 0, 0, 538, 0,
+	0, 0, 0, 90, 0, 0, 0, 0, 100, 0,
 	102, 0, 0, 124, 109, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 50,
-	0, 0, 73, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 163, 0, 540, 0, 0, 0, 0, 0,
 	0, 84, 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,
@@ -1237,7 +1227,7 @@ var yyAct = [...]int{
 	92, 141, 90, 0, 0, 0, 0, 100, 0, 102,
 	0, 0, 124, 109, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 50, 0,
-	0, 163, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 73, 0, 0, 0, 0, 0, 0, 0, 0,
 	84, 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,
@@ -1251,31 +1241,104 @@ var yyAct = [...]int{
 	93, 88, 112, 132, 133, 87, 151, 81, 143, 80,
 	82, 142, 111, 130, 136, 108, 105, 79, 134, 106,
 	104, 99, 91, 0, 0, 0, 125, 140, 152, 0,
-	113, 146, 147, 148, 149, 110, 83, 96, 123, 90,
-	0, 0, 0, 0, 100, 0, 102, 0, 0, 124,
-	109, 0, 0, 0, 75, 0, 101, 150, 118, 92,
-	141, 0, 0, 0, 0, 0, 0, 0, 73, 0,
-	0, 635, 0, 0, 636, 0, 0, 84, 0, 0,
+	0, 146, 147, 148, 149, 110, 83, 96, 123, 0,
+	23, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 113, 0, 75, 0, 101, 150, 118, 92,
+	141, 90, 0, 0, 0, 0, 100, 0, 102, 0,
+	0, 124, 109, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 50, 0, 0,
+	163, 0, 0, 0, 0, 0, 0, 0, 0, 84,
 	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, 165, 0, 0, 0, 0, 116, 0, 0,
-	127, 95, 94, 0, 0, 0, 86, 0, 121, 114,
-	139, 0, 115, 120, 103, 131, 117, 138, 166, 145,
-	129, 144, 76, 128, 137, 85, 122, 78, 135, 126,
-	107, 97, 98, 77, 0, 119, 89, 93, 88, 112,
-	132, 133, 87, 151, 81, 143, 80, 82, 142, 111,
-	130, 136, 108, 105, 79, 134, 106, 104, 99, 91,
-	0, 0, 0, 125, 140, 152, 0, 0, 146, 147,
-	148, 149, 110, 83, 96, 123, 0, 0, 0, 0,
+	0, 0, 0, 0, 165, 0, 0, 0, 0, 116,
+	0, 0, 127, 95, 94, 0, 0, 0, 86, 0,
+	121, 114, 139, 0, 115, 120, 103, 131, 117, 138,
+	166, 145, 129, 144, 76, 128, 137, 85, 122, 78,
+	135, 126, 107, 97, 98, 77, 0, 119, 89, 93,
+	88, 112, 132, 133, 87, 151, 81, 143, 80, 82,
+	142, 111, 130, 136, 108, 105, 79, 134, 106, 104,
+	99, 91, 0, 0, 0, 125, 140, 152, 0, 113,
+	146, 147, 148, 149, 110, 83, 96, 123, 90, 0,
+	0, 0, 0, 100, 0, 102, 0, 0, 124, 109,
+	0, 0, 0, 75, 0, 101, 150, 118, 92, 141,
+	0, 0, 0, 0, 0, 0, 0, 73, 0, 0,
+	635, 0, 0, 636, 0, 0, 84, 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, 165, 0, 0, 0, 0, 116, 0, 0, 127,
+	95, 94, 0, 0, 0, 86, 0, 121, 114, 139,
+	0, 115, 120, 103, 131, 117, 138, 166, 145, 129,
+	144, 76, 128, 137, 85, 122, 78, 135, 126, 107,
+	97, 98, 77, 0, 119, 89, 93, 88, 112, 132,
+	133, 87, 151, 81, 143, 80, 82, 142, 111, 130,
+	136, 108, 105, 79, 134, 106, 104, 99, 91, 0,
+	0, 0, 125, 140, 152, 0, 0, 146, 147, 148,
+	149, 110, 83, 96, 123, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	75, 0, 101, 150, 118, 92, 141, 113, 0, 0,
+	0, 538, 0, 0, 0, 0, 90, 0, 0, 0,
+	0, 100, 0, 102, 0, 0, 124, 109, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 163, 0, 540, 0, 0,
+	0, 0, 0, 0, 84, 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, 165,
+	0, 0, 0, 0, 116, 0, 0, 127, 95, 94,
+	0, 0, 0, 86, 0, 121, 114, 139, 0, 536,
+	120, 103, 131, 117, 138, 166, 145, 129, 144, 76,
+	128, 137, 85, 122, 78, 135, 126, 107, 97, 98,
+	77, 0, 119, 89, 93, 88, 112, 132, 133, 87,
+	151, 81, 143, 80, 82, 142, 111, 130, 136, 108,
+	105, 79, 134, 106, 104, 99, 91, 0, 0, 0,
+	125, 140, 152, 0, 113, 146, 147, 148, 149, 110,
+	83, 96, 123, 90, 0, 0, 0, 0, 100, 0,
+	102, 0, 0, 124, 109, 0, 0, 0, 75, 0,
+	101, 150, 118, 92, 141, 0, 0, 0, 0, 50,
+	0, 0, 163, 0, 0, 0, 0, 0, 0, 0,
+	0, 84, 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, 165, 0, 0, 0,
+	0, 116, 0, 0, 127, 95, 94, 0, 0, 0,
+	86, 0, 121, 114, 139, 0, 115, 120, 103, 131,
+	117, 138, 166, 145, 129, 144, 76, 128, 137, 85,
+	122, 78, 135, 126, 107, 97, 98, 77, 0, 119,
+	89, 93, 88, 112, 132, 133, 87, 151, 81, 143,
+	80, 82, 142, 111, 130, 136, 108, 105, 79, 134,
+	106, 104, 99, 91, 0, 0, 0, 125, 140, 152,
+	0, 113, 146, 147, 148, 149, 110, 83, 96, 123,
+	90, 0, 0, 0, 0, 100, 0, 102, 0, 0,
+	124, 109, 0, 0, 0, 75, 0, 101, 150, 118,
+	92, 141, 0, 0, 0, 0, 0, 0, 0, 163,
+	0, 540, 0, 0, 0, 0, 0, 0, 84, 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, 75, 0, 101, 150, 118, 92, 141, 113, 0,
-	0, 0, 538, 0, 0, 0, 0, 90, 0, 0,
-	0, 0, 100, 0, 102, 0, 0, 124, 109, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 163, 0, 540, 0,
+	0, 0, 0, 165, 0, 0, 0, 0, 116, 0,
+	0, 127, 95, 94, 0, 0, 0, 86, 0, 121,
+	114, 139, 0, 115, 120, 103, 131, 117, 138, 166,
+	145, 129, 144, 76, 128, 137, 85, 122, 78, 135,
+	126, 107, 97, 98, 77, 0, 119, 89, 93, 88,
+	112, 132, 133, 87, 151, 81, 143, 80, 82, 142,
+	111, 130, 136, 108, 105, 79, 134, 106, 104, 99,
+	91, 0, 0, 0, 125, 140, 152, 0, 113, 146,
+	147, 148, 149, 110, 83, 96, 123, 90, 0, 0,
+	0, 0, 100, 0, 102, 0, 0, 124, 109, 0,
+	0, 0, 75, 0, 101, 150, 118, 92, 141, 0,
+	0, 0, 0, 0, 0, 0, 73, 0, 446, 0,
 	0, 0, 0, 0, 0, 84, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1284,16 +1347,36 @@ var yyAct = [...]int{
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	165, 0, 0, 0, 0, 116, 0, 0, 127, 95,
 	94, 0, 0, 0, 86, 0, 121, 114, 139, 0,
-	536, 120, 103, 131, 117, 138, 166, 145, 129, 144,
+	115, 120, 103, 131, 117, 138, 166, 145, 129, 144,
 	76, 128, 137, 85, 122, 78, 135, 126, 107, 97,
 	98, 77, 0, 119, 89, 93, 88, 112, 132, 133,
 	87, 151, 81, 143, 80, 82, 142, 111, 130, 136,
 	108, 105, 79, 134, 106, 104, 99, 91, 0, 0,
+	0, 125, 140, 152, 0, 0, 146, 147, 148, 149,
+	110, 83, 96, 123, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 113, 75,
+	0, 101, 150, 118, 92, 141, 516, 90, 0, 0,
+	0, 0, 100, 0, 102, 0, 0, 124, 109, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 163, 0, 0, 0,
+	0, 0, 0, 0, 0, 84, 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,
+	165, 0, 0, 0, 0, 116, 0, 0, 127, 95,
+	94, 0, 0, 0, 86, 0, 121, 114, 139, 0,
+	115, 120, 103, 131, 117, 138, 166, 145, 129, 144,
+	76, 128, 137, 85, 122, 78, 135, 126, 107, 97,
+	98, 77, 0, 119, 89, 93, 88, 112, 132, 133,
+	87, 151, 81, 143, 80, 82, 142, 111, 130, 136,
+	108, 105, 79, 134, 106, 104, 99, 91, 276, 0,
 	0, 125, 140, 152, 0, 113, 146, 147, 148, 149,
 	110, 83, 96, 123, 90, 0, 0, 0, 0, 100,
 	0, 102, 0, 0, 124, 109, 0, 0, 0, 75,
 	0, 101, 150, 118, 92, 141, 0, 0, 0, 0,
-	50, 0, 0, 163, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 163, 0, 0, 0, 0, 0, 0,
 	0, 0, 84, 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,
@@ -1311,13 +1394,13 @@ var yyAct = [...]int{
 	123, 90, 0, 0, 0, 0, 100, 0, 102, 0,
 	0, 124, 109, 0, 0, 0, 75, 0, 101, 150,
 	118, 92, 141, 0, 0, 0, 0, 0, 0, 0,
-	163, 0, 540, 0, 0, 0, 0, 0, 0, 84,
+	163, 0, 0, 0, 0, 0, 0, 0, 0, 84,
 	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, 165, 0, 0, 0, 0, 116,
+	0, 0, 160, 0, 165, 0, 0, 0, 0, 116,
 	0, 0, 127, 95, 94, 0, 0, 0, 86, 0,
 	121, 114, 139, 0, 115, 120, 103, 131, 117, 138,
 	166, 145, 129, 144, 76, 128, 137, 85, 122, 78,
@@ -1328,7 +1411,7 @@ var yyAct = [...]int{
 	146, 147, 148, 149, 110, 83, 96, 123, 90, 0,
 	0, 0, 0, 100, 0, 102, 0, 0, 124, 109,
 	0, 0, 0, 75, 0, 101, 150, 118, 92, 141,
-	0, 0, 0, 0, 0, 0, 0, 73, 0, 446,
+	0, 0, 0, 0, 0, 0, 0, 73, 0, 0,
 	0, 0, 0, 0, 0, 0, 84, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1342,31 +1425,11 @@ var yyAct = [...]int{
 	97, 98, 77, 0, 119, 89, 93, 88, 112, 132,
 	133, 87, 151, 81, 143, 80, 82, 142, 111, 130,
 	136, 108, 105, 79, 134, 106, 104, 99, 91, 0,
-	0, 0, 125, 140, 152, 0, 0, 146, 147, 148,
-	149, 110, 83, 96, 123, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 113,
-	75, 0, 101, 150, 118, 92, 141, 516, 90, 0,
-	0, 0, 0, 100, 0, 102, 0, 0, 124, 109,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 163, 0, 0,
-	0, 0, 0, 0, 0, 0, 84, 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, 165, 0, 0, 0, 0, 116, 0, 0, 127,
-	95, 94, 0, 0, 0, 86, 0, 121, 114, 139,
-	0, 115, 120, 103, 131, 117, 138, 166, 145, 129,
-	144, 76, 128, 137, 85, 122, 78, 135, 126, 107,
-	97, 98, 77, 0, 119, 89, 93, 88, 112, 132,
-	133, 87, 151, 81, 143, 80, 82, 142, 111, 130,
-	136, 108, 105, 79, 134, 106, 104, 99, 91, 276,
 	0, 0, 125, 140, 152, 0, 113, 146, 147, 148,
 	149, 110, 83, 96, 123, 90, 0, 0, 0, 0,
 	100, 0, 102, 0, 0, 124, 109, 0, 0, 0,
 	75, 0, 101, 150, 118, 92, 141, 0, 0, 0,
-	0, 0, 0, 0, 163, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 215, 0, 0, 0, 0, 0,
 	0, 0, 0, 84, 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,
@@ -1390,7 +1453,7 @@ var yyAct = [...]int{
 	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, 160, 0, 165, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 165, 0, 0, 0, 0,
 	116, 0, 0, 127, 95, 94, 0, 0, 0, 86,
 	0, 121, 114, 139, 0, 115, 120, 103, 131, 117,
 	138, 166, 145, 129, 144, 76, 128, 137, 85, 122,
@@ -1401,7 +1464,7 @@ var yyAct = [...]int{
 	113, 146, 147, 148, 149, 110, 83, 96, 123, 90,
 	0, 0, 0, 0, 100, 0, 102, 0, 0, 124,
 	109, 0, 0, 0, 75, 0, 101, 150, 118, 92,
-	141, 0, 0, 0, 0, 0, 0, 0, 73, 0,
+	141, 0, 0, 0, 0, 0, 0, 0, 215, 0,
 	0, 0, 0, 0, 0, 0, 0, 84, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1413,10 +1476,10 @@ var yyAct = [...]int{
 	139, 0, 115, 120, 103, 131, 117, 138, 166, 145,
 	129, 144, 76, 128, 137, 85, 122, 78, 135, 126,
 	107, 97, 98, 77, 0, 119, 89, 93, 88, 112,
-	132, 133, 87, 151, 81, 143, 80, 82, 142, 111,
+	132, 133, 87, 151, 81, 143, 80, 286, 142, 111,
 	130, 136, 108, 105, 79, 134, 106, 104, 99, 91,
 	0, 0, 0, 125, 140, 152, 0, 113, 146, 147,
-	148, 149, 110, 83, 96, 123, 90, 0, 0, 0,
+	148, 149, 287, 285, 96, 123, 90, 0, 0, 0,
 	0, 100, 0, 102, 0, 0, 124, 109, 0, 0,
 	0, 75, 0, 101, 150, 118, 92, 141, 0, 0,
 	0, 0, 0, 0, 0, 215, 0, 0, 0, 0,
@@ -1431,58 +1494,23 @@ var yyAct = [...]int{
 	120, 103, 131, 117, 138, 166, 145, 129, 144, 76,
 	128, 137, 85, 122, 78, 135, 126, 107, 97, 98,
 	77, 0, 119, 89, 93, 88, 112, 132, 133, 87,
-	151, 81, 143, 80, 82, 142, 111, 130, 136, 108,
+	151, 81, 143, 80, 286, 142, 111, 130, 136, 108,
 	105, 79, 134, 106, 104, 99, 91, 0, 0, 0,
-	125, 140, 152, 0, 113, 146, 147, 148, 149, 110,
-	83, 96, 123, 90, 0, 0, 0, 0, 100, 0,
-	102, 0, 0, 124, 109, 0, 0, 0, 75, 0,
-	101, 150, 118, 92, 141, 0, 0, 0, 0, 0,
-	0, 0, 163, 0, 0, 0, 0, 0, 0, 0,
-	0, 84, 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, 165, 0, 0, 0,
-	0, 116, 0, 0, 127, 95, 94, 0, 0, 0,
-	86, 0, 121, 114, 139, 0, 115, 120, 103, 131,
-	117, 138, 166, 145, 129, 144, 76, 128, 137, 85,
-	122, 78, 135, 126, 107, 97, 98, 77, 0, 119,
-	89, 93, 88, 112, 132, 133, 87, 151, 81, 143,
-	80, 82, 142, 111, 130, 136, 108, 105, 79, 134,
-	106, 104, 99, 91, 0, 0, 0, 125, 140, 152,
-	0, 113, 146, 147, 148, 149, 110, 83, 96, 123,
-	90, 0, 0, 0, 0, 100, 0, 102, 0, 0,
-	124, 109, 0, 0, 0, 75, 0, 101, 150, 118,
-	92, 141, 0, 0, 0, 0, 0, 0, 0, 215,
-	0, 0, 0, 0, 0, 0, 0, 0, 84, 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, 165, 0, 0, 0, 0, 116, 0,
-	0, 127, 95, 94, 0, 0, 0, 86, 0, 121,
-	114, 139, 0, 115, 120, 103, 131, 117, 138, 166,
-	145, 129, 144, 76, 128, 137, 85, 122, 78, 135,
-	126, 107, 97, 98, 77, 0, 119, 89, 93, 88,
-	112, 132, 133, 87, 151, 81, 143, 80, 286, 142,
-	111, 130, 136, 108, 105, 79, 134, 106, 104, 99,
-	91, 0, 0, 0, 125, 140, 152, 0, 0, 146,
-	147, 148, 149, 287, 285, 284, 283, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 75, 0, 101, 150, 118, 92, 141,
+	125, 140, 152, 0, 0, 146, 147, 148, 149, 287,
+	285, 284, 283, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 75, 0,
+	101, 150, 118, 92, 141,
 }
 var yyPact = [...]int{
 
-	1339, -1000, -176, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	1576, -1000, -162, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 757, 797, -1000, -1000, -1000, -1000, -1000, -1000, 568,
-	5809, 32, 62, 45, 7885, 58, 1455, 8416, -1000, -39,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 556, -1000, -1000,
-	-1000, -1000, -1000, 746, 753, 584, 739, 646, -1000, 4408,
-	11, 6977, 7708, 8593, -1000, 418, 51, 8416, -122, 8062,
-	8, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, 735, 760, -1000, -1000, -1000, -1000, -1000, -1000, 559,
+	5908, 8, 46, 13, 7984, 43, 250, 8515, -1000, -55,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 551, -1000, -1000,
+	-1000, -1000, -1000, 720, 730, 556, 713, 651, -1000, 4507,
+	0, 7076, 7807, 8869, -1000, 452, 44, 8515, -129, 8161,
+	-2, -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, -1000, -1000,
@@ -1490,23 +1518,23 @@ 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, 42, 8416, -1000, 8416, 6, 415, 6,
-	8416, -1000, 87, -1000, -1000, -1000, -1000, 8416, 406, 681,
-	41, 2666, 2666, 2666, 2666, -34, 2666, 2666, 596, -1000,
-	-1000, -1000, -1000, 2666, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 332, 733, 4827, 4827, 757, -1000, 556,
-	-1000, -1000, -1000, 683, -1000, -1000, 210, 776, -1000, 5632,
-	86, -1000, 4827, 1718, 532, -1000, -1000, 532, -1000, -1000,
-	57, -1000, -1000, 5225, 5225, 5225, 5225, 5225, 5225, 5225,
+	-1000, -1000, -1000, 20, 8515, -1000, 8515, -5, 427, -5,
+	8515, -1000, 81, -1000, -1000, -1000, -1000, 8515, 425, 671,
+	36, 2557, 2557, 2557, 2557, -45, 2557, 2557, 577, -1000,
+	-1000, -1000, -1000, 2557, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 321, 680, 4926, 4926, 735, -1000, 551,
+	-1000, -1000, -1000, 663, -1000, -1000, 227, 743, -1000, 5731,
+	79, -1000, 4926, 1739, 527, -1000, -1000, 527, -1000, -1000,
+	55, -1000, -1000, 5324, 5324, 5324, 5324, 5324, 5324, 5324,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 532, -1000, 4619, 532, 532, 532,
-	532, 532, 532, 4827, 532, 532, 532, 532, 532, 532,
-	532, 532, 532, 532, 532, 532, 532, 7531, 464, 750,
-	-1000, -1000, -1000, 736, 6415, 6800, 8416, 504, -1000, 442,
-	8239, 3329, -1000, -1000, -1000, -1000, 679, -1000, 131, -1000,
-	85, 447, -1000, 1536, 362, 2666, 33, 540, 8416, 145,
-	8416, 2666, 26, 8416, 731, 582, 8416, -1000, 3992, -1000,
-	2666, 2666, 2666, 2666, 2666, 2666, 2666, 2666, -1000, -1000,
+	-1000, -1000, -1000, -1000, 527, -1000, 4718, 527, 527, 527,
+	527, 527, 527, 4926, 527, 527, 527, 527, 527, 527,
+	527, 527, 527, 527, 527, 527, 527, 7630, 506, 1109,
+	-1000, -1000, -1000, 710, 6514, 6899, 8515, 488, -1000, 517,
+	8338, 2999, -1000, -1000, -1000, -1000, 670, -1000, 129, -1000,
+	74, 449, -1000, 1615, 394, 2557, 16, 533, 8515, 154,
+	8515, 2557, 14, 8515, 704, 575, 8515, -1000, 3883, -1000,
+	2557, 2557, 2557, 2557, 2557, 2557, 2557, 2557, -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,
@@ -1516,102 +1544,102 @@ 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, 2666, 2666, -1000, -1000, 8416,
-	-1000, -1000, -1000, -1000, 792, 113, 547, 83, 518, -1000,
-	207, 746, 332, 646, 6592, 618, -1000, -1000, 8416, -1000,
-	4827, 4827, 253, -1000, 7331, -1000, -1000, 3108, 121, 5225,
-	245, 148, 5225, 5225, 5225, 5225, 5225, 5225, 5225, 5225,
-	5225, 5225, 5225, 5225, 5225, 5225, 5225, 284, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, 352, -1000, 556, 662,
-	662, 94, 94, 94, 94, 94, 94, 5424, 4200, 332,
-	445, 214, 4619, 4408, 4408, 4827, 4827, 4408, 734, 140,
-	214, 8062, -1000, 332, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, 4408, 4408, 4408, 4408, -14, 8416, -1000, 8239, 6977,
-	6977, 6977, 6977, 6977, -1000, 623, 622, -1000, 608, 607,
-	614, 8416, -1000, 436, 6415, 101, 532, -1000, 7154, -1000,
-	-1000, -14, 6977, 8416, -1000, -1000, 8239, 442, -1000, -1000,
-	-1000, -1000, 4827, 3771, 2445, 102, 238, -89, -1000, -1000,
-	542, -1000, 542, 542, 542, 542, -69, -69, -69, -69,
-	-1000, -1000, -1000, -1000, -1000, 567, -1000, 542, 542, 542,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 566, 566,
-	566, 546, 546, 548, -1000, 8416, -153, 339, -1000, 730,
-	1112, -1000, 8416, -1000, -1000, 8416, 2666, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 2557, 2557, -1000, -1000, 8515,
+	-1000, -1000, -1000, -1000, 755, 96, 265, 73, 516, -1000,
+	309, 720, 321, 651, 6691, 587, -1000, -1000, 8515, -1000,
+	4926, 4926, 351, -1000, 7430, -1000, -1000, 3220, 110, 5324,
+	232, 204, 5324, 5324, 5324, 5324, 5324, 5324, 5324, 5324,
+	5324, 5324, 5324, 5324, 5324, 5324, 5324, 299, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, 385, -1000, 551, 603,
+	603, 98, 98, 98, 98, 98, 98, 5523, 4091, 321,
+	435, 157, 4718, 4507, 4507, 4926, 4926, 4507, 714, 143,
+	157, 8161, -1000, 321, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, 4507, 4507, 4507, 4507, -32, 8515, -1000, 8338, 7076,
+	7076, 7076, 7076, 7076, -1000, 605, 604, -1000, 632, 630,
+	613, 8515, -1000, 433, 6514, 77, 527, -1000, 7253, -1000,
+	-1000, -32, 7076, 8515, -1000, -1000, 8692, 476, -1000, -1000,
+	-1000, -1000, 4926, 3662, 2336, 83, 238, -103, -1000, -1000,
+	534, -1000, 534, 534, 534, 534, -84, -84, -84, -84,
+	-1000, -1000, -1000, -1000, -1000, 558, -1000, 534, 534, 534,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 555, 555,
+	555, 536, 536, 545, -1000, 8515, -148, 365, -1000, 702,
+	54, -1000, 8515, -1000, -1000, 8515, 2557, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, 661, 4827, 4827, 3771, 4827, -1000, -1000, -1000,
-	733, -1000, 734, 754, -1000, 668, 667, 4408, -1000, -1000,
-	121, 199, -1000, -1000, 262, -1000, -1000, -1000, -1000, 81,
-	532, -1000, 305, -1000, -1000, -1000, -1000, 245, 5225, 5225,
-	5225, 44, 305, 1435, 1234, 1092, 94, 236, 236, 99,
-	99, 99, 99, 99, 359, 359, -1000, -1000, -1000, 332,
-	-1000, -1000, -1000, 332, 4408, 517, -1000, -1000, 4827, -1000,
-	332, 414, 414, 219, 281, 414, 4408, 164, -1000, 4827,
-	332, -1000, 414, 332, 414, 414, 511, 532, -1000, 554,
-	750, 562, 577, 393, -1000, -1000, -1000, -1000, 621, -1000,
-	620, -1000, -1000, -1000, -1000, -1000, 47, 38, 37, 8062,
-	-1000, 770, 539, -1000, -1000, -1000, 214, -1000, 74, 509,
-	2224, -1000, -1000, -1000, -1000, -1000, -1000, 558, 703, 106,
-	323, -1000, -1000, 687, -1000, 168, -98, -1000, -1000, 288,
-	-69, -69, -1000, -1000, 92, 675, 92, 92, 92, 298,
-	-1000, -1000, -1000, -1000, 268, -1000, -1000, -1000, 265, -1000,
-	576, 8062, 2666, -1000, 3550, -1000, -1000, -1000, -1000, 263,
-	248, 160, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -15, -1000, 2666, -1000, 652, 214, 214,
-	-1000, -1000, 8416, -1000, -1000, -1000, -1000, 505, -1000, -1000,
-	-1000, 2887, 4408, -1000, 44, 305, 1403, -1000, 5225, 5225,
-	-1000, -1000, 414, 4408, 214, -1000, -1000, -1000, 21, 284,
-	21, -133, 521, 135, -1000, 4827, 222, -1000, -1000, -1000,
-	-1000, -1000, 573, 8239, 532, -1000, 6216, 8062, 757, 4827,
-	-1000, -1000, 4827, 552, -1000, 4827, -1000, -1000, -1000, 532,
-	532, 532, 377, -1000, 757, -1000, 3550, 2445, -1000, 2445,
-	8062, -1000, 310, -1000, -1000, 564, 50, -1000, -1000, -1000,
-	426, 92, 92, -1000, 301, 163, -1000, -1000, -1000, 411,
-	-1000, 507, 397, 8416, -1000, -1000, 500, -1000, 130, -1000,
-	-1000, 8062, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, 8062, 8416, -1000, -1000, -1000, -1000, -1000, 8062,
-	-1000, -1000, -1000, 770, 6977, -1000, -1000, 332, -1000, 5225,
-	305, 305, -1000, -1000, 332, 542, 542, -1000, 542, 546,
-	-1000, 542, -49, 542, -53, 332, 332, 532, -128, -1000,
-	214, 4827, -1000, 706, 479, 460, -1000, -1000, 1817, 332,
-	388, 72, 377, 746, 214, 214, 8062, 214, 8062, 8062,
-	8062, 6017, 8062, 746, 2224, -1000, 360, -1000, 542, -1000,
-	-85, 787, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -69, 295, 224, -1000, 221, 2666, 3550,
-	2445, -1000, 541, -1000, -1000, -1000, -1000, 708, 763, 488,
-	-1000, 305, -1000, -1000, 49, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 5225, 332, 292, 214, 702, -1000, 532,
-	-1000, -1000, 551, 8062, 8062, -1000, -1000, 357, -1000, 331,
-	331, 331, 101, -1000, -1000, 548, 8062, -1000, 104, -1000,
-	-112, 92, -1000, 422, 358, -1000, -1000, -1000, 8062, 532,
-	761, 752, -1000, -1000, -17, -1000, -1000, 779, -1000, 532,
-	-1000, 556, 60, -1000, 8062, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, 179, 697, -1000, 684, -1000, -1000, -1000, -1000,
-	317, -16, -1000, 4827, 4827, 332, 48, -158, 8239, 460,
-	332, 8062, -1000, -1000, 249, -1000, -1000, 540, 315, -1000,
-	8062, 214, 450, -1000, 651, -149, -163, 442, -1000, -1000,
-	-1000, -153, -1000, -16, 666, -1000, 641, -1000, -1000, -1000,
-	-24, -155, -27, -159, 532, -164, 5026, -1000, 328, 332,
-	-1000, -1000,
+	-1000, -1000, 637, 4926, 4926, 3662, 4926, -1000, -1000, -1000,
+	680, -1000, 714, 725, -1000, 662, 655, 4507, -1000, -1000,
+	110, 210, -1000, -1000, 240, -1000, -1000, -1000, -1000, 70,
+	527, -1000, 1228, -1000, -1000, -1000, -1000, 232, 5324, 5324,
+	5324, 248, 1228, 1460, 705, 1268, 98, 732, 732, 99,
+	99, 99, 99, 99, 919, 919, -1000, -1000, -1000, 321,
+	-1000, -1000, -1000, 321, 4507, 514, -1000, -1000, 4926, -1000,
+	321, 431, 431, 372, 216, 431, 4507, 222, -1000, 4926,
+	321, -1000, 431, 321, 431, 431, 508, 527, -1000, 532,
+	1109, 544, 572, 892, -1000, -1000, -1000, -1000, 592, -1000,
+	590, -1000, -1000, -1000, -1000, -1000, 41, 39, 18, 8161,
+	-1000, 741, 520, -1000, 2999, -1000, 8338, -1000, 157, -1000,
+	67, 510, 2115, -1000, -1000, -1000, -1000, -1000, -1000, 539,
+	694, 106, 359, -1000, -1000, 677, -1000, 209, -105, -1000,
+	-1000, 300, -84, -84, -1000, -1000, 88, 667, 88, 88,
+	88, 315, -1000, -1000, -1000, -1000, 292, -1000, -1000, -1000,
+	272, -1000, 567, 8161, 2557, -1000, 3441, -1000, -1000, -1000,
+	-1000, 310, 276, 101, -1000, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -33, -1000, 2557, -1000, 620,
+	157, 157, -1000, -1000, 8515, -1000, -1000, -1000, -1000, 515,
+	-1000, -1000, -1000, 2778, 4507, -1000, 248, 1228, 1374, -1000,
+	5324, 5324, -1000, -1000, 431, 4507, 157, -1000, -1000, -1000,
+	19, 299, 19, -139, 504, 135, -1000, 4926, 153, -1000,
+	-1000, -1000, -1000, -1000, 565, 8338, 527, -1000, 6315, 8161,
+	735, 4926, -1000, -1000, 4926, 537, -1000, 4926, -1000, -1000,
+	-1000, 527, 527, 527, 376, -1000, 735, -1000, -1000, 3441,
+	2336, -1000, 2336, 8161, -1000, 328, -1000, -1000, 562, 42,
+	-1000, -1000, -1000, 463, 88, 88, -1000, 311, 136, -1000,
+	-1000, -1000, 422, -1000, 509, 400, 8515, -1000, -1000, 499,
+	-1000, 126, -1000, -1000, 8161, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 8161, 8515, -1000, -1000, -1000,
+	-1000, -1000, 8161, -1000, -1000, -1000, 741, 7076, -1000, -1000,
+	321, -1000, 5324, 1228, 1228, -1000, -1000, 321, 534, 534,
+	-1000, 534, 536, -1000, 534, -65, 534, -67, 321, 321,
+	527, -136, -1000, 157, 4926, -1000, 696, 480, 496, -1000,
+	-1000, 4299, 321, 378, 61, 376, 720, 157, 157, 8161,
+	157, 8161, 8161, 8161, 6116, 8161, 720, -1000, 2115, -1000,
+	373, -1000, 534, -1000, -99, 754, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -84, 307, 263,
+	-1000, 242, 2557, 3441, 2336, -1000, 530, -1000, -1000, -1000,
+	-1000, 698, 734, 497, -1000, 1228, -1000, -1000, 38, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 5324, 321, 306,
+	157, 692, -1000, 527, -1000, -1000, 519, 8161, 8161, -1000,
+	-1000, 345, -1000, 333, 333, 333, 77, -1000, -1000, 545,
+	8161, -1000, 92, -1000, -119, 88, -1000, 455, 334, -1000,
+	-1000, -1000, 8161, 527, 727, 726, -1000, -1000, 50, -1000,
+	-1000, 746, -1000, 527, -1000, 551, 48, -1000, 8161, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, 219, 687, -1000, 686,
+	-1000, -1000, -1000, -1000, 327, -34, -1000, 4926, 4926, 321,
+	34, -152, 8338, 496, 321, 8161, -1000, -1000, 305, -1000,
+	-1000, 533, 320, -1000, 8161, 157, 492, -1000, 617, -146,
+	-158, 476, -1000, -1000, -1000, -148, -1000, -34, 653, -1000,
+	606, -1000, -1000, -1000, -44, -149, -38, -153, 527, -159,
+	5125, -1000, 1324, 321, -1000, -1000,
 }
 var yyPgo = [...]int{
 
-	0, 980, 20, 449, 978, 975, 974, 973, 972, 970,
-	968, 967, 962, 959, 957, 955, 952, 950, 949, 947,
-	946, 945, 944, 940, 94, 939, 937, 936, 51, 934,
-	58, 933, 932, 34, 128, 39, 30, 717, 931, 31,
-	63, 55, 929, 37, 928, 927, 926, 925, 47, 924,
-	923, 1139, 922, 921, 11, 29, 918, 917, 916, 915,
-	59, 282, 911, 910, 909, 908, 906, 903, 38, 8,
-	5, 44, 14, 900, 25, 6, 898, 52, 897, 894,
-	890, 889, 32, 888, 57, 887, 18, 43, 886, 9,
-	40, 26, 22, 7, 885, 42, 883, 323, 882, 112,
-	881, 880, 879, 878, 876, 71, 171, 503, 15, 53,
-	874, 869, 13, 1242, 49, 41, 17, 867, 54, 354,
-	33, 866, 865, 27, 863, 858, 856, 850, 848, 847,
-	66, 846, 845, 842, 28, 12, 838, 836, 45, 19,
-	835, 834, 833, 831, 46, 830, 36, 829, 827, 824,
-	24, 16, 823, 10, 822, 812, 2, 811, 23, 810,
-	3, 809, 4, 35, 808, 807, 0, 148, 804, 803,
-	102,
+	0, 1012, 12, 517, 1011, 1009, 1005, 1000, 995, 993,
+	991, 988, 987, 983, 982, 981, 980, 979, 978, 976,
+	971, 967, 965, 959, 87, 958, 952, 951, 55, 949,
+	58, 948, 947, 36, 198, 43, 39, 124, 945, 24,
+	59, 54, 941, 38, 932, 931, 928, 927, 53, 925,
+	924, 975, 922, 921, 14, 27, 917, 916, 915, 914,
+	68, 7, 913, 912, 908, 905, 903, 899, 46, 4,
+	10, 31, 16, 898, 159, 8, 897, 40, 896, 894,
+	893, 890, 41, 887, 45, 885, 19, 44, 884, 20,
+	51, 29, 22, 9, 47, 30, 882, 299, 880, 117,
+	879, 877, 870, 861, 856, 61, 323, 475, 494, 57,
+	854, 37, 5, 1129, 63, 49, 23, 853, 32, 96,
+	34, 852, 851, 26, 850, 849, 848, 842, 841, 835,
+	390, 827, 826, 822, 33, 11, 821, 820, 52, 21,
+	819, 818, 816, 815, 50, 814, 42, 812, 809, 795,
+	28, 18, 784, 15, 783, 779, 3, 778, 17, 775,
+	6, 774, 2, 35, 773, 770, 0, 25, 769, 766,
+	67,
 }
 var yyR1 = [...]int{
 
@@ -1619,55 +1647,56 @@ var yyR1 = [...]int{
 	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, 168, 168,
-	46, 46, 90, 90, 10, 10, 10, 94, 94, 94,
-	111, 111, 121, 121, 11, 11, 11, 11, 11, 162,
-	162, 161, 160, 160, 159, 159, 158, 16, 147, 148,
-	148, 148, 144, 124, 124, 124, 127, 127, 125, 125,
-	125, 125, 125, 125, 125, 126, 126, 126, 126, 126,
-	128, 128, 128, 128, 128, 129, 129, 129, 129, 129,
-	129, 129, 129, 129, 129, 129, 129, 129, 129, 143,
-	143, 130, 130, 138, 138, 139, 139, 139, 136, 136,
-	137, 137, 140, 140, 140, 131, 131, 131, 131, 131,
-	131, 133, 133, 141, 141, 134, 134, 134, 135, 135,
-	142, 142, 142, 142, 142, 132, 132, 145, 152, 152,
-	152, 152, 146, 146, 154, 154, 153, 149, 149, 149,
-	150, 150, 150, 151, 151, 151, 12, 12, 12, 12,
-	12, 12, 12, 12, 12, 163, 163, 163, 163, 163,
-	163, 163, 163, 163, 157, 155, 155, 156, 156, 13,
-	14, 14, 14, 15, 15, 17, 18, 18, 18, 18,
+	46, 46, 90, 90, 10, 10, 10, 10, 94, 94,
+	94, 111, 111, 121, 121, 11, 11, 11, 11, 11,
+	162, 162, 161, 160, 160, 159, 159, 158, 16, 147,
+	148, 148, 148, 144, 124, 124, 124, 127, 127, 125,
+	125, 125, 125, 125, 125, 125, 126, 126, 126, 126,
+	126, 128, 128, 128, 128, 128, 129, 129, 129, 129,
+	129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
+	143, 143, 130, 130, 138, 138, 139, 139, 139, 136,
+	136, 137, 137, 140, 140, 140, 131, 131, 131, 131,
+	131, 131, 133, 133, 141, 141, 134, 134, 134, 135,
+	135, 142, 142, 142, 142, 142, 132, 132, 145, 152,
+	152, 152, 152, 146, 146, 154, 154, 153, 149, 149,
+	149, 150, 150, 150, 151, 151, 151, 12, 12, 12,
+	12, 12, 12, 12, 12, 12, 163, 163, 163, 163,
+	163, 163, 163, 163, 163, 157, 155, 155, 156, 156,
+	13, 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, 18,
-	18, 18, 18, 18, 18, 18, 18, 18, 18, 122,
-	122, 122, 19, 19, 21, 21, 22, 23, 20, 20,
-	20, 20, 20, 169, 24, 25, 25, 26, 26, 26,
-	30, 30, 30, 28, 28, 29, 29, 35, 35, 34,
-	34, 36, 36, 36, 36, 110, 110, 110, 109, 109,
-	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, 117, 117, 116, 116, 116,
-	115, 115, 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, 98,
-	98, 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,
+	122, 122, 122, 19, 19, 21, 21, 22, 23, 20,
+	20, 20, 20, 20, 169, 24, 25, 25, 26, 26,
+	26, 30, 30, 30, 28, 28, 29, 29, 35, 35,
+	34, 34, 36, 36, 36, 36, 110, 110, 110, 109,
+	109, 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, 117, 117, 116, 116,
+	116, 115, 115, 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,
+	98, 98, 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, 64, 64, 64,
-	64, 64, 64, 64, 64, 170, 170, 66, 66, 66,
-	66, 31, 31, 31, 31, 31, 120, 120, 123, 123,
+	61, 61, 61, 61, 61, 61, 65, 65, 65, 63,
+	63, 63, 63, 63, 63, 63, 63, 63, 64, 64,
+	64, 64, 64, 64, 64, 64, 170, 170, 66, 66,
+	66, 66, 31, 31, 31, 31, 31, 120, 120, 123,
 	123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
-	123, 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, 95, 96, 96, 99, 99, 100, 100,
-	97, 97, 101, 101, 101, 101, 101, 101, 101, 101,
-	101, 101, 102, 102, 102, 103, 103, 104, 104, 104,
-	112, 112, 107, 107, 108, 108, 113, 113, 114, 114,
+	123, 123, 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, 95, 96, 96, 99, 99, 100,
+	100, 97, 97, 101, 101, 101, 101, 101, 101, 101,
+	101, 101, 101, 102, 102, 102, 103, 103, 104, 104,
+	104, 112, 112, 107, 107, 108, 108, 113, 113, 114,
+	114, 105, 105, 105, 105, 105, 105, 105, 105, 105,
 	105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
 	105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
 	105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
@@ -1676,7 +1705,6 @@ var yyR1 = [...]int{
 	105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
 	105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
 	105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
-	105, 105, 105, 105, 105, 105, 105, 105, 105, 106,
 	106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
 	106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
 	106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
@@ -1684,8 +1712,8 @@ var yyR1 = [...]int{
 	106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
 	106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
 	106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-	106, 106, 106, 106, 106, 106, 106, 106, 106, 166,
-	167, 118, 119, 119, 119,
+	106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
+	166, 167, 118, 119, 119, 119,
 }
 var yyR2 = [...]int{
 
@@ -1693,55 +1721,55 @@ var yyR2 = [...]int{
 	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, 5, 1, 2, 1,
-	1, 1, 1, 1, 2, 8, 4, 6, 5, 0,
-	2, 1, 0, 2, 1, 3, 3, 4, 4, 1,
-	3, 3, 8, 3, 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, 1,
-	3, 0, 3, 0, 5, 0, 3, 5, 0, 1,
-	0, 1, 0, 1, 2, 0, 2, 2, 2, 2,
-	2, 0, 3, 0, 1, 0, 3, 3, 0, 2,
-	0, 2, 1, 2, 1, 0, 2, 5, 2, 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, 7, 1, 3, 8, 8, 5,
-	4, 6, 5, 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,
+	1, 3, 0, 4, 7, 3, 4, 5, 1, 2,
+	1, 1, 1, 1, 1, 2, 8, 4, 6, 5,
+	0, 2, 1, 0, 2, 1, 3, 3, 4, 4,
+	1, 3, 3, 8, 3, 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,
+	1, 3, 0, 3, 0, 5, 0, 3, 5, 0,
+	1, 0, 1, 0, 1, 2, 0, 2, 2, 2,
+	2, 2, 0, 3, 0, 1, 0, 3, 3, 0,
+	2, 0, 2, 1, 2, 1, 0, 2, 5, 2,
+	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, 7, 1, 3, 8, 8,
+	5, 4, 6, 5, 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, 2, 2, 2, 2, 2, 2,
-	3, 1, 1, 1, 1, 4, 5, 6, 4, 4,
-	6, 6, 6, 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, 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,
+	3, 3, 3, 3, 3, 2, 2, 2, 2, 2,
+	2, 3, 1, 1, 1, 1, 4, 5, 6, 4,
+	4, 6, 6, 6, 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, 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,
@@ -1759,7 +1787,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,
-	1, 0, 0, 1, 1,
+	1, 1, 0, 0, 1, 1,
 }
 var yyChk = [...]int{
 
@@ -1836,168 +1864,168 @@ var yyChk = [...]int{
 	-107, -167, -34, -35, -34, -34, -90, 140, -51, -93,
 	-40, -41, -41, -40, -41, 41, 41, 41, 46, 41,
 	46, 41, -48, -113, -167, -54, 49, 122, 50, -166,
-	-115, -90, -39, -51, -95, -118, -37, -108, -114, -149,
-	-150, -151, -108, 58, 59, -144, -145, -152, 125, 124,
-	-146, 119, 28, -140, 67, 72, -136, 192, -130, 53,
-	-130, -130, -130, -130, -134, 175, -134, -134, -134, 53,
-	-130, -130, -130, -138, 53, -138, -138, -139, 53, -139,
-	-112, 52, -51, -160, 222, -161, 56, 23, -101, 117,
-	114, 115, -157, 113, 189, 175, 65, 29, 15, 214,
-	140, 225, 56, 141, -51, -51, -119, 37, -37, -37,
-	-84, -87, -96, 19, 11, 33, 33, -34, 67, 68,
-	69, 109, -166, -68, -61, -61, -61, -33, 135, 71,
-	-167, -167, -34, 54, -37, -167, -167, -167, 54, 52,
-	22, -167, -34, -79, -77, 78, -37, -167, -167, -167,
-	-167, -167, -59, 30, 33, -2, -166, -166, -55, 12,
-	-44, -43, 51, 52, -45, 51, -43, 41, 41, 119,
-	119, 119, -91, -107, -55, -55, 109, 54, -151, 80,
-	53, 28, -146, 56, 56, -131, 29, 67, -137, 193,
-	59, -134, -134, -135, 105, 30, -135, -135, -135, -143,
-	58, 59, 59, 51, -107, -119, -159, -158, -108, -118,
-	-163, 146, 126, 127, 130, 129, 56, 119, 28, 125,
-	128, -163, 146, -102, -103, 121, 22, 119, 28, 140,
-	-119, 38, -51, -38, 11, 97, -108, -35, -33, 71,
-	-61, -61, -167, -36, -123, 106, 172, 134, 170, 166,
-	186, 177, 191, 168, 192, -120, -123, 219, -82, 79,
-	-37, 77, -92, 51, -93, -70, -72, -71, -166, -2,
-	-88, -107, -91, -82, -37, -37, 53, -37, -166, -166,
-	-166, -167, 54, -82, -150, -151, -154, -153, -107, 56,
-	-133, 51, 58, 59, 60, 67, 204, 55, -135, -135,
-	56, 56, 106, 55, 54, 54, 55, 54, -51, 54,
-	80, -118, -107, -118, -107, -51, -118, -107, -55, -39,
-	-167, -61, -167, -130, -130, -130, -139, -130, 160, -130,
-	160, -167, -167, -166, -32, 217, -37, 27, -92, 54,
-	-167, -167, -167, 54, 109, -167, -86, -89, -107, -89,
-	-89, -89, -116, -107, -86, 55, 54, -130, -141, 189,
-	9, -134, 58, 59, 59, -119, -158, -151, 53, 26,
-	-80, 13, -134, 56, -61, -167, 58, 28, -72, 33,
-	-2, -166, -107, -107, 54, 55, -167, -167, -167, -54,
-	-112, -153, -142, 125, 28, 124, 204, -135, 55, 55,
-	-89, -166, -81, 14, 16, -31, 90, 222, 9, -70,
-	-2, 109, -107, -132, 65, 28, 28, 55, -155, -156,
-	140, -37, -69, -167, 220, 48, 223, -93, -167, -107,
-	58, -162, -167, 54, -107, 38, 221, 224, -160, -156,
-	33, 38, 142, 222, 143, 223, -166, 224, -61, 139,
-	-167, -167,
+	-115, -90, -39, -51, -94, -95, 54, -118, -37, -108,
+	-114, -149, -150, -151, -108, 58, 59, -144, -145, -152,
+	125, 124, -146, 119, 28, -140, 67, 72, -136, 192,
+	-130, 53, -130, -130, -130, -130, -134, 175, -134, -134,
+	-134, 53, -130, -130, -130, -138, 53, -138, -138, -139,
+	53, -139, -112, 52, -51, -160, 222, -161, 56, 23,
+	-101, 117, 114, 115, -157, 113, 189, 175, 65, 29,
+	15, 214, 140, 225, 56, 141, -51, -51, -119, 37,
+	-37, -37, -84, -87, -96, 19, 11, 33, 33, -34,
+	67, 68, 69, 109, -166, -68, -61, -61, -61, -33,
+	135, 71, -167, -167, -34, 54, -37, -167, -167, -167,
+	54, 52, 22, -167, -34, -79, -77, 78, -37, -167,
+	-167, -167, -167, -167, -59, 30, 33, -2, -166, -166,
+	-55, 12, -44, -43, 51, 52, -45, 51, -43, 41,
+	41, 119, 119, 119, -91, -107, -55, -55, -111, 109,
+	54, -151, 80, 53, 28, -146, 56, 56, -131, 29,
+	67, -137, 193, 59, -134, -134, -135, 105, 30, -135,
+	-135, -135, -143, 58, 59, 59, 51, -107, -119, -159,
+	-158, -108, -118, -163, 146, 126, 127, 130, 129, 56,
+	119, 28, 125, 128, -163, 146, -102, -103, 121, 22,
+	119, 28, 140, -119, 38, -51, -38, 11, 97, -108,
+	-35, -33, 71, -61, -61, -167, -36, -123, 106, 172,
+	134, 170, 166, 186, 177, 191, 168, 192, -120, -123,
+	219, -82, 79, -37, 77, -92, 51, -93, -70, -72,
+	-71, -166, -2, -88, -107, -91, -82, -37, -37, 53,
+	-37, -166, -166, -166, -167, 54, -82, -118, -150, -151,
+	-154, -153, -107, 56, -133, 51, 58, 59, 60, 67,
+	204, 55, -135, -135, 56, 56, 106, 55, 54, 54,
+	55, 54, -51, 54, 80, -118, -107, -118, -107, -51,
+	-118, -107, -55, -39, -167, -61, -167, -130, -130, -130,
+	-139, -130, 160, -130, 160, -167, -167, -166, -32, 217,
+	-37, 27, -92, 54, -167, -167, -167, 54, 109, -167,
+	-86, -89, -107, -89, -89, -89, -116, -107, -86, 55,
+	54, -130, -141, 189, 9, -134, 58, 59, 59, -119,
+	-158, -151, 53, 26, -80, 13, -134, 56, -61, -167,
+	58, 28, -72, 33, -2, -166, -107, -107, 54, 55,
+	-167, -167, -167, -54, -112, -153, -142, 125, 28, 124,
+	204, -135, 55, 55, -89, -166, -81, 14, 16, -31,
+	90, 222, 9, -70, -2, 109, -107, -132, 65, 28,
+	28, 55, -155, -156, 140, -37, -69, -167, 220, 48,
+	223, -93, -167, -107, 58, -162, -167, 54, -107, 38,
+	221, 224, -160, -156, 33, 38, 142, 222, 143, 223,
+	-166, 224, -61, 139, -167, -167,
 }
 var yyDef = [...]int{
 
 	0, -2, 2, -2, 5, 6, 7, 8, 9, 10,
 	11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-	21, 458, 0, 233, 233, 233, 233, 233, 233, 0,
-	517, 500, 0, 0, 0, 0, 219, 223, 224, 0,
-	226, 227, 701, 701, 701, 701, 701, 0, 33, 34,
-	699, 1, 3, 466, 0, 0, 237, 240, 235, 0,
-	500, 0, 0, 0, 54, 0, 0, 689, 0, 690,
-	498, 518, 519, 522, 523, 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, 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, 691, 692, 693, 694, 695,
-	696, 697, 698, 0, 0, 501, 0, 496, 0, 496,
-	0, 194, 304, 526, 527, 689, 690, 0, 0, 0,
-	0, 702, 702, 702, 702, 0, 702, 702, 212, 214,
-	215, 216, 217, 702, 220, 221, 222, 225, 228, 229,
-	230, 231, 232, 27, 470, 0, 0, 458, 29, 0,
-	233, 238, 239, 243, 241, 242, 234, 0, 251, 255,
-	0, 312, 0, 317, 319, -2, -2, 0, 354, 355,
-	356, 357, 358, 0, 0, 0, 0, 0, 0, 0,
-	381, 382, 383, 384, 443, 444, 445, 446, 447, 448,
-	449, 450, 321, 322, 440, 490, 0, 0, 0, 0,
-	0, 0, 0, 431, 0, 405, 405, 405, 405, 405,
-	405, 405, 405, 0, 0, 0, 0, 0, 0, 262,
-	264, 265, 266, 285, 0, 287, 0, 0, 40, 44,
-	0, 0, 491, -2, -2, -2, 626, -2, 0, 440,
-	0, 0, 69, 0, 0, 702, 0, 59, 0, 0,
-	0, 702, 0, 0, 0, 0, 0, 193, 0, 195,
-	702, 702, 702, 702, 702, 702, 702, 702, 204, 703,
-	704, 524, 525, 530, 531, 532, 533, 534, 535, 536,
-	537, 538, 539, 540, 541, 542, 543, 544, 545, 546,
-	547, 548, 549, 550, 551, 552, 553, 554, 555, 556,
-	557, 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, 205, 206, 207, 702, 702, 209, 210, 0,
-	218, 28, 700, 22, 0, 0, 467, 0, 459, 460,
-	463, 466, 27, 240, 0, 245, 244, 236, 0, 252,
-	0, 0, 0, 256, 0, 258, 259, 0, 315, 0,
+	21, 459, 0, 234, 234, 234, 234, 234, 234, 0,
+	518, 501, 0, 0, 0, 0, 220, 224, 225, 0,
+	227, 228, 702, 702, 702, 702, 702, 0, 33, 34,
+	700, 1, 3, 467, 0, 0, 238, 241, 236, 0,
+	501, 0, 0, 0, 55, 0, 0, 690, 0, 691,
+	499, 519, 520, 523, 524, 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, 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, 692, 693, 694, 695, 696,
+	697, 698, 699, 0, 0, 502, 0, 497, 0, 497,
+	0, 195, 305, 527, 528, 690, 691, 0, 0, 0,
+	0, 703, 703, 703, 703, 0, 703, 703, 213, 215,
+	216, 217, 218, 703, 221, 222, 223, 226, 229, 230,
+	231, 232, 233, 27, 471, 0, 0, 459, 29, 0,
+	234, 239, 240, 244, 242, 243, 235, 0, 252, 256,
+	0, 313, 0, 318, 320, -2, -2, 0, 355, 356,
+	357, 358, 359, 0, 0, 0, 0, 0, 0, 0,
+	382, 383, 384, 385, 444, 445, 446, 447, 448, 449,
+	450, 451, 322, 323, 441, 491, 0, 0, 0, 0,
+	0, 0, 0, 432, 0, 406, 406, 406, 406, 406,
+	406, 406, 406, 0, 0, 0, 0, 0, 0, 263,
+	265, 266, 267, 286, 0, 288, 0, 0, 40, 45,
+	0, 0, 492, -2, -2, -2, 627, -2, 0, 441,
+	0, 0, 70, 0, 0, 703, 0, 60, 0, 0,
+	0, 703, 0, 0, 0, 0, 0, 194, 0, 196,
+	703, 703, 703, 703, 703, 703, 703, 703, 205, 704,
+	705, 525, 526, 531, 532, 533, 534, 535, 536, 537,
+	538, 539, 540, 541, 542, 543, 544, 545, 546, 547,
+	548, 549, 550, 551, 552, 553, 554, 555, 556, 557,
+	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, 206, 207, 208, 703, 703, 210, 211, 0,
+	219, 28, 701, 22, 0, 0, 468, 0, 460, 461,
+	464, 467, 27, 241, 0, 246, 245, 237, 0, 253,
+	0, 0, 0, 257, 0, 259, 260, 0, 316, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 339, 340,
-	341, 342, 343, 344, 345, 318, 0, 332, 0, 0,
-	0, 374, 375, 376, 377, 378, 379, 0, 247, 27,
-	0, 352, 0, 0, 0, 0, 0, 0, 243, 0,
-	432, 0, 397, 0, 398, 399, 400, 401, 402, 403,
-	404, 0, 247, 0, 0, 42, 0, 303, 0, 0,
-	0, 0, 0, 0, 292, 0, 0, 295, 0, 0,
-	0, 0, 286, 0, 0, 306, 659, 288, 0, 290,
-	291, 42, 0, 0, 38, 39, 0, 45, 701, 50,
-	51, 48, 0, 0, 157, 0, 122, 118, 74, 75,
-	111, 77, 111, 111, 111, 111, 135, 135, 135, 135,
-	103, 104, 105, 106, 107, 0, 90, 111, 111, 111,
-	94, 78, 79, 80, 81, 82, 83, 84, 113, 113,
-	113, 115, 115, 520, 56, 0, 62, 0, 67, 0,
-	0, 173, 0, 190, 497, 0, 702, 305, 528, 529,
-	196, 197, 198, 199, 200, 201, 202, 203, 208, 211,
-	213, 471, 0, 0, 0, 0, 0, 462, 464, 465,
-	470, 30, 243, 0, 451, 0, 0, 0, 246, 25,
-	313, 314, 316, 333, 0, 335, 337, 257, 253, 0,
-	441, -2, 323, 324, 348, 349, 350, 0, 0, 0,
-	0, 346, 328, 0, 359, 360, 361, 362, 363, 364,
-	365, 366, 367, 368, 369, 370, 373, 416, 417, 0,
-	371, 372, 380, 0, 0, 248, 249, 351, 0, 489,
-	27, 0, 0, 0, 0, 0, 0, 438, 435, 0,
-	0, 406, 0, 0, 0, 0, 0, 0, 302, 310,
-	263, 281, 283, 0, 278, 293, 294, 296, 0, 298,
-	0, 300, 301, 267, 268, 269, 0, 0, 0, 0,
-	289, 310, 310, 41, 492, 46, 493, 441, 0, 68,
-	158, 160, 163, 164, 165, 70, 71, 0, 0, 0,
-	0, 152, 153, 125, 123, 0, 120, 119, 76, 0,
-	135, 135, 97, 98, 138, 0, 138, 138, 138, 0,
-	91, 92, 93, 85, 0, 86, 87, 88, 0, 89,
-	0, 0, 702, 58, 0, 60, 61, 499, 701, 0,
-	0, 512, 174, 502, 503, 504, 505, 506, 507, 508,
-	509, 510, 511, 0, 189, 702, 192, 0, 468, 469,
-	461, 23, 0, 494, 495, 452, 453, 260, 334, 336,
-	338, 0, 247, 325, 346, 329, 0, 326, 0, 0,
-	320, 385, 0, 0, 353, -2, 388, 389, 0, 0,
-	0, 0, 458, 0, 436, 0, 0, 396, 407, 408,
-	409, 410, 483, 0, 0, -2, 0, 0, 458, 0,
-	275, 282, 0, 0, 276, 0, 277, 297, 299, 0,
-	0, 0, 0, 273, 458, 37, 0, 0, 161, 0,
-	0, 148, 0, 150, 151, 131, 0, 124, 73, 121,
-	0, 138, 138, 99, 0, 0, 100, 101, 102, 0,
-	109, 0, 0, 0, 521, 57, 63, 64, 0, 166,
-	701, 0, 175, 176, 177, 178, 179, 180, 181, 182,
-	183, 701, 0, 0, 701, 513, 514, 515, 516, 0,
-	191, 472, 24, 310, 0, 254, 442, 0, 327, 0,
-	347, 330, 386, 250, 0, 111, 111, 421, 111, 115,
-	424, 111, 426, 111, 429, 0, 0, 0, 433, 395,
-	439, 0, 31, 0, 483, 473, 485, 487, 0, 27,
-	0, 479, 0, 466, 311, 279, 0, 284, 0, 0,
-	0, 287, 0, 466, 159, 162, 0, 154, 111, 149,
-	133, 0, 126, 127, 128, 129, 130, 112, 95, 96,
-	139, 136, 137, 135, 0, 0, 116, 0, 702, 0,
-	0, 167, 0, 168, 170, 171, 172, 0, 454, 261,
-	387, 331, 390, 418, 135, 422, 423, 425, 427, 428,
-	430, 392, 391, 0, 0, 0, 437, 0, 32, 0,
-	488, -2, 0, 0, 0, 43, 35, 0, 271, 0,
-	0, 0, 306, 274, 36, 520, 0, 156, 140, 134,
-	0, 138, 110, 0, 0, 55, 65, 66, 0, 0,
-	456, 0, 419, 420, 411, 394, 434, 0, 486, 0,
-	-2, 0, 481, 480, 0, 280, 307, 308, 309, 270,
-	147, 155, 145, 0, 142, 144, 132, 108, 114, 117,
-	0, 0, 26, 0, 0, 0, 0, 0, 0, 476,
-	27, 0, 272, 72, 0, 141, 143, 59, 0, 185,
-	0, 457, 455, 393, 0, 0, 0, 484, -2, 482,
-	146, 62, 184, 0, 0, 412, 0, 415, 169, 186,
-	0, 413, 0, 0, 0, 0, 0, 414, 0, 0,
-	187, 188,
+	0, 0, 0, 0, 0, 0, 0, 0, 340, 341,
+	342, 343, 344, 345, 346, 319, 0, 333, 0, 0,
+	0, 375, 376, 377, 378, 379, 380, 0, 248, 27,
+	0, 353, 0, 0, 0, 0, 0, 0, 244, 0,
+	433, 0, 398, 0, 399, 400, 401, 402, 403, 404,
+	405, 0, 248, 0, 0, 42, 0, 304, 0, 0,
+	0, 0, 0, 0, 293, 0, 0, 296, 0, 0,
+	0, 0, 287, 0, 0, 307, 660, 289, 0, 291,
+	292, 42, 0, 0, 38, 39, 0, 46, 702, 51,
+	52, 49, 0, 0, 158, 0, 123, 119, 75, 76,
+	112, 78, 112, 112, 112, 112, 136, 136, 136, 136,
+	104, 105, 106, 107, 108, 0, 91, 112, 112, 112,
+	95, 79, 80, 81, 82, 83, 84, 85, 114, 114,
+	114, 116, 116, 521, 57, 0, 63, 0, 68, 0,
+	0, 174, 0, 191, 498, 0, 703, 306, 529, 530,
+	197, 198, 199, 200, 201, 202, 203, 204, 209, 212,
+	214, 472, 0, 0, 0, 0, 0, 463, 465, 466,
+	471, 30, 244, 0, 452, 0, 0, 0, 247, 25,
+	314, 315, 317, 334, 0, 336, 338, 258, 254, 0,
+	442, -2, 324, 325, 349, 350, 351, 0, 0, 0,
+	0, 347, 329, 0, 360, 361, 362, 363, 364, 365,
+	366, 367, 368, 369, 370, 371, 374, 417, 418, 0,
+	372, 373, 381, 0, 0, 249, 250, 352, 0, 490,
+	27, 0, 0, 0, 0, 0, 0, 439, 436, 0,
+	0, 407, 0, 0, 0, 0, 0, 0, 303, 311,
+	264, 282, 284, 0, 279, 294, 295, 297, 0, 299,
+	0, 301, 302, 268, 269, 270, 0, 0, 0, 0,
+	290, 311, 311, 41, 0, 493, 0, 47, 494, 442,
+	0, 69, 159, 161, 164, 165, 166, 71, 72, 0,
+	0, 0, 0, 153, 154, 126, 124, 0, 121, 120,
+	77, 0, 136, 136, 98, 99, 139, 0, 139, 139,
+	139, 0, 92, 93, 94, 86, 0, 87, 88, 89,
+	0, 90, 0, 0, 703, 59, 0, 61, 62, 500,
+	702, 0, 0, 513, 175, 503, 504, 505, 506, 507,
+	508, 509, 510, 511, 512, 0, 190, 703, 193, 0,
+	469, 470, 462, 23, 0, 495, 496, 453, 454, 261,
+	335, 337, 339, 0, 248, 326, 347, 330, 0, 327,
+	0, 0, 321, 386, 0, 0, 354, -2, 389, 390,
+	0, 0, 0, 0, 459, 0, 437, 0, 0, 397,
+	408, 409, 410, 411, 484, 0, 0, -2, 0, 0,
+	459, 0, 276, 283, 0, 0, 277, 0, 278, 298,
+	300, 0, 0, 0, 0, 274, 459, 37, 702, 0,
+	0, 162, 0, 0, 149, 0, 151, 152, 132, 0,
+	125, 74, 122, 0, 139, 139, 100, 0, 0, 101,
+	102, 103, 0, 110, 0, 0, 0, 522, 58, 64,
+	65, 0, 167, 702, 0, 176, 177, 178, 179, 180,
+	181, 182, 183, 184, 702, 0, 0, 702, 514, 515,
+	516, 517, 0, 192, 473, 24, 311, 0, 255, 443,
+	0, 328, 0, 348, 331, 387, 251, 0, 112, 112,
+	422, 112, 116, 425, 112, 427, 112, 430, 0, 0,
+	0, 434, 396, 440, 0, 31, 0, 484, 474, 486,
+	488, 0, 27, 0, 480, 0, 467, 312, 280, 0,
+	285, 0, 0, 0, 288, 0, 467, 44, 160, 163,
+	0, 155, 112, 150, 134, 0, 127, 128, 129, 130,
+	131, 113, 96, 97, 140, 137, 138, 136, 0, 0,
+	117, 0, 703, 0, 0, 168, 0, 169, 171, 172,
+	173, 0, 455, 262, 388, 332, 391, 419, 136, 423,
+	424, 426, 428, 429, 431, 393, 392, 0, 0, 0,
+	438, 0, 32, 0, 489, -2, 0, 0, 0, 43,
+	35, 0, 272, 0, 0, 0, 307, 275, 36, 521,
+	0, 157, 141, 135, 0, 139, 111, 0, 0, 56,
+	66, 67, 0, 0, 457, 0, 420, 421, 412, 395,
+	435, 0, 487, 0, -2, 0, 482, 481, 0, 281,
+	308, 309, 310, 271, 148, 156, 146, 0, 143, 145,
+	133, 109, 115, 118, 0, 0, 26, 0, 0, 0,
+	0, 0, 0, 477, 27, 0, 273, 73, 0, 142,
+	144, 60, 0, 186, 0, 458, 456, 394, 0, 0,
+	0, 485, -2, 483, 147, 63, 185, 0, 0, 413,
+	0, 416, 170, 187, 0, 414, 0, 0, 0, 0,
+	0, 415, 0, 0, 188, 189,
 }
 var yyTok1 = [...]int{
 
@@ -2551,76 +2579,82 @@ yydefault:
 			yyVAL.partitions = yyDollar[3].partitions
 		}
 	case 44:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		//line sql.y:445
 		{
-			yyVAL.statement = &Set{Comments: Comments(yyDollar[2].bytes2), Exprs: yyDollar[3].updateExprs}
+			yyVAL.statement = &Set{Comments: Comments(yyDollar[2].bytes2), Exprs: yyDollar[3].updateExprs, Charset: yyDollar[6].colIdent}
 		}
 	case 45:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:449
 		{
-			yyVAL.statement = &Set{Comments: Comments(yyDollar[2].bytes2), Scope: yyDollar[3].str, Exprs: yyDollar[4].updateExprs}
+			yyVAL.statement = &Set{Comments: Comments(yyDollar[2].bytes2), Exprs: yyDollar[3].updateExprs}
 		}
 	case 46:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:453
 		{
-			yyVAL.statement = &Set{Comments: Comments(yyDollar[2].bytes2), Charset: yyDollar[4].colIdent}
+			yyVAL.statement = &Set{Comments: Comments(yyDollar[2].bytes2), Scope: yyDollar[3].str, Exprs: yyDollar[4].updateExprs}
 		}
-	case 50:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:464
+	case 47:
+		yyDollar = yyS[yypt-5 : yypt+1]
+		//line sql.y:457
 		{
-			yyVAL.colIdent = yyDollar[1].colIdent
+			yyVAL.statement = &Set{Comments: Comments(yyDollar[2].bytes2), Charset: yyDollar[4].colIdent}
 		}
 	case 51:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:468
 		{
-			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
+			yyVAL.colIdent = yyDollar[1].colIdent
 		}
 	case 52:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:474
+		//line sql.y:472
 		{
-			yyVAL.str = SessionStr
+			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
 		}
 	case 53:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:478
 		{
-			yyVAL.str = GlobalStr
+			yyVAL.str = SessionStr
 		}
 	case 54:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:482
+		{
+			yyVAL.str = GlobalStr
+		}
+	case 55:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:484
+		//line sql.y:488
 		{
 			yyDollar[1].ddl.TableSpec = yyDollar[2].TableSpec
 			yyVAL.statement = yyDollar[1].ddl
 		}
-	case 55:
+	case 56:
 		yyDollar = yyS[yypt-8 : yypt+1]
-		//line sql.y:489
+		//line sql.y:493
 		{
 			// Change this to an alter statement
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[7].tableName, NewName: yyDollar[7].tableName}
 		}
-	case 56:
+	case 57:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:494
+		//line sql.y:498
 		{
 			yyVAL.statement = &DDL{Action: CreateStr, NewName: yyDollar[3].tableName.ToViewName()}
 		}
-	case 57:
+	case 58:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:498
+		//line sql.y:502
 		{
 			yyVAL.statement = &DDL{Action: CreateStr, NewName: yyDollar[5].tableName.ToViewName()}
 		}
-	case 58:
+	case 59:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:502
+		//line sql.y:506
 		{
 			yyVAL.statement = &DDL{Action: CreateVindexStr, VindexSpec: &VindexSpec{
 				Name:   yyDollar[3].colIdent,
@@ -2628,92 +2662,92 @@ yydefault:
 				Params: yyDollar[5].vindexParams,
 			}}
 		}
-	case 59:
+	case 60:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:511
+		//line sql.y:515
 		{
 			yyVAL.colIdent = NewColIdent("")
 		}
-	case 60:
+	case 61:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:515
+		//line sql.y:519
 		{
 			yyVAL.colIdent = yyDollar[2].colIdent
 		}
-	case 61:
+	case 62:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:521
+		//line sql.y:525
 		{
 			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
 		}
-	case 62:
+	case 63:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:526
+		//line sql.y:530
 		{
 			var v []VindexParam
 			yyVAL.vindexParams = v
 		}
-	case 63:
+	case 64:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:531
+		//line sql.y:535
 		{
 			yyVAL.vindexParams = yyDollar[2].vindexParams
 		}
-	case 64:
+	case 65:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:537
+		//line sql.y:541
 		{
 			yyVAL.vindexParams = make([]VindexParam, 0, 4)
 			yyVAL.vindexParams = append(yyVAL.vindexParams, yyDollar[1].vindexParam)
 		}
-	case 65:
+	case 66:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:542
+		//line sql.y:546
 		{
 			yyVAL.vindexParams = append(yyVAL.vindexParams, yyDollar[3].vindexParam)
 		}
-	case 66:
+	case 67:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:548
+		//line sql.y:552
 		{
 			yyVAL.vindexParam = VindexParam{Key: yyDollar[1].colIdent, Val: yyDollar[3].str}
 		}
-	case 67:
+	case 68:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:554
+		//line sql.y:558
 		{
 			yyVAL.ddl = &DDL{Action: CreateStr, NewName: yyDollar[4].tableName}
 			setDDL(yylex, yyVAL.ddl)
 		}
-	case 68:
+	case 69:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:561
+		//line sql.y:565
 		{
 			yyVAL.TableSpec = yyDollar[2].TableSpec
 			yyVAL.TableSpec.Options = yyDollar[4].str
 		}
-	case 69:
+	case 70:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:568
+		//line sql.y:572
 		{
 			yyVAL.TableSpec = &TableSpec{}
 			yyVAL.TableSpec.AddColumn(yyDollar[1].columnDefinition)
 		}
-	case 70:
+	case 71:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:573
+		//line sql.y:577
 		{
 			yyVAL.TableSpec.AddColumn(yyDollar[3].columnDefinition)
 		}
-	case 71:
+	case 72:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:577
+		//line sql.y:581
 		{
 			yyVAL.TableSpec.AddIndex(yyDollar[3].indexDefinition)
 		}
-	case 72:
+	case 73:
 		yyDollar = yyS[yypt-8 : yypt+1]
-		//line sql.y:583
+		//line sql.y:587
 		{
 			yyDollar[2].columnType.NotNull = yyDollar[3].boolVal
 			yyDollar[2].columnType.Default = yyDollar[4].optVal
@@ -2723,32 +2757,26 @@ yydefault:
 			yyDollar[2].columnType.Comment = yyDollar[8].optVal
 			yyVAL.columnDefinition = &ColumnDefinition{Name: NewColIdent(string(yyDollar[1].bytes)), Type: yyDollar[2].columnType}
 		}
-	case 73:
+	case 74:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:594
+		//line sql.y:598
 		{
 			yyVAL.columnType = yyDollar[1].columnType
 			yyVAL.columnType.Unsigned = yyDollar[2].boolVal
 			yyVAL.columnType.Zerofill = yyDollar[3].boolVal
 		}
-	case 76:
+	case 77:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:604
+		//line sql.y:608
 		{
 			yyVAL.columnType = yyDollar[1].columnType
 			yyVAL.columnType.Length = yyDollar[2].optVal
 		}
-	case 77:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:609
-		{
-			yyVAL.columnType = yyDollar[1].columnType
-		}
 	case 78:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:615
+		//line sql.y:613
 		{
-			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
+			yyVAL.columnType = yyDollar[1].columnType
 		}
 	case 79:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -2787,16 +2815,14 @@ yydefault:
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
 	case 85:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:645
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:643
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
-			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
-			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
 	case 86:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:651
+		//line sql.y:649
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -2804,7 +2830,7 @@ yydefault:
 		}
 	case 87:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:657
+		//line sql.y:655
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -2812,7 +2838,7 @@ yydefault:
 		}
 	case 88:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:663
+		//line sql.y:661
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
@@ -2820,23 +2846,25 @@ yydefault:
 		}
 	case 89:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:669
+		//line sql.y:667
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
 			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
 	case 90:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:677
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:673
 		{
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
+			yyVAL.columnType.Length = yyDollar[2].LengthScaleOption.Length
+			yyVAL.columnType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
 	case 91:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:681
 		{
-			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
+			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
 	case 92:
 		yyDollar = yyS[yypt-2 : yypt+1]
@@ -2851,16 +2879,16 @@ yydefault:
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
 	case 94:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:693
 		{
-			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
+			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
 	case 95:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:699
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:697
 		{
-			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 96:
 		yyDollar = yyS[yypt-4 : yypt+1]
@@ -2869,10 +2897,10 @@ yydefault:
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal, Charset: yyDollar[3].str, Collate: yyDollar[4].str}
 		}
 	case 97:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:707
 		{
-			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 98:
 		yyDollar = yyS[yypt-2 : yypt+1]
@@ -2881,10 +2909,10 @@ yydefault:
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
 	case 99:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:715
 		{
-			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 100:
 		yyDollar = yyS[yypt-3 : yypt+1]
@@ -2905,10 +2933,10 @@ yydefault:
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), Charset: yyDollar[2].str, Collate: yyDollar[3].str}
 		}
 	case 103:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:731
 		{
-			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 104:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -2935,145 +2963,145 @@ yydefault:
 			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes)}
 		}
 	case 108:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:751
 		{
-			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 109:
+		yyDollar = yyS[yypt-6 : yypt+1]
+		//line sql.y:755
+		{
+			yyVAL.columnType = ColumnType{Type: string(yyDollar[1].bytes), EnumValues: yyDollar[3].strs, Charset: yyDollar[5].str, Collate: yyDollar[6].str}
+		}
+	case 110:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:757
+		//line sql.y:761
 		{
 			yyVAL.strs = make([]string, 0, 4)
 			yyVAL.strs = append(yyVAL.strs, "'"+string(yyDollar[1].bytes)+"'")
 		}
-	case 110:
+	case 111:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:762
+		//line sql.y:766
 		{
 			yyVAL.strs = append(yyDollar[1].strs, "'"+string(yyDollar[3].bytes)+"'")
 		}
-	case 111:
+	case 112:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:767
+		//line sql.y:771
 		{
 			yyVAL.optVal = nil
 		}
-	case 112:
+	case 113:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:771
+		//line sql.y:775
 		{
 			yyVAL.optVal = NewIntVal(yyDollar[2].bytes)
 		}
-	case 113:
+	case 114:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:776
+		//line sql.y:780
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{}
 		}
-	case 114:
+	case 115:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:780
+		//line sql.y:784
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: NewIntVal(yyDollar[2].bytes),
 				Scale:  NewIntVal(yyDollar[4].bytes),
 			}
 		}
-	case 115:
+	case 116:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:788
+		//line sql.y:792
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{}
 		}
-	case 116:
+	case 117:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:792
+		//line sql.y:796
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: NewIntVal(yyDollar[2].bytes),
 			}
 		}
-	case 117:
+	case 118:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:798
+		//line sql.y:802
 		{
 			yyVAL.LengthScaleOption = LengthScaleOption{
 				Length: NewIntVal(yyDollar[2].bytes),
 				Scale:  NewIntVal(yyDollar[4].bytes),
 			}
 		}
-	case 118:
+	case 119:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:806
+		//line sql.y:810
 		{
 			yyVAL.boolVal = BoolVal(false)
 		}
-	case 119:
+	case 120:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:810
+		//line sql.y:814
 		{
 			yyVAL.boolVal = BoolVal(true)
 		}
-	case 120:
+	case 121:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:815
+		//line sql.y:819
 		{
 			yyVAL.boolVal = BoolVal(false)
 		}
-	case 121:
+	case 122:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:819
+		//line sql.y:823
 		{
 			yyVAL.boolVal = BoolVal(true)
 		}
-	case 122:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:825
-		{
-			yyVAL.boolVal = BoolVal(false)
-		}
 	case 123:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		//line sql.y:829
 		{
 			yyVAL.boolVal = BoolVal(false)
 		}
 	case 124:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:833
 		{
-			yyVAL.boolVal = BoolVal(true)
+			yyVAL.boolVal = BoolVal(false)
 		}
 	case 125:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:838
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:837
 		{
-			yyVAL.optVal = nil
+			yyVAL.boolVal = BoolVal(true)
 		}
 	case 126:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		//line sql.y:842
 		{
-			yyVAL.optVal = NewStrVal(yyDollar[2].bytes)
+			yyVAL.optVal = nil
 		}
 	case 127:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:846
 		{
-			yyVAL.optVal = NewIntVal(yyDollar[2].bytes)
+			yyVAL.optVal = NewStrVal(yyDollar[2].bytes)
 		}
 	case 128:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:850
 		{
-			yyVAL.optVal = NewFloatVal(yyDollar[2].bytes)
+			yyVAL.optVal = NewIntVal(yyDollar[2].bytes)
 		}
 	case 129:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:854
 		{
-			yyVAL.optVal = NewValArg(yyDollar[2].bytes)
+			yyVAL.optVal = NewFloatVal(yyDollar[2].bytes)
 		}
 	case 130:
 		yyDollar = yyS[yypt-2 : yypt+1]
@@ -3082,223 +3110,223 @@ yydefault:
 			yyVAL.optVal = NewValArg(yyDollar[2].bytes)
 		}
 	case 131:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:862
+		{
+			yyVAL.optVal = NewValArg(yyDollar[2].bytes)
+		}
+	case 132:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:863
+		//line sql.y:867
 		{
 			yyVAL.optVal = nil
 		}
-	case 132:
+	case 133:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:867
+		//line sql.y:871
 		{
 			yyVAL.optVal = NewValArg(yyDollar[3].bytes)
 		}
-	case 133:
+	case 134:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:872
+		//line sql.y:876
 		{
 			yyVAL.boolVal = BoolVal(false)
 		}
-	case 134:
+	case 135:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:876
+		//line sql.y:880
 		{
 			yyVAL.boolVal = BoolVal(true)
 		}
-	case 135:
+	case 136:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:881
+		//line sql.y:885
 		{
 			yyVAL.str = ""
 		}
-	case 136:
+	case 137:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:885
+		//line sql.y:889
 		{
 			yyVAL.str = string(yyDollar[3].bytes)
 		}
-	case 137:
+	case 138:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:889
+		//line sql.y:893
 		{
 			yyVAL.str = string(yyDollar[3].bytes)
 		}
-	case 138:
+	case 139:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:894
+		//line sql.y:898
 		{
 			yyVAL.str = ""
 		}
-	case 139:
+	case 140:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:898
+		//line sql.y:902
 		{
 			yyVAL.str = string(yyDollar[2].bytes)
 		}
-	case 140:
+	case 141:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:903
+		//line sql.y:907
 		{
 			yyVAL.colKeyOpt = colKeyNone
 		}
-	case 141:
+	case 142:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:907
+		//line sql.y:911
 		{
 			yyVAL.colKeyOpt = colKeyPrimary
 		}
-	case 142:
+	case 143:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:911
+		//line sql.y:915
 		{
 			yyVAL.colKeyOpt = colKey
 		}
-	case 143:
+	case 144:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:915
+		//line sql.y:919
 		{
 			yyVAL.colKeyOpt = colKeyUniqueKey
 		}
-	case 144:
+	case 145:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:919
+		//line sql.y:923
 		{
 			yyVAL.colKeyOpt = colKeyUnique
 		}
-	case 145:
+	case 146:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:924
+		//line sql.y:928
 		{
 			yyVAL.optVal = nil
 		}
-	case 146:
+	case 147:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:928
+		//line sql.y:932
 		{
 			yyVAL.optVal = NewStrVal(yyDollar[2].bytes)
 		}
-	case 147:
+	case 148:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:934
+		//line sql.y:938
 		{
 			yyVAL.indexDefinition = &IndexDefinition{Info: yyDollar[1].indexInfo, Columns: yyDollar[3].indexColumns, Using: yyDollar[5].colIdent}
 		}
-	case 148:
+	case 149:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:940
+		//line sql.y:944
 		{
 			yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes) + " " + string(yyDollar[2].bytes), Name: NewColIdent("PRIMARY"), Primary: true, Unique: true}
 		}
-	case 149:
+	case 150:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:944
+		//line sql.y:948
 		{
 			yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes) + " " + string(yyDollar[2].str), Name: NewColIdent(string(yyDollar[3].bytes)), Unique: true}
 		}
-	case 150:
+	case 151:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:948
+		//line sql.y:952
 		{
 			yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].bytes), Name: NewColIdent(string(yyDollar[2].bytes)), Unique: true}
 		}
-	case 151:
+	case 152:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:952
+		//line sql.y:956
 		{
 			yyVAL.indexInfo = &IndexInfo{Type: string(yyDollar[1].str), Name: NewColIdent(string(yyDollar[2].bytes)), Unique: false}
 		}
-	case 152:
+	case 153:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:958
+		//line sql.y:962
 		{
 			yyVAL.str = string(yyDollar[1].bytes)
 		}
-	case 153:
+	case 154:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:962
+		//line sql.y:966
 		{
 			yyVAL.str = string(yyDollar[1].bytes)
 		}
-	case 154:
+	case 155:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:968
+		//line sql.y:972
 		{
 			yyVAL.indexColumns = []*IndexColumn{yyDollar[1].indexColumn}
 		}
-	case 155:
+	case 156:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:972
+		//line sql.y:976
 		{
 			yyVAL.indexColumns = append(yyVAL.indexColumns, yyDollar[3].indexColumn)
 		}
-	case 156:
+	case 157:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:978
+		//line sql.y:982
 		{
 			yyVAL.indexColumn = &IndexColumn{Column: yyDollar[1].colIdent, Length: yyDollar[2].optVal}
 		}
-	case 157:
+	case 158:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:983
+		//line sql.y:987
 		{
 			yyVAL.str = ""
 		}
-	case 158:
+	case 159:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:987
+		//line sql.y:991
 		{
 			yyVAL.str = " " + string(yyDollar[1].str)
 		}
-	case 159:
+	case 160:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:991
+		//line sql.y:995
 		{
 			yyVAL.str = string(yyDollar[1].str) + ", " + string(yyDollar[3].str)
 		}
-	case 160:
+	case 161:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:999
+		//line sql.y:1003
 		{
 			yyVAL.str = yyDollar[1].str
 		}
-	case 161:
+	case 162:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1003
+		//line sql.y:1007
 		{
 			yyVAL.str = yyDollar[1].str + " " + yyDollar[2].str
 		}
-	case 162:
+	case 163:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1007
+		//line sql.y:1011
 		{
 			yyVAL.str = yyDollar[1].str + "=" + yyDollar[3].str
 		}
-	case 163:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1013
-		{
-			yyVAL.str = yyDollar[1].colIdent.String()
-		}
 	case 164:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1017
 		{
-			yyVAL.str = "'" + string(yyDollar[1].bytes) + "'"
+			yyVAL.str = yyDollar[1].colIdent.String()
 		}
 	case 165:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1021
 		{
-			yyVAL.str = string(yyDollar[1].bytes)
+			yyVAL.str = "'" + string(yyDollar[1].bytes) + "'"
 		}
 	case 166:
-		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:1027
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:1025
 		{
-			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, NewName: yyDollar[4].tableName}
+			yyVAL.str = string(yyDollar[1].bytes)
 		}
 	case 167:
-		yyDollar = yyS[yypt-7 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		//line sql.y:1031
 		{
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, NewName: yyDollar[4].tableName}
@@ -3310,8 +3338,14 @@ yydefault:
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, NewName: yyDollar[4].tableName}
 		}
 	case 169:
-		yyDollar = yyS[yypt-12 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		//line sql.y:1039
+		{
+			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, NewName: yyDollar[4].tableName}
+		}
+	case 170:
+		yyDollar = yyS[yypt-12 : yypt+1]
+		//line sql.y:1043
 		{
 			yyVAL.statement = &DDL{
 				Action: AddColVindexStr,
@@ -3324,9 +3358,9 @@ yydefault:
 				VindexCols: yyDollar[9].columns,
 			}
 		}
-	case 170:
+	case 171:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:1052
+		//line sql.y:1056
 		{
 			yyVAL.statement = &DDL{
 				Action: DropColVindexStr,
@@ -3336,71 +3370,71 @@ yydefault:
 				},
 			}
 		}
-	case 171:
+	case 172:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:1062
+		//line sql.y:1066
 		{
 			// Change this to a rename statement
 			yyVAL.statement = &DDL{Action: RenameStr, Table: yyDollar[4].tableName, NewName: yyDollar[7].tableName}
 		}
-	case 172:
+	case 173:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:1067
+		//line sql.y:1071
 		{
 			// Rename an index can just be an alter
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, NewName: yyDollar[4].tableName}
 		}
-	case 173:
+	case 174:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1072
+		//line sql.y:1076
 		{
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[3].tableName.ToViewName(), NewName: yyDollar[3].tableName.ToViewName()}
 		}
-	case 174:
+	case 175:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1076
+		//line sql.y:1080
 		{
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[4].tableName, PartitionSpec: yyDollar[5].partSpec}
 		}
-	case 184:
+	case 185:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:1093
+		//line sql.y:1097
 		{
 			yyVAL.partSpec = &PartitionSpec{Action: ReorganizeStr, Name: yyDollar[3].colIdent, Definitions: yyDollar[6].partDefs}
 		}
-	case 185:
+	case 186:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1099
+		//line sql.y:1103
 		{
 			yyVAL.partDefs = []*PartitionDefinition{yyDollar[1].partDef}
 		}
-	case 186:
+	case 187:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1103
+		//line sql.y:1107
 		{
 			yyVAL.partDefs = append(yyDollar[1].partDefs, yyDollar[3].partDef)
 		}
-	case 187:
+	case 188:
 		yyDollar = yyS[yypt-8 : yypt+1]
-		//line sql.y:1109
+		//line sql.y:1113
 		{
 			yyVAL.partDef = &PartitionDefinition{Name: yyDollar[2].colIdent, Limit: yyDollar[7].expr}
 		}
-	case 188:
+	case 189:
 		yyDollar = yyS[yypt-8 : yypt+1]
-		//line sql.y:1113
+		//line sql.y:1117
 		{
 			yyVAL.partDef = &PartitionDefinition{Name: yyDollar[2].colIdent, Maxvalue: true}
 		}
-	case 189:
+	case 190:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1119
+		//line sql.y:1123
 		{
 			yyVAL.statement = &DDL{Action: RenameStr, Table: yyDollar[3].tableName, NewName: yyDollar[5].tableName}
 		}
-	case 190:
+	case 191:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1125
+		//line sql.y:1129
 		{
 			var exists bool
 			if yyDollar[3].byt != 0 {
@@ -3408,16 +3442,16 @@ yydefault:
 			}
 			yyVAL.statement = &DDL{Action: DropStr, Table: yyDollar[4].tableName, IfExists: exists}
 		}
-	case 191:
+	case 192:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:1133
+		//line sql.y:1137
 		{
 			// Change this to an alter statement
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[5].tableName, NewName: yyDollar[5].tableName}
 		}
-	case 192:
+	case 193:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1138
+		//line sql.y:1142
 		{
 			var exists bool
 			if yyDollar[3].byt != 0 {
@@ -3425,30 +3459,24 @@ yydefault:
 			}
 			yyVAL.statement = &DDL{Action: DropStr, Table: yyDollar[4].tableName.ToViewName(), IfExists: exists}
 		}
-	case 193:
+	case 194:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1148
+		//line sql.y:1152
 		{
 			yyVAL.statement = &DDL{Action: TruncateStr, Table: yyDollar[3].tableName}
 		}
-	case 194:
+	case 195:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1152
+		//line sql.y:1156
 		{
 			yyVAL.statement = &DDL{Action: TruncateStr, Table: yyDollar[2].tableName}
 		}
-	case 195:
+	case 196:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1157
+		//line sql.y:1161
 		{
 			yyVAL.statement = &DDL{Action: AlterStr, Table: yyDollar[3].tableName, NewName: yyDollar[3].tableName}
 		}
-	case 196:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1163
-		{
-			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes) + " " + string(yyDollar[3].bytes)}
-		}
 	case 197:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:1167
@@ -3463,7 +3491,7 @@ yydefault:
 		}
 	case 199:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1176
+		//line sql.y:1175
 		{
 			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes) + " " + string(yyDollar[3].bytes)}
 		}
@@ -3492,10 +3520,10 @@ yydefault:
 			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes) + " " + string(yyDollar[3].bytes)}
 		}
 	case 204:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:1196
 		{
-			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)}
+			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes) + " " + string(yyDollar[3].bytes)}
 		}
 	case 205:
 		yyDollar = yyS[yypt-3 : yypt+1]
@@ -3516,16 +3544,16 @@ yydefault:
 			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)}
 		}
 	case 208:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1212
 		{
-			yyVAL.statement = &Show{Scope: yyDollar[2].str, Type: string(yyDollar[3].bytes)}
+			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)}
 		}
 	case 209:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:1216
 		{
-			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)}
+			yyVAL.statement = &Show{Scope: yyDollar[2].str, Type: string(yyDollar[3].bytes)}
 		}
 	case 210:
 		yyDollar = yyS[yypt-3 : yypt+1]
@@ -3534,28 +3562,28 @@ yydefault:
 			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)}
 		}
 	case 211:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1224
 		{
-			yyVAL.statement = &Show{Scope: yyDollar[2].str, Type: string(yyDollar[3].bytes)}
+			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)}
 		}
 	case 212:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:1228
 		{
-			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)}
+			yyVAL.statement = &Show{Scope: yyDollar[2].str, Type: string(yyDollar[3].bytes)}
 		}
 	case 213:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:1232
 		{
-			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes), OnTable: yyDollar[4].tableName}
+			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)}
 		}
 	case 214:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:1236
 		{
-			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)}
+			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes), OnTable: yyDollar[4].tableName}
 		}
 	case 215:
 		yyDollar = yyS[yypt-2 : yypt+1]
@@ -3576,70 +3604,70 @@ yydefault:
 			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)}
 		}
 	case 218:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1258
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:1252
 		{
 			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)}
 		}
 	case 219:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1264
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line sql.y:1262
 		{
-			yyVAL.str = ""
+			yyVAL.statement = &Show{Type: string(yyDollar[2].bytes)}
 		}
 	case 220:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		//line sql.y:1268
 		{
-			yyVAL.str = SessionStr
+			yyVAL.str = ""
 		}
 	case 221:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1272
 		{
-			yyVAL.str = GlobalStr
+			yyVAL.str = SessionStr
 		}
 	case 222:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1278
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:1276
 		{
-			yyVAL.statement = &Use{DBName: yyDollar[2].tableIdent}
+			yyVAL.str = GlobalStr
 		}
 	case 223:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:1282
 		{
-			yyVAL.statement = &Use{DBName: TableIdent{v: ""}}
+			yyVAL.statement = &Use{DBName: yyDollar[2].tableIdent}
 		}
 	case 224:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1288
+		//line sql.y:1286
 		{
-			yyVAL.statement = &Begin{}
+			yyVAL.statement = &Use{DBName: TableIdent{v: ""}}
 		}
 	case 225:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1292
 		{
 			yyVAL.statement = &Begin{}
 		}
 	case 226:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1298
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:1296
 		{
-			yyVAL.statement = &Commit{}
+			yyVAL.statement = &Begin{}
 		}
 	case 227:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1304
+		//line sql.y:1302
 		{
-			yyVAL.statement = &Rollback{}
+			yyVAL.statement = &Commit{}
 		}
 	case 228:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1310
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:1308
 		{
-			yyVAL.statement = &OtherRead{}
+			yyVAL.statement = &Rollback{}
 		}
 	case 229:
 		yyDollar = yyS[yypt-2 : yypt+1]
@@ -3657,7 +3685,7 @@ yydefault:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:1322
 		{
-			yyVAL.statement = &OtherAdmin{}
+			yyVAL.statement = &OtherRead{}
 		}
 	case 232:
 		yyDollar = yyS[yypt-2 : yypt+1]
@@ -3666,246 +3694,246 @@ yydefault:
 			yyVAL.statement = &OtherAdmin{}
 		}
 	case 233:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:1330
+		{
+			yyVAL.statement = &OtherAdmin{}
+		}
+	case 234:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1331
+		//line sql.y:1335
 		{
 			setAllowComments(yylex, true)
 		}
-	case 234:
+	case 235:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1335
+		//line sql.y:1339
 		{
 			yyVAL.bytes2 = yyDollar[2].bytes2
 			setAllowComments(yylex, false)
 		}
-	case 235:
+	case 236:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1341
+		//line sql.y:1345
 		{
 			yyVAL.bytes2 = nil
 		}
-	case 236:
+	case 237:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1345
+		//line sql.y:1349
 		{
 			yyVAL.bytes2 = append(yyDollar[1].bytes2, yyDollar[2].bytes)
 		}
-	case 237:
+	case 238:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1351
+		//line sql.y:1355
 		{
 			yyVAL.str = UnionStr
 		}
-	case 238:
+	case 239:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1355
+		//line sql.y:1359
 		{
 			yyVAL.str = UnionAllStr
 		}
-	case 239:
+	case 240:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1359
+		//line sql.y:1363
 		{
 			yyVAL.str = UnionDistinctStr
 		}
-	case 240:
+	case 241:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1364
+		//line sql.y:1368
 		{
 			yyVAL.str = ""
 		}
-	case 241:
+	case 242:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1368
+		//line sql.y:1372
 		{
 			yyVAL.str = SQLNoCacheStr
 		}
-	case 242:
+	case 243:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1372
+		//line sql.y:1376
 		{
 			yyVAL.str = SQLCacheStr
 		}
-	case 243:
+	case 244:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1377
+		//line sql.y:1381
 		{
 			yyVAL.str = ""
 		}
-	case 244:
+	case 245:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1381
+		//line sql.y:1385
 		{
 			yyVAL.str = DistinctStr
 		}
-	case 245:
+	case 246:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1386
+		//line sql.y:1390
 		{
 			yyVAL.str = ""
 		}
-	case 246:
+	case 247:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1390
+		//line sql.y:1394
 		{
 			yyVAL.str = StraightJoinHint
 		}
-	case 247:
+	case 248:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1395
+		//line sql.y:1399
 		{
 			yyVAL.selectExprs = nil
 		}
-	case 248:
+	case 249:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1399
+		//line sql.y:1403
 		{
 			yyVAL.selectExprs = yyDollar[1].selectExprs
 		}
-	case 249:
+	case 250:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1405
+		//line sql.y:1409
 		{
 			yyVAL.selectExprs = SelectExprs{yyDollar[1].selectExpr}
 		}
-	case 250:
+	case 251:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1409
+		//line sql.y:1413
 		{
 			yyVAL.selectExprs = append(yyVAL.selectExprs, yyDollar[3].selectExpr)
 		}
-	case 251:
+	case 252:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1415
+		//line sql.y:1419
 		{
 			yyVAL.selectExpr = &StarExpr{}
 		}
-	case 252:
+	case 253:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1419
+		//line sql.y:1423
 		{
 			yyVAL.selectExpr = &AliasedExpr{Expr: yyDollar[1].expr, As: yyDollar[2].colIdent}
 		}
-	case 253:
+	case 254:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1423
+		//line sql.y:1427
 		{
 			yyVAL.selectExpr = &StarExpr{TableName: TableName{Name: yyDollar[1].tableIdent}}
 		}
-	case 254:
+	case 255:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1427
+		//line sql.y:1431
 		{
 			yyVAL.selectExpr = &StarExpr{TableName: TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}}
 		}
-	case 255:
+	case 256:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1432
+		//line sql.y:1436
 		{
 			yyVAL.colIdent = ColIdent{}
 		}
-	case 256:
+	case 257:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1436
+		//line sql.y:1440
 		{
 			yyVAL.colIdent = yyDollar[1].colIdent
 		}
-	case 257:
+	case 258:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1440
+		//line sql.y:1444
 		{
 			yyVAL.colIdent = yyDollar[2].colIdent
 		}
-	case 259:
+	case 260:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1447
+		//line sql.y:1451
 		{
 			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
 		}
-	case 260:
+	case 261:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1452
+		//line sql.y:1456
 		{
 			yyVAL.tableExprs = TableExprs{&AliasedTableExpr{Expr: TableName{Name: NewTableIdent("dual")}}}
 		}
-	case 261:
+	case 262:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1456
+		//line sql.y:1460
 		{
 			yyVAL.tableExprs = yyDollar[2].tableExprs
 		}
-	case 262:
+	case 263:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1462
+		//line sql.y:1466
 		{
 			yyVAL.tableExprs = TableExprs{yyDollar[1].tableExpr}
 		}
-	case 263:
+	case 264:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1466
+		//line sql.y:1470
 		{
 			yyVAL.tableExprs = append(yyVAL.tableExprs, yyDollar[3].tableExpr)
 		}
-	case 266:
+	case 267:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1476
+		//line sql.y:1480
 		{
 			yyVAL.tableExpr = yyDollar[1].aliasedTableName
 		}
-	case 267:
+	case 268:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1480
+		//line sql.y:1484
 		{
 			yyVAL.tableExpr = &AliasedTableExpr{Expr: yyDollar[1].subquery, As: yyDollar[3].tableIdent}
 		}
-	case 268:
+	case 269:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1484
+		//line sql.y:1488
 		{
 			yyVAL.tableExpr = &ParenTableExpr{Exprs: yyDollar[2].tableExprs}
 		}
-	case 269:
+	case 270:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1490
+		//line sql.y:1494
 		{
 			yyVAL.aliasedTableName = &AliasedTableExpr{Expr: yyDollar[1].tableName, As: yyDollar[2].tableIdent, Hints: yyDollar[3].indexHints}
 		}
-	case 270:
+	case 271:
 		yyDollar = yyS[yypt-7 : yypt+1]
-		//line sql.y:1494
+		//line sql.y:1498
 		{
 			yyVAL.aliasedTableName = &AliasedTableExpr{Expr: yyDollar[1].tableName, Partitions: yyDollar[4].partitions, As: yyDollar[6].tableIdent, Hints: yyDollar[7].indexHints}
 		}
-	case 271:
+	case 272:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1500
+		//line sql.y:1504
 		{
 			yyVAL.columns = Columns{yyDollar[1].colIdent}
 		}
-	case 272:
+	case 273:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1504
+		//line sql.y:1508
 		{
 			yyVAL.columns = append(yyVAL.columns, yyDollar[3].colIdent)
 		}
-	case 273:
+	case 274:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1510
+		//line sql.y:1514
 		{
 			yyVAL.partitions = Partitions{yyDollar[1].colIdent}
 		}
-	case 274:
+	case 275:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1514
+		//line sql.y:1518
 		{
 			yyVAL.partitions = append(yyVAL.partitions, yyDollar[3].colIdent)
 		}
-	case 275:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1527
-		{
-			yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr, Condition: yyDollar[4].joinCondition}
-		}
 	case 276:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:1531
@@ -3919,89 +3947,89 @@ yydefault:
 			yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr, Condition: yyDollar[4].joinCondition}
 		}
 	case 278:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:1539
 		{
-			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 279:
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line sql.y:1543
+		{
+			yyVAL.tableExpr = &JoinTableExpr{LeftExpr: yyDollar[1].tableExpr, Join: yyDollar[2].str, RightExpr: yyDollar[3].tableExpr}
+		}
+	case 280:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1545
+		//line sql.y:1549
 		{
 			yyVAL.joinCondition = JoinCondition{On: yyDollar[2].expr}
 		}
-	case 280:
+	case 281:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:1547
+		//line sql.y:1551
 		{
 			yyVAL.joinCondition = JoinCondition{Using: yyDollar[3].columns}
 		}
-	case 281:
+	case 282:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1551
+		//line sql.y:1555
 		{
 		}
-	case 282:
+	case 283:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1553
+		//line sql.y:1557
 		{
 			yyVAL.joinCondition = yyDollar[1].joinCondition
 		}
-	case 283:
+	case 284:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1557
+		//line sql.y:1561
 		{
 		}
-	case 284:
+	case 285:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1559
+		//line sql.y:1563
 		{
 			yyVAL.joinCondition = JoinCondition{On: yyDollar[2].expr}
 		}
-	case 285:
+	case 286:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1562
+		//line sql.y:1566
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 286:
+	case 287:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1564
+		//line sql.y:1568
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 287:
+	case 288:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1567
+		//line sql.y:1571
 		{
 			yyVAL.tableIdent = NewTableIdent("")
 		}
-	case 288:
+	case 289:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1571
+		//line sql.y:1575
 		{
 			yyVAL.tableIdent = yyDollar[1].tableIdent
 		}
-	case 289:
+	case 290:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1575
+		//line sql.y:1579
 		{
 			yyVAL.tableIdent = yyDollar[2].tableIdent
 		}
-	case 291:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1582
-		{
-			yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes))
-		}
 	case 292:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1588
+		//line sql.y:1586
 		{
-			yyVAL.str = JoinStr
+			yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes))
 		}
 	case 293:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1592
 		{
 			yyVAL.str = JoinStr
@@ -4013,44 +4041,50 @@ yydefault:
 			yyVAL.str = JoinStr
 		}
 	case 295:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1602
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:1600
 		{
-			yyVAL.str = StraightJoinStr
+			yyVAL.str = JoinStr
 		}
 	case 296:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1608
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:1606
 		{
-			yyVAL.str = LeftJoinStr
+			yyVAL.str = StraightJoinStr
 		}
 	case 297:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:1612
 		{
 			yyVAL.str = LeftJoinStr
 		}
 	case 298:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1616
 		{
-			yyVAL.str = RightJoinStr
+			yyVAL.str = LeftJoinStr
 		}
 	case 299:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:1620
 		{
 			yyVAL.str = RightJoinStr
 		}
 	case 300:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1626
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line sql.y:1624
 		{
-			yyVAL.str = NaturalJoinStr
+			yyVAL.str = RightJoinStr
 		}
 	case 301:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:1630
+		{
+			yyVAL.str = NaturalJoinStr
+		}
+	case 302:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:1634
 		{
 			if yyDollar[2].str == LeftJoinStr {
 				yyVAL.str = NaturalLeftJoinStr
@@ -4058,401 +4092,395 @@ yydefault:
 				yyVAL.str = NaturalRightJoinStr
 			}
 		}
-	case 302:
+	case 303:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1640
+		//line sql.y:1644
 		{
 			yyVAL.tableName = yyDollar[2].tableName
 		}
-	case 303:
+	case 304:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1644
+		//line sql.y:1648
 		{
 			yyVAL.tableName = yyDollar[1].tableName
 		}
-	case 304:
+	case 305:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1650
+		//line sql.y:1654
 		{
 			yyVAL.tableName = TableName{Name: yyDollar[1].tableIdent}
 		}
-	case 305:
+	case 306:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1654
+		//line sql.y:1658
 		{
 			yyVAL.tableName = TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}
 		}
-	case 306:
+	case 307:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1659
+		//line sql.y:1663
 		{
 			yyVAL.indexHints = nil
 		}
-	case 307:
+	case 308:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1663
+		//line sql.y:1667
 		{
 			yyVAL.indexHints = &IndexHints{Type: UseStr, Indexes: yyDollar[4].columns}
 		}
-	case 308:
+	case 309:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1667
+		//line sql.y:1671
 		{
 			yyVAL.indexHints = &IndexHints{Type: IgnoreStr, Indexes: yyDollar[4].columns}
 		}
-	case 309:
+	case 310:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:1671
+		//line sql.y:1675
 		{
 			yyVAL.indexHints = &IndexHints{Type: ForceStr, Indexes: yyDollar[4].columns}
 		}
-	case 310:
+	case 311:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1676
+		//line sql.y:1680
 		{
 			yyVAL.expr = nil
 		}
-	case 311:
+	case 312:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1680
+		//line sql.y:1684
 		{
 			yyVAL.expr = yyDollar[2].expr
 		}
-	case 312:
+	case 313:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1686
+		//line sql.y:1690
 		{
 			yyVAL.expr = yyDollar[1].expr
 		}
-	case 313:
+	case 314:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1690
+		//line sql.y:1694
 		{
 			yyVAL.expr = &AndExpr{Left: yyDollar[1].expr, Right: yyDollar[3].expr}
 		}
-	case 314:
+	case 315:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1694
+		//line sql.y:1698
 		{
 			yyVAL.expr = &OrExpr{Left: yyDollar[1].expr, Right: yyDollar[3].expr}
 		}
-	case 315:
+	case 316:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1698
+		//line sql.y:1702
 		{
 			yyVAL.expr = &NotExpr{Expr: yyDollar[2].expr}
 		}
-	case 316:
+	case 317:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1702
+		//line sql.y:1706
 		{
 			yyVAL.expr = &IsExpr{Operator: yyDollar[3].str, Expr: yyDollar[1].expr}
 		}
-	case 317:
+	case 318:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1706
+		//line sql.y:1710
 		{
 			yyVAL.expr = yyDollar[1].expr
 		}
-	case 318:
+	case 319:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1710
+		//line sql.y:1714
 		{
 			yyVAL.expr = &Default{ColName: yyDollar[2].str}
 		}
-	case 319:
+	case 320:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1716
+		//line sql.y:1720
 		{
 			yyVAL.str = ""
 		}
-	case 320:
+	case 321:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1720
+		//line sql.y:1724
 		{
 			yyVAL.str = string(yyDollar[2].bytes)
 		}
-	case 321:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1726
-		{
-			yyVAL.boolVal = BoolVal(true)
-		}
 	case 322:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1730
 		{
-			yyVAL.boolVal = BoolVal(false)
+			yyVAL.boolVal = BoolVal(true)
 		}
 	case 323:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1736
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:1734
 		{
-			yyVAL.expr = &ComparisonExpr{Left: yyDollar[1].expr, Operator: yyDollar[2].str, Right: yyDollar[3].expr}
+			yyVAL.boolVal = BoolVal(false)
 		}
 	case 324:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1740
 		{
-			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 325:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1744
 		{
-			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 326:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:1748
 		{
-			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 327:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:1752
 		{
-			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 328:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		//line sql.y:1756
 		{
-			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 329:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1760
 		{
-			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 330:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:1764
 		{
-			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 331:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		//line sql.y:1768
 		{
-			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 332:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		//line sql.y:1772
 		{
-			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 333:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1778
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:1776
 		{
-			yyVAL.str = IsNullStr
+			yyVAL.expr = &ExistsExpr{Subquery: yyDollar[2].subquery}
 		}
 	case 334:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1782
 		{
-			yyVAL.str = IsNotNullStr
+			yyVAL.str = IsNullStr
 		}
 	case 335:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:1786
 		{
-			yyVAL.str = IsTrueStr
+			yyVAL.str = IsNotNullStr
 		}
 	case 336:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1790
 		{
-			yyVAL.str = IsNotTrueStr
+			yyVAL.str = IsTrueStr
 		}
 	case 337:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:1794
 		{
-			yyVAL.str = IsFalseStr
+			yyVAL.str = IsNotTrueStr
 		}
 	case 338:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1798
 		{
-			yyVAL.str = IsNotFalseStr
+			yyVAL.str = IsFalseStr
 		}
 	case 339:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1804
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:1802
 		{
-			yyVAL.str = EqualStr
+			yyVAL.str = IsNotFalseStr
 		}
 	case 340:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1808
 		{
-			yyVAL.str = LessThanStr
+			yyVAL.str = EqualStr
 		}
 	case 341:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1812
 		{
-			yyVAL.str = GreaterThanStr
+			yyVAL.str = LessThanStr
 		}
 	case 342:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1816
 		{
-			yyVAL.str = LessEqualStr
+			yyVAL.str = GreaterThanStr
 		}
 	case 343:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1820
 		{
-			yyVAL.str = GreaterEqualStr
+			yyVAL.str = LessEqualStr
 		}
 	case 344:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1824
 		{
-			yyVAL.str = NotEqualStr
+			yyVAL.str = GreaterEqualStr
 		}
 	case 345:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1828
 		{
-			yyVAL.str = NullSafeEqualStr
+			yyVAL.str = NotEqualStr
 		}
 	case 346:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:1833
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:1832
 		{
-			yyVAL.expr = nil
+			yyVAL.str = NullSafeEqualStr
 		}
 	case 347:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		//line sql.y:1837
 		{
-			yyVAL.expr = yyDollar[2].expr
+			yyVAL.expr = nil
 		}
 	case 348:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1843
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:1841
 		{
-			yyVAL.colTuple = yyDollar[1].valTuple
+			yyVAL.expr = yyDollar[2].expr
 		}
 	case 349:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1847
 		{
-			yyVAL.colTuple = yyDollar[1].subquery
+			yyVAL.colTuple = yyDollar[1].valTuple
 		}
 	case 350:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1851
 		{
-			yyVAL.colTuple = ListArg(yyDollar[1].bytes)
+			yyVAL.colTuple = yyDollar[1].subquery
 		}
 	case 351:
-		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1857
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:1855
 		{
-			yyVAL.subquery = &Subquery{yyDollar[2].selStmt}
+			yyVAL.colTuple = ListArg(yyDollar[1].bytes)
 		}
 	case 352:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1863
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line sql.y:1861
 		{
-			yyVAL.exprs = Exprs{yyDollar[1].expr}
+			yyVAL.subquery = &Subquery{yyDollar[2].selStmt}
 		}
 	case 353:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1867
 		{
-			yyVAL.exprs = append(yyDollar[1].exprs, yyDollar[3].expr)
+			yyVAL.exprs = Exprs{yyDollar[1].expr}
 		}
 	case 354:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:1873
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line sql.y:1871
 		{
-			yyVAL.expr = yyDollar[1].expr
+			yyVAL.exprs = append(yyDollar[1].exprs, yyDollar[3].expr)
 		}
 	case 355:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1877
 		{
-			yyVAL.expr = yyDollar[1].boolVal
+			yyVAL.expr = yyDollar[1].expr
 		}
 	case 356:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1881
 		{
-			yyVAL.expr = yyDollar[1].colName
+			yyVAL.expr = yyDollar[1].boolVal
 		}
 	case 357:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1885
 		{
-			yyVAL.expr = yyDollar[1].expr
+			yyVAL.expr = yyDollar[1].colName
 		}
 	case 358:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1889
 		{
-			yyVAL.expr = yyDollar[1].subquery
+			yyVAL.expr = yyDollar[1].expr
 		}
 	case 359:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:1893
 		{
-			yyVAL.expr = &BinaryExpr{Left: yyDollar[1].expr, Operator: BitAndStr, Right: yyDollar[3].expr}
+			yyVAL.expr = yyDollar[1].subquery
 		}
 	case 360:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1897
 		{
-			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 361:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1901
 		{
-			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 362:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1905
 		{
-			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 363:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1909
 		{
-			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 364:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1913
 		{
-			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 365:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1917
 		{
-			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 366:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1921
 		{
-			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 367:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1925
 		{
-			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 368:
 		yyDollar = yyS[yypt-3 : yypt+1]
@@ -4464,47 +4492,53 @@ yydefault:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1933
 		{
-			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 370:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1937
 		{
-			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 371:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1941
 		{
-			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 372:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1945
 		{
-			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 373:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1949
 		{
-			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 374:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:1953
 		{
-			yyVAL.expr = &UnaryExpr{Operator: BinaryStr, Expr: yyDollar[2].expr}
+			yyVAL.expr = &CollateExpr{Expr: yyDollar[1].expr, Charset: yyDollar[3].str}
 		}
 	case 375:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:1957
 		{
-			yyVAL.expr = &UnaryExpr{Operator: UBinaryStr, Expr: yyDollar[2].expr}
+			yyVAL.expr = &UnaryExpr{Operator: BinaryStr, Expr: yyDollar[2].expr}
 		}
 	case 376:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:1961
+		{
+			yyVAL.expr = &UnaryExpr{Operator: UBinaryStr, Expr: yyDollar[2].expr}
+		}
+	case 377:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:1965
 		{
 			if num, ok := yyDollar[2].expr.(*SQLVal); ok && num.Type == IntVal {
 				yyVAL.expr = num
@@ -4512,9 +4546,9 @@ yydefault:
 				yyVAL.expr = &UnaryExpr{Operator: UPlusStr, Expr: yyDollar[2].expr}
 			}
 		}
-	case 377:
+	case 378:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1969
+		//line sql.y:1973
 		{
 			if num, ok := yyDollar[2].expr.(*SQLVal); ok && num.Type == IntVal {
 				// Handle double negative
@@ -4528,21 +4562,21 @@ yydefault:
 				yyVAL.expr = &UnaryExpr{Operator: UMinusStr, Expr: yyDollar[2].expr}
 			}
 		}
-	case 378:
+	case 379:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1983
+		//line sql.y:1987
 		{
 			yyVAL.expr = &UnaryExpr{Operator: TildaStr, Expr: yyDollar[2].expr}
 		}
-	case 379:
+	case 380:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:1987
+		//line sql.y:1991
 		{
 			yyVAL.expr = &UnaryExpr{Operator: BangStr, Expr: yyDollar[2].expr}
 		}
-	case 380:
+	case 381:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:1991
+		//line sql.y:1995
 		{
 			// This rule prevents the usage of INTERVAL
 			// as a function. If support is needed for that,
@@ -4550,41 +4584,35 @@ yydefault:
 			// will be non-trivial because of grammar conflicts.
 			yyVAL.expr = &IntervalExpr{Expr: yyDollar[2].expr, Unit: yyDollar[3].colIdent.String()}
 		}
-	case 385:
+	case 386:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:2009
+		//line sql.y:2013
 		{
 			yyVAL.expr = &FuncExpr{Name: yyDollar[1].colIdent, Exprs: yyDollar[3].selectExprs}
 		}
-	case 386:
+	case 387:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:2013
+		//line sql.y:2017
 		{
 			yyVAL.expr = &FuncExpr{Name: yyDollar[1].colIdent, Distinct: true, Exprs: yyDollar[4].selectExprs}
 		}
-	case 387:
+	case 388:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:2017
+		//line sql.y:2021
 		{
 			yyVAL.expr = &FuncExpr{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].colIdent, Exprs: yyDollar[5].selectExprs}
 		}
-	case 388:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:2027
-		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("left"), Exprs: yyDollar[3].selectExprs}
-		}
 	case 389:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:2031
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("right"), Exprs: yyDollar[3].selectExprs}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("left"), Exprs: yyDollar[3].selectExprs}
 		}
 	case 390:
-		yyDollar = yyS[yypt-6 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:2035
 		{
-			yyVAL.expr = &ConvertExpr{Expr: yyDollar[3].expr, Type: yyDollar[5].convertType}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("right"), Exprs: yyDollar[3].selectExprs}
 		}
 	case 391:
 		yyDollar = yyS[yypt-6 : yypt+1]
@@ -4596,139 +4624,139 @@ yydefault:
 		yyDollar = yyS[yypt-6 : yypt+1]
 		//line sql.y:2043
 		{
-			yyVAL.expr = &ConvertUsingExpr{Expr: yyDollar[3].expr, Type: yyDollar[5].str}
+			yyVAL.expr = &ConvertExpr{Expr: yyDollar[3].expr, Type: yyDollar[5].convertType}
 		}
 	case 393:
-		yyDollar = yyS[yypt-9 : yypt+1]
+		yyDollar = yyS[yypt-6 : yypt+1]
 		//line sql.y:2047
 		{
-			yyVAL.expr = &MatchExpr{Columns: yyDollar[3].selectExprs, Expr: yyDollar[7].expr, Option: yyDollar[8].str}
+			yyVAL.expr = &ConvertUsingExpr{Expr: yyDollar[3].expr, Type: yyDollar[5].str}
 		}
 	case 394:
-		yyDollar = yyS[yypt-7 : yypt+1]
+		yyDollar = yyS[yypt-9 : yypt+1]
 		//line sql.y:2051
 		{
-			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 395:
-		yyDollar = yyS[yypt-5 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		//line sql.y:2055
 		{
-			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 396:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-5 : yypt+1]
 		//line sql.y:2059
 		{
-			yyVAL.expr = &ValuesFuncExpr{Name: yyDollar[3].colIdent}
+			yyVAL.expr = &CaseExpr{Expr: yyDollar[2].expr, Whens: yyDollar[3].whens, Else: yyDollar[4].expr}
 		}
 	case 397:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2069
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line sql.y:2063
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("current_timestamp")}
+			yyVAL.expr = &ValuesFuncExpr{Name: yyDollar[3].colIdent}
 		}
 	case 398:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:2073
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_timestamp")}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("current_timestamp")}
 		}
 	case 399:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:2077
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_time")}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_timestamp")}
 		}
 	case 400:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:2081
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_date")}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_time")}
 		}
 	case 401:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2086
+		//line sql.y:2085
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("localtime")}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("utc_date")}
 		}
 	case 402:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2091
+		//line sql.y:2090
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("localtimestamp")}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("localtime")}
 		}
 	case 403:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2096
+		//line sql.y:2095
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("current_date")}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("localtimestamp")}
 		}
 	case 404:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2101
+		//line sql.y:2100
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("current_time")}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("current_date")}
 		}
-	case 407:
-		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:2115
+	case 405:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:2105
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("if"), Exprs: yyDollar[3].selectExprs}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("current_time")}
 		}
 	case 408:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:2119
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("database"), Exprs: yyDollar[3].selectExprs}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("if"), Exprs: yyDollar[3].selectExprs}
 		}
 	case 409:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:2123
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("mod"), Exprs: yyDollar[3].selectExprs}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("database"), Exprs: yyDollar[3].selectExprs}
 		}
 	case 410:
 		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:2127
 		{
-			yyVAL.expr = &FuncExpr{Name: NewColIdent("replace"), Exprs: yyDollar[3].selectExprs}
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("mod"), Exprs: yyDollar[3].selectExprs}
 		}
 	case 411:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2133
+		yyDollar = yyS[yypt-4 : yypt+1]
+		//line sql.y:2131
 		{
-			yyVAL.str = ""
+			yyVAL.expr = &FuncExpr{Name: NewColIdent("replace"), Exprs: yyDollar[3].selectExprs}
 		}
 	case 412:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		//line sql.y:2137
 		{
-			yyVAL.str = BooleanModeStr
+			yyVAL.str = ""
 		}
 	case 413:
-		yyDollar = yyS[yypt-4 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:2141
 		{
-			yyVAL.str = NaturalLanguageModeStr
+			yyVAL.str = BooleanModeStr
 		}
 	case 414:
-		yyDollar = yyS[yypt-7 : yypt+1]
+		yyDollar = yyS[yypt-4 : yypt+1]
 		//line sql.y:2145
 		{
-			yyVAL.str = NaturalLanguageModeWithQueryExpansionStr
+			yyVAL.str = NaturalLanguageModeStr
 		}
 	case 415:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-7 : yypt+1]
 		//line sql.y:2149
 		{
-			yyVAL.str = QueryExpansionStr
+			yyVAL.str = NaturalLanguageModeWithQueryExpansionStr
 		}
 	case 416:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2155
+		yyDollar = yyS[yypt-3 : yypt+1]
+		//line sql.y:2153
 		{
-			yyVAL.str = string(yyDollar[1].bytes)
+			yyVAL.str = QueryExpansionStr
 		}
 	case 417:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -4737,63 +4765,63 @@ yydefault:
 			yyVAL.str = string(yyDollar[1].bytes)
 		}
 	case 418:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2165
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:2163
 		{
-			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
+			yyVAL.str = string(yyDollar[1].bytes)
 		}
 	case 419:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:2169
 		{
-			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 420:
 		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:2173
 		{
-			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 421:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		//line sql.y:2177
 		{
-			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 422:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:2181
 		{
-			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
+			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
 		}
 	case 423:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:2185
 		{
-			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 424:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2191
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:2189
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
+			yyVAL.convertType.Length = yyDollar[2].LengthScaleOption.Length
+			yyVAL.convertType.Scale = yyDollar[2].LengthScaleOption.Scale
 		}
 	case 425:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:2195
 		{
-			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
+			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
 		}
 	case 426:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:2199
 		{
-			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
+			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
 	case 427:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:2203
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
@@ -4802,143 +4830,149 @@ yydefault:
 		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:2207
 		{
-			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
+			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
 		}
 	case 429:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:2211
 		{
-			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
+			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes), Length: yyDollar[2].optVal}
 		}
 	case 430:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:2215
 		{
 			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
 		}
 	case 431:
+		yyDollar = yyS[yypt-2 : yypt+1]
+		//line sql.y:2219
+		{
+			yyVAL.convertType = &ConvertType{Type: string(yyDollar[1].bytes)}
+		}
+	case 432:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2220
+		//line sql.y:2224
 		{
 			yyVAL.expr = nil
 		}
-	case 432:
+	case 433:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2224
+		//line sql.y:2228
 		{
 			yyVAL.expr = yyDollar[1].expr
 		}
-	case 433:
+	case 434:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2229
+		//line sql.y:2233
 		{
 			yyVAL.str = string("")
 		}
-	case 434:
+	case 435:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2233
+		//line sql.y:2237
 		{
 			yyVAL.str = " separator '" + string(yyDollar[2].bytes) + "'"
 		}
-	case 435:
+	case 436:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2239
+		//line sql.y:2243
 		{
 			yyVAL.whens = []*When{yyDollar[1].when}
 		}
-	case 436:
+	case 437:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2243
+		//line sql.y:2247
 		{
 			yyVAL.whens = append(yyDollar[1].whens, yyDollar[2].when)
 		}
-	case 437:
+	case 438:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:2249
+		//line sql.y:2253
 		{
 			yyVAL.when = &When{Cond: yyDollar[2].expr, Val: yyDollar[4].expr}
 		}
-	case 438:
+	case 439:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2254
+		//line sql.y:2258
 		{
 			yyVAL.expr = nil
 		}
-	case 439:
+	case 440:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2258
+		//line sql.y:2262
 		{
 			yyVAL.expr = yyDollar[2].expr
 		}
-	case 440:
+	case 441:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2264
+		//line sql.y:2268
 		{
 			yyVAL.colName = &ColName{Name: yyDollar[1].colIdent}
 		}
-	case 441:
+	case 442:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2268
+		//line sql.y:2272
 		{
 			yyVAL.colName = &ColName{Qualifier: TableName{Name: yyDollar[1].tableIdent}, Name: yyDollar[3].colIdent}
 		}
-	case 442:
+	case 443:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:2272
+		//line sql.y:2276
 		{
 			yyVAL.colName = &ColName{Qualifier: TableName{Qualifier: yyDollar[1].tableIdent, Name: yyDollar[3].tableIdent}, Name: yyDollar[5].colIdent}
 		}
-	case 443:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2278
-		{
-			yyVAL.expr = NewStrVal(yyDollar[1].bytes)
-		}
 	case 444:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:2282
 		{
-			yyVAL.expr = NewHexVal(yyDollar[1].bytes)
+			yyVAL.expr = NewStrVal(yyDollar[1].bytes)
 		}
 	case 445:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:2286
 		{
-			yyVAL.expr = NewBitVal(yyDollar[1].bytes)
+			yyVAL.expr = NewHexVal(yyDollar[1].bytes)
 		}
 	case 446:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:2290
 		{
-			yyVAL.expr = NewIntVal(yyDollar[1].bytes)
+			yyVAL.expr = NewBitVal(yyDollar[1].bytes)
 		}
 	case 447:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:2294
 		{
-			yyVAL.expr = NewFloatVal(yyDollar[1].bytes)
+			yyVAL.expr = NewIntVal(yyDollar[1].bytes)
 		}
 	case 448:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:2298
 		{
-			yyVAL.expr = NewHexNum(yyDollar[1].bytes)
+			yyVAL.expr = NewFloatVal(yyDollar[1].bytes)
 		}
 	case 449:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:2302
 		{
-			yyVAL.expr = NewValArg(yyDollar[1].bytes)
+			yyVAL.expr = NewHexNum(yyDollar[1].bytes)
 		}
 	case 450:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:2306
 		{
-			yyVAL.expr = &NullVal{}
+			yyVAL.expr = NewValArg(yyDollar[1].bytes)
 		}
 	case 451:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2312
+		//line sql.y:2310
+		{
+			yyVAL.expr = &NullVal{}
+		}
+	case 452:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:2316
 		{
 			// TODO(sougou): Deprecate this construct.
 			if yyDollar[1].colIdent.Lowered() != "value" {
@@ -4947,239 +4981,239 @@ yydefault:
 			}
 			yyVAL.expr = NewIntVal([]byte("1"))
 		}
-	case 452:
+	case 453:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2321
+		//line sql.y:2325
 		{
 			yyVAL.expr = NewIntVal(yyDollar[1].bytes)
 		}
-	case 453:
+	case 454:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2325
+		//line sql.y:2329
 		{
 			yyVAL.expr = NewValArg(yyDollar[1].bytes)
 		}
-	case 454:
+	case 455:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2330
+		//line sql.y:2334
 		{
 			yyVAL.exprs = nil
 		}
-	case 455:
+	case 456:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2334
+		//line sql.y:2338
 		{
 			yyVAL.exprs = yyDollar[3].exprs
 		}
-	case 456:
+	case 457:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2339
+		//line sql.y:2343
 		{
 			yyVAL.expr = nil
 		}
-	case 457:
+	case 458:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2343
+		//line sql.y:2347
 		{
 			yyVAL.expr = yyDollar[2].expr
 		}
-	case 458:
+	case 459:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2348
+		//line sql.y:2352
 		{
 			yyVAL.orderBy = nil
 		}
-	case 459:
+	case 460:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2352
+		//line sql.y:2356
 		{
 			yyVAL.orderBy = yyDollar[3].orderBy
 		}
-	case 460:
+	case 461:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2358
+		//line sql.y:2362
 		{
 			yyVAL.orderBy = OrderBy{yyDollar[1].order}
 		}
-	case 461:
+	case 462:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2362
+		//line sql.y:2366
 		{
 			yyVAL.orderBy = append(yyDollar[1].orderBy, yyDollar[3].order)
 		}
-	case 462:
+	case 463:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2368
+		//line sql.y:2372
 		{
 			yyVAL.order = &Order{Expr: yyDollar[1].expr, Direction: yyDollar[2].str}
 		}
-	case 463:
+	case 464:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2373
+		//line sql.y:2377
 		{
 			yyVAL.str = AscScr
 		}
-	case 464:
+	case 465:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2377
+		//line sql.y:2381
 		{
 			yyVAL.str = AscScr
 		}
-	case 465:
+	case 466:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2381
+		//line sql.y:2385
 		{
 			yyVAL.str = DescScr
 		}
-	case 466:
+	case 467:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2386
+		//line sql.y:2390
 		{
 			yyVAL.limit = nil
 		}
-	case 467:
+	case 468:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2390
+		//line sql.y:2394
 		{
 			yyVAL.limit = &Limit{Rowcount: yyDollar[2].expr}
 		}
-	case 468:
+	case 469:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:2394
+		//line sql.y:2398
 		{
 			yyVAL.limit = &Limit{Offset: yyDollar[2].expr, Rowcount: yyDollar[4].expr}
 		}
-	case 469:
+	case 470:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:2398
+		//line sql.y:2402
 		{
 			yyVAL.limit = &Limit{Offset: yyDollar[4].expr, Rowcount: yyDollar[2].expr}
 		}
-	case 470:
+	case 471:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2403
+		//line sql.y:2407
 		{
 			yyVAL.str = ""
 		}
-	case 471:
+	case 472:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2407
+		//line sql.y:2411
 		{
 			yyVAL.str = ForUpdateStr
 		}
-	case 472:
+	case 473:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:2411
+		//line sql.y:2415
 		{
 			yyVAL.str = ShareModeStr
 		}
-	case 473:
+	case 474:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2424
+		//line sql.y:2428
 		{
 			yyVAL.ins = &Insert{Rows: yyDollar[2].values}
 		}
-	case 474:
+	case 475:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2428
+		//line sql.y:2432
 		{
 			yyVAL.ins = &Insert{Rows: yyDollar[1].selStmt}
 		}
-	case 475:
+	case 476:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2432
+		//line sql.y:2436
 		{
 			// Drop the redundant parenthesis.
 			yyVAL.ins = &Insert{Rows: yyDollar[2].selStmt}
 		}
-	case 476:
+	case 477:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:2437
+		//line sql.y:2441
 		{
 			yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[5].values}
 		}
-	case 477:
+	case 478:
 		yyDollar = yyS[yypt-4 : yypt+1]
-		//line sql.y:2441
+		//line sql.y:2445
 		{
 			yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[4].selStmt}
 		}
-	case 478:
+	case 479:
 		yyDollar = yyS[yypt-6 : yypt+1]
-		//line sql.y:2445
+		//line sql.y:2449
 		{
 			// Drop the redundant parenthesis.
 			yyVAL.ins = &Insert{Columns: yyDollar[2].columns, Rows: yyDollar[5].selStmt}
 		}
-	case 479:
+	case 480:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2452
+		//line sql.y:2456
 		{
 			yyVAL.columns = Columns{yyDollar[1].colIdent}
 		}
-	case 480:
+	case 481:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2456
+		//line sql.y:2460
 		{
 			yyVAL.columns = Columns{yyDollar[3].colIdent}
 		}
-	case 481:
+	case 482:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2460
+		//line sql.y:2464
 		{
 			yyVAL.columns = append(yyVAL.columns, yyDollar[3].colIdent)
 		}
-	case 482:
+	case 483:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:2464
+		//line sql.y:2468
 		{
 			yyVAL.columns = append(yyVAL.columns, yyDollar[5].colIdent)
 		}
-	case 483:
+	case 484:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2469
+		//line sql.y:2473
 		{
 			yyVAL.updateExprs = nil
 		}
-	case 484:
+	case 485:
 		yyDollar = yyS[yypt-5 : yypt+1]
-		//line sql.y:2473
+		//line sql.y:2477
 		{
 			yyVAL.updateExprs = yyDollar[5].updateExprs
 		}
-	case 485:
+	case 486:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2479
+		//line sql.y:2483
 		{
 			yyVAL.values = Values{yyDollar[1].valTuple}
 		}
-	case 486:
+	case 487:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2483
+		//line sql.y:2487
 		{
 			yyVAL.values = append(yyDollar[1].values, yyDollar[3].valTuple)
 		}
-	case 487:
+	case 488:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2489
+		//line sql.y:2493
 		{
 			yyVAL.valTuple = yyDollar[1].valTuple
 		}
-	case 488:
+	case 489:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2493
+		//line sql.y:2497
 		{
 			yyVAL.valTuple = ValTuple{}
 		}
-	case 489:
+	case 490:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2499
+		//line sql.y:2503
 		{
 			yyVAL.valTuple = ValTuple(yyDollar[2].exprs)
 		}
-	case 490:
+	case 491:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2505
+		//line sql.y:2509
 		{
 			if len(yyDollar[1].valTuple) == 1 {
 				yyVAL.expr = &ParenExpr{yyDollar[1].valTuple[0]}
@@ -5187,135 +5221,129 @@ yydefault:
 				yyVAL.expr = yyDollar[1].valTuple
 			}
 		}
-	case 491:
+	case 492:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2515
+		//line sql.y:2519
 		{
 			yyVAL.updateExprs = UpdateExprs{yyDollar[1].updateExpr}
 		}
-	case 492:
+	case 493:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2519
+		//line sql.y:2523
 		{
 			yyVAL.updateExprs = append(yyDollar[1].updateExprs, yyDollar[3].updateExpr)
 		}
-	case 493:
+	case 494:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2525
+		//line sql.y:2529
 		{
 			yyVAL.updateExpr = &UpdateExpr{Name: yyDollar[1].colName, Expr: yyDollar[3].expr}
 		}
-	case 496:
+	case 497:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2534
+		//line sql.y:2538
 		{
 			yyVAL.byt = 0
 		}
-	case 497:
+	case 498:
 		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2536
+		//line sql.y:2540
 		{
 			yyVAL.byt = 1
 		}
-	case 498:
+	case 499:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2539
+		//line sql.y:2543
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 499:
+	case 500:
 		yyDollar = yyS[yypt-3 : yypt+1]
-		//line sql.y:2541
+		//line sql.y:2545
 		{
 			yyVAL.empty = struct{}{}
 		}
-	case 500:
+	case 501:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2544
+		//line sql.y:2548
 		{
 			yyVAL.str = ""
 		}
-	case 501:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2546
-		{
-			yyVAL.str = IgnoreStr
-		}
 	case 502:
 		yyDollar = yyS[yypt-1 : yypt+1]
 		//line sql.y:2550
 		{
-			yyVAL.empty = struct{}{}
+			yyVAL.str = IgnoreStr
 		}
 	case 503:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2552
+		//line sql.y:2554
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 504:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2554
+		//line sql.y:2556
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 505:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2556
+		//line sql.y:2558
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 506:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2558
+		//line sql.y:2560
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 507:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2560
+		//line sql.y:2562
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 508:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2562
+		//line sql.y:2564
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 509:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2564
+		//line sql.y:2566
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 510:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2566
+		//line sql.y:2568
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 511:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2568
+		//line sql.y:2570
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 512:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2571
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:2572
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 513:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2573
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line sql.y:2575
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 514:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2575
+		//line sql.y:2577
 		{
 			yyVAL.empty = struct{}{}
 		}
@@ -5327,45 +5355,45 @@ yydefault:
 		}
 	case 516:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2581
+		//line sql.y:2583
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 517:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2584
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:2585
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 518:
-		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2586
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line sql.y:2588
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 519:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2588
+		//line sql.y:2590
 		{
 			yyVAL.empty = struct{}{}
 		}
 	case 520:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2591
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:2592
 		{
-			yyVAL.colIdent = ColIdent{}
+			yyVAL.empty = struct{}{}
 		}
 	case 521:
-		yyDollar = yyS[yypt-2 : yypt+1]
-		//line sql.y:2593
+		yyDollar = yyS[yypt-0 : yypt+1]
+		//line sql.y:2595
 		{
-			yyVAL.colIdent = yyDollar[2].colIdent
+			yyVAL.colIdent = ColIdent{}
 		}
 	case 522:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		//line sql.y:2597
 		{
-			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
+			yyVAL.colIdent = yyDollar[2].colIdent
 		}
 	case 523:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -5373,17 +5401,17 @@ yydefault:
 		{
 			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
 		}
-	case 525:
+	case 524:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2608
+		//line sql.y:2605
 		{
 			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
 		}
 	case 526:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2614
+		//line sql.y:2612
 		{
-			yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes))
+			yyVAL.colIdent = NewColIdent(string(yyDollar[1].bytes))
 		}
 	case 527:
 		yyDollar = yyS[yypt-1 : yypt+1]
@@ -5391,41 +5419,41 @@ yydefault:
 		{
 			yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes))
 		}
-	case 529:
+	case 528:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:2622
+		{
+			yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes))
+		}
+	case 530:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2625
+		//line sql.y:2629
 		{
 			yyVAL.tableIdent = NewTableIdent(string(yyDollar[1].bytes))
 		}
-	case 699:
+	case 700:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2820
+		//line sql.y:2824
 		{
 			if incNesting(yylex) {
 				yylex.Error("max nesting level reached")
 				return 1
 			}
 		}
-	case 700:
+	case 701:
 		yyDollar = yyS[yypt-1 : yypt+1]
-		//line sql.y:2829
+		//line sql.y:2833
 		{
 			decNesting(yylex)
 		}
-	case 701:
-		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2834
-		{
-			forceEOF(yylex)
-		}
 	case 702:
 		yyDollar = yyS[yypt-0 : yypt+1]
-		//line sql.y:2839
+		//line sql.y:2838
 		{
 			forceEOF(yylex)
 		}
 	case 703:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-0 : yypt+1]
 		//line sql.y:2843
 		{
 			forceEOF(yylex)
@@ -5436,6 +5464,12 @@ yydefault:
 		{
 			forceEOF(yylex)
 		}
+	case 705:
+		yyDollar = yyS[yypt-1 : yypt+1]
+		//line sql.y:2851
+		{
+			forceEOF(yylex)
+		}
 	}
 	goto yystack /* stack new state and value */
 }
diff --git a/go/vt/sqlparser/sql.y b/go/vt/sqlparser/sql.y
index e16136b786b..e3530ed1762 100644
--- a/go/vt/sqlparser/sql.y
+++ b/go/vt/sqlparser/sql.y
@@ -441,7 +441,11 @@ opt_partition_clause:
   }
 
 set_statement:
-  SET comment_opt update_list
+  SET comment_opt update_list ',' charset_or_character_set charset_value force_eof
+  {
+    $$ = &Set{Comments: Comments($2), Exprs: $3, Charset: $6}
+   }
+| SET comment_opt update_list
   {
     $$ = &Set{Comments: Comments($2), Exprs: $3}
    }
diff --git a/go/vt/vtgate/executor.go b/go/vt/vtgate/executor.go
index 1cb3f775cf9..5bb8d3a1c12 100644
--- a/go/vt/vtgate/executor.go
+++ b/go/vt/vtgate/executor.go
@@ -528,9 +528,6 @@ func (e *Executor) handleSet(ctx context.Context, safeSession *SafeSession, sql
 	if err != nil {
 		return &sqltypes.Result{}, vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, err.Error())
 	}
-	if len(vals) > 0 && charset != "" {
-		return &sqltypes.Result{}, vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "unexpected key values and charset, must specify one")
-	}
 
 	if scope == "global" {
 		return &sqltypes.Result{}, vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, "unsupported in set: global")
diff --git a/go/vt/vtgate/executor_test.go b/go/vt/vtgate/executor_test.go
index 04ae829add5..90a18015c45 100644
--- a/go/vt/vtgate/executor_test.go
+++ b/go/vt/vtgate/executor_test.go
@@ -341,6 +341,9 @@ func TestExecutorSet(t *testing.T) {
 	}, {
 		in:  "set sql_auto_is_null = 1",
 		err: "sql_auto_is_null is not currently supported",
+	}, {
+		in:  "set sql_auto_is_null = 0, names 'utf8'",
+		out: &vtgatepb.Session{Autocommit: true},
 	}}
 	for _, tcase := range testcases {
 		session := NewSafeSession(&vtgatepb.Session{Autocommit: true})