From 787207427a87c1e927387f98f41ddc60c07a6cff Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Sat, 2 Dec 2006 20:21:22 +0000 Subject: [PATCH] Regenerate. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32128 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-upgrade/UpgradeLexer.cpp | 1213 +++++------ tools/llvm-upgrade/UpgradeLexer.cpp.cvs | 1213 +++++------ tools/llvm-upgrade/UpgradeLexer.l.cvs | 8 +- tools/llvm-upgrade/UpgradeParser.cpp | 2353 +++++++++++----------- tools/llvm-upgrade/UpgradeParser.cpp.cvs | 2353 +++++++++++----------- tools/llvm-upgrade/UpgradeParser.h.cvs | 280 +-- tools/llvm-upgrade/UpgradeParser.y.cvs | 93 +- 7 files changed, 3850 insertions(+), 3663 deletions(-) diff --git a/tools/llvm-upgrade/UpgradeLexer.cpp b/tools/llvm-upgrade/UpgradeLexer.cpp index f01fa15f37a..04174a60fbf 100644 --- a/tools/llvm-upgrade/UpgradeLexer.cpp +++ b/tools/llvm-upgrade/UpgradeLexer.cpp @@ -317,36 +317,36 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 130 -#define YY_END_OF_BUFFER 131 -static yyconst short int yy_acclist[208] = +#define YY_NUM_RULES 131 +#define YY_END_OF_BUFFER 132 +static yyconst short int yy_acclist[209] = { 0, - 131, 129, 130, 128, 129, 130, 128, 130, 129, 130, - 129, 130, 129, 130, 129, 130, 129, 130, 129, 130, - 121, 129, 130, 121, 129, 130, 1, 129, 130, 129, - 130, 129, 130, 129, 130, 129, 130, 129, 130, 129, - 130, 129, 130, 129, 130, 129, 130, 129, 130, 129, - 130, 129, 130, 129, 130, 129, 130, 129, 130, 129, - 130, 129, 130, 129, 130, 129, 130, 129, 130, 129, - 130, 120, 118, 117, 117, 124, 122, 126, 121, 1, - 102, 38, 72, 22, 120, 117, 117, 125, 126, 19, - 126, 127, 60, 71, 36, 31, 39, 63, 3, 51, + 132, 130, 131, 129, 130, 131, 129, 131, 130, 131, + 130, 131, 130, 131, 130, 131, 130, 131, 130, 131, + 122, 130, 131, 122, 130, 131, 1, 130, 131, 130, + 131, 130, 131, 130, 131, 130, 131, 130, 131, 130, + 131, 130, 131, 130, 131, 130, 131, 130, 131, 130, + 131, 130, 131, 130, 131, 130, 131, 130, 131, 130, + 131, 130, 131, 130, 131, 130, 131, 130, 131, 130, + 131, 121, 119, 118, 118, 125, 123, 127, 122, 1, + 103, 39, 73, 23, 121, 118, 118, 126, 127, 20, + 127, 128, 61, 72, 37, 32, 40, 64, 3, 52, - 62, 80, 67, 101, 96, 97, 61, 73, 119, 126, - 126, 98, 46, 81, 82, 66, 110, 70, 111, 53, - 99, 21, 123, 65, 85, 69, 23, 4, 59, 64, - 52, 68, 45, 11, 84, 126, 33, 2, 5, 55, - 87, 57, 47, 75, 79, 77, 78, 76, 74, 49, - 112, 83, 48, 54, 20, 109, 42, 56, 27, 106, - 41, 89, 88, 7, 104, 30, 108, 35, 58, 95, - 91, 103, 24, 25, 90, 105, 50, 100, 94, 40, - 6, 26, 86, 34, 8, 16, 9, 93, 10, 92, - 32, 12, 14, 13, 29, 37, 15, 28, 107, 113, + 63, 81, 68, 102, 97, 98, 62, 74, 120, 127, + 127, 99, 47, 82, 83, 67, 111, 71, 112, 54, + 100, 22, 124, 66, 86, 70, 24, 4, 60, 65, + 53, 69, 46, 11, 85, 127, 34, 2, 5, 56, + 88, 58, 48, 76, 80, 78, 79, 77, 75, 50, + 113, 84, 49, 55, 21, 110, 43, 57, 28, 107, + 42, 90, 89, 7, 105, 31, 109, 36, 59, 96, + 92, 104, 25, 26, 91, 106, 51, 101, 95, 41, + 6, 27, 87, 35, 8, 16, 9, 94, 10, 93, + 33, 12, 14, 13, 30, 38, 15, 29, 108, 114, - 115, 116, 43, 114, 17, 44, 18 + 116, 117, 17, 44, 115, 18, 45, 19 } ; -static yyconst short int yy_accept[557] = +static yyconst short int yy_accept[568] = { 0, 1, 1, 1, 2, 4, 7, 9, 11, 13, 15, 17, 19, 21, 24, 27, 30, 32, 34, 36, 38, @@ -372,43 +372,44 @@ static yyconst short int yy_accept[557] = 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 109, 109, 109, 110, 111, 111, 111, 111, 112, - 112, 112, 112, 113, 113, 113, 114, 115, 116, 116, + 108, 108, 109, 109, 109, 110, 111, 111, 111, 111, + 112, 112, 112, 112, 113, 113, 113, 114, 115, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 117, 117, 117, 117, 117, 118, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 120, 121, 122, 122, 122, 123, 123, 123, 123, - 124, 124, 125, 125, 125, 125, 125, 125, 125, 126, - 126, 126, 126, 126, 127, 127, 127, 128, 128, 128, + 116, 116, 116, 116, 116, 117, 117, 117, 117, 117, + 118, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 120, 121, 122, 122, 122, 123, 123, 123, + 123, 124, 124, 125, 125, 125, 125, 125, 125, 125, + 126, 126, 126, 126, 126, 127, 127, 127, 128, 128, - 129, 129, 130, 130, 131, 132, 132, 132, 132, 132, - 132, 133, 133, 133, 134, 134, 135, 135, 135, 136, - 137, 138, 138, 138, 139, 139, 139, 139, 139, 139, - 139, 139, 139, 139, 139, 139, 139, 139, 139, 140, - 140, 141, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 143, 143, 143, 143, 143, 143, 143, - 143, 144, 144, 144, 145, 146, 147, 148, 149, 150, - 151, 151, 151, 151, 152, 152, 152, 152, 153, 154, - 154, 155, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 157, 157, 157, 158, 158, 158, 158, 158, 158, + 128, 129, 129, 130, 130, 131, 132, 132, 132, 132, + 132, 132, 132, 133, 133, 133, 134, 134, 135, 135, + 135, 136, 137, 138, 138, 138, 139, 139, 139, 139, + 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, + 139, 140, 140, 141, 142, 142, 142, 142, 142, 142, + 142, 142, 142, 142, 142, 143, 143, 143, 143, 143, + 143, 143, 143, 144, 144, 144, 145, 146, 147, 148, + 149, 150, 151, 151, 151, 151, 152, 152, 152, 152, + 153, 154, 154, 155, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 157, 157, 157, 158, 158, 158, - 158, 158, 159, 160, 161, 161, 161, 162, 163, 164, - 164, 164, 165, 165, 165, 165, 165, 166, 166, 167, - 168, 169, 170, 170, 170, 170, 171, 171, 171, 172, - 173, 174, 175, 176, 176, 177, 178, 179, 179, 179, - 179, 179, 179, 180, 180, 181, 181, 182, 183, 183, - 183, 183, 183, 183, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 186, 186, 186, 186, 186, 187, 187, 187, - 187, 187, 188, 189, 190, 190, 191, 191, 191, 191, - 192, 192, 192, 192, 193, 193, 194, 195, 195, 195, + 158, 158, 158, 158, 158, 159, 160, 161, 161, 161, + 162, 163, 164, 164, 164, 165, 165, 165, 165, 165, + 166, 166, 167, 168, 169, 170, 170, 170, 170, 171, + 171, 171, 172, 173, 174, 175, 176, 176, 176, 177, + 178, 179, 179, 179, 179, 179, 179, 180, 180, 181, + 181, 182, 183, 183, 183, 183, 183, 183, 184, 184, + 184, 184, 184, 184, 184, 184, 184, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 186, 186, 186, + 186, 186, 187, 187, 187, 187, 187, 188, 189, 190, + 190, 191, 191, 191, 191, 191, 192, 192, 192, 192, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 196, 196, 196, 196, 196, 196, 196, 196, 197, 197, - 197, 197, 197, 198, 198, 198, 198, 198, 199, 199, + 193, 193, 194, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 196, 196, 196, + 196, 196, 196, 196, 196, 197, 197, 197, 197, 197, + 197, 198, 198, 198, 198, 198, 199, 199, 199, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 201, 201, 202, 203, 203, 204, 204, - 205, 206, 207, 207, 208, 208 + 200, 200, 200, 201, 201, 202, 203, 204, 204, 205, + 205, 206, 207, 208, 208, 209, 209 } ; static yyconst int yy_ec[256] = @@ -452,137 +453,141 @@ static yyconst int yy_meta[44] = 3, 3, 3 } ; -static yyconst short int yy_base[561] = +static yyconst short int yy_base[572] = { 0, - 0, 0, 1200, 1201, 1201, 1201, 1195, 1184, 36, 40, + 0, 0, 1222, 1223, 1223, 1223, 1217, 1206, 36, 40, 44, 50, 56, 62, 0, 63, 66, 81, 89, 47, 100, 97, 76, 96, 111, 46, 48, 110, 68, 140, - 126, 171, 120, 123, 73, 130, 1193, 1201, 1182, 1201, + 126, 171, 120, 123, 73, 130, 1215, 1223, 1204, 1223, 0, 159, 176, 199, 204, 95, 209, 224, 229, 0, - 134, 165, 137, 124, 169, 151, 159, 31, 1181, 168, + 134, 165, 137, 124, 169, 151, 159, 31, 1203, 168, 210, 230, 233, 127, 241, 189, 176, 117, 242, 244, 240, 243, 246, 249, 252, 253, 257, 259, 263, 265, - 266, 274, 268, 269, 273, 277, 282, 211, 1180, 287, + 266, 274, 268, 269, 273, 277, 282, 211, 1202, 287, 290, 293, 294, 160, 270, 295, 304, 305, 299, 306, - 312, 296, 321, 324, 1179, 325, 309, 313, 333, 335, - 318, 339, 342, 332, 350, 340, 343, 215, 356, 357, - 1178, 0, 365, 370, 1177, 389, 406, 0, 1176, 359, - 372, 1175, 371, 374, 1174, 381, 1173, 375, 301, 376, - 393, 1172, 401, 396, 408, 407, 410, 411, 1171, 414, - 413, 415, 420, 421, 422, 424, 431, 432, 433, 434, - 441, 436, 440, 438, 439, 449, 443, 454, 383, 451, - 459, 462, 464, 465, 466, 1170, 468, 469, 1169, 470, - 471, 1168, 1167, 499, 476, 475, 488, 477, 503, 492, - 1166, 510, 1165, 481, 484, 516, 513, 517, 1164, 519, + 312, 296, 321, 324, 1201, 325, 309, 313, 333, 335, + 318, 340, 342, 332, 339, 347, 350, 215, 354, 356, + 1200, 0, 371, 375, 1199, 389, 406, 0, 1198, 365, + 363, 1197, 382, 359, 1196, 394, 1195, 357, 301, 393, + 390, 1194, 401, 395, 410, 411, 397, 414, 1193, 415, + 420, 418, 421, 423, 425, 422, 427, 433, 434, 435, + 439, 437, 436, 443, 440, 441, 451, 454, 457, 459, + 460, 462, 465, 466, 467, 1192, 470, 472, 1191, 379, + 474, 1190, 1189, 502, 479, 478, 483, 475, 513, 493, + 1188, 494, 1187, 477, 480, 496, 517, 518, 1186, 519, - 521, 522, 524, 523, 526, 525, 527, 528, 537, 530, - 541, 544, 545, 546, 539, 549, 556, 560, 559, 478, - 1163, 561, 563, 1201, 571, 591, 579, 595, 600, 566, - 601, 602, 1162, 603, 604, 1161, 1160, 1159, 605, 606, - 607, 610, 611, 613, 614, 615, 617, 618, 621, 622, - 628, 572, 627, 1158, 624, 635, 637, 636, 1157, 1156, - 638, 639, 642, 645, 646, 650, 648, 649, 652, 654, - 1155, 1154, 1153, 655, 656, 1152, 657, 663, 665, 0, - 675, 1151, 672, 680, 674, 679, 682, 689, 1150, 676, - 690, 692, 693, 1149, 695, 706, 1148, 707, 696, 1147, + 520, 521, 476, 527, 525, 523, 526, 529, 531, 537, + 538, 540, 541, 543, 545, 548, 553, 555, 559, 560, + 565, 1185, 562, 567, 1223, 574, 588, 595, 599, 604, + 588, 568, 589, 1184, 607, 608, 1183, 1182, 1181, 609, + 610, 611, 612, 614, 615, 617, 620, 622, 618, 621, + 625, 626, 629, 632, 1180, 630, 635, 641, 642, 1179, + 1178, 645, 643, 647, 649, 650, 651, 654, 652, 655, + 657, 1177, 1176, 1175, 659, 661, 1174, 662, 664, 674, + 0, 675, 1173, 678, 681, 679, 680, 685, 693, 1172, + 682, 690, 695, 696, 1171, 698, 709, 1170, 701, 697, - 708, 1146, 709, 1145, 1144, 710, 571, 712, 714, 717, - 1143, 721, 723, 1142, 724, 1141, 726, 725, 1140, 731, - 1139, 732, 731, 1138, 733, 743, 735, 745, 741, 749, - 751, 678, 753, 754, 756, 758, 759, 760, 1137, 761, - 1136, 1135, 762, 764, 765, 769, 771, 774, 766, 779, - 780, 783, 1134, 784, 785, 788, 791, 793, 797, 798, - 1133, 787, 803, 1132, 1131, 1130, 1129, 1128, 1127, 1126, - 804, 807, 808, 1125, 809, 810, 813, 1124, 1123, 812, - 1122, 1121, 816, 820, 814, 818, 825, 830, 824, 815, - 1120, 836, 834, 1119, 839, 841, 840, 842, 843, 844, + 1169, 711, 1168, 713, 1167, 1166, 714, 715, 717, 719, + 720, 721, 1165, 723, 728, 1164, 729, 1163, 731, 730, + 1162, 737, 1161, 737, 739, 1160, 740, 748, 745, 751, + 754, 746, 757, 756, 760, 761, 764, 765, 766, 769, + 1159, 771, 1158, 1157, 772, 773, 774, 768, 780, 782, + 784, 787, 789, 790, 1156, 792, 793, 794, 796, 797, + 803, 800, 1155, 810, 811, 1154, 1153, 1152, 1151, 1150, + 1149, 1148, 814, 815, 816, 1147, 818, 817, 822, 1146, + 1145, 819, 1144, 1143, 820, 826, 824, 821, 836, 837, + 841, 839, 842, 1142, 845, 848, 1141, 849, 853, 823, - 845, 1118, 1117, 1116, 850, 846, 1115, 1114, 1113, 852, - 858, 1112, 861, 864, 866, 853, 1111, 860, 1110, 1109, - 1108, 1107, 872, 875, 877, 1106, 878, 879, 1105, 1104, - 1103, 1102, 1101, 883, 1100, 1099, 1098, 881, 880, 882, - 884, 886, 1097, 885, 1096, 888, 1095, 1094, 891, 898, - 899, 900, 901, 1093, 904, 905, 909, 911, 907, 914, - 916, 917, 1092, 918, 920, 927, 921, 931, 934, 933, - 935, 1091, 936, 939, 942, 944, 1090, 937, 947, 945, - 948, 1089, 1088, 1087, 950, 1086, 949, 959, 955, 1083, - 967, 970, 969, 1074, 971, 1072, 1071, 972, 976, 973, + 852, 854, 855, 856, 1140, 1139, 1138, 863, 857, 1137, + 1136, 1135, 865, 869, 1134, 870, 875, 877, 864, 1133, + 881, 1132, 1131, 1130, 1129, 878, 883, 886, 1128, 889, + 891, 1127, 1126, 1125, 1124, 1123, 892, 890, 1122, 1121, + 1120, 893, 894, 896, 897, 895, 1119, 906, 1118, 907, + 1117, 1116, 909, 911, 913, 918, 914, 1115, 915, 917, + 920, 921, 919, 922, 926, 927, 1114, 928, 937, 938, + 942, 945, 941, 944, 949, 952, 1113, 955, 957, 958, + 956, 1112, 959, 960, 961, 962, 1111, 1110, 1107, 969, + 1097, 966, 976, 970, 967, 1096, 986, 987, 978, 1095, - 978, 979, 951, 981, 984, 986, 987, 989, 993, 1070, - 991, 990, 997, 999, 1000, 1002, 1003, 1068, 1008, 1010, - 1012, 1013, 1067, 1014, 1015, 1018, 1019, 1066, 1021, 1065, - 1020, 1030, 1029, 1024, 1032, 1033, 1034, 1040, 1043, 1045, - 1044, 1046, 1063, 1047, 1062, 1060, 1048, 1059, 1049, 1056, - 677, 479, 1054, 435, 1201, 1089, 1091, 124, 1095, 76 + 988, 1094, 1092, 989, 990, 995, 996, 997, 998, 1000, + 1002, 1003, 1004, 1005, 1006, 1009, 1091, 1008, 1012, 1015, + 1017, 1020, 1023, 1024, 1089, 1026, 1030, 1031, 1033, 1035, + 1088, 1036, 1037, 1038, 1041, 1084, 1043, 1044, 1082, 1042, + 1049, 1052, 1054, 1059, 1063, 1062, 1066, 1064, 1067, 1068, + 1069, 1070, 1079, 1073, 968, 827, 683, 1076, 579, 1077, + 578, 576, 490, 1078, 488, 1223, 1113, 1115, 124, 1119, + 76 } ; -static yyconst short int yy_def[561] = +static yyconst short int yy_def[572] = { 0, - 555, 1, 555, 555, 555, 555, 556, 557, 558, 555, - 557, 557, 557, 557, 559, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 556, 555, 557, 555, - 560, 560, 555, 555, 557, 557, 557, 557, 557, 559, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 566, 1, 566, 566, 566, 566, 567, 568, 569, 566, + 568, 568, 568, 568, 570, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 567, 566, 568, 566, + 571, 571, 566, 566, 568, 568, 568, 568, 568, 570, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 555, 560, 560, 555, 557, 557, 557, 49, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 49, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 566, 571, 571, 566, 568, 568, 568, 49, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 49, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 555, 555, 555, 555, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 184, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 566, 566, 566, 566, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 184, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 555, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 566, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 0, 555, 555, 555, 555, 555 + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 0, 566, 566, 566, 566, + 566 } ; -static yyconst short int yy_nxt[1245] = +static yyconst short int yy_nxt[1267] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 14, 14, 4, 15, 8, 8, 8, 16, 17, @@ -608,7 +613,7 @@ static yyconst short int yy_nxt[1245] = 184, 112, 40, 141, 150, 113, 114, 124, 44, 44, 44, 44, 47, 45, 45, 45, 45, 40, 126, 126, - 126, 126, 40, 40, 40, 127, 220, 149, 40, 178, + 126, 126, 40, 40, 40, 127, 221, 149, 40, 178, 142, 127, 47, 48, 48, 48, 48, 40, 128, 128, 128, 128, 40, 40, 128, 128, 40, 128, 128, 128, 128, 128, 128, 40, 40, 40, 40, 40, 143, 40, @@ -619,111 +624,113 @@ static yyconst short int yy_nxt[1245] = 40, 167, 170, 40, 172, 176, 40, 40, 40, 40, 177, 185, 40, 179, 40, 199, 180, 40, 40, 40, - 195, 186, 40, 182, 187, 40, 40, 181, 197, 236, + 195, 186, 40, 182, 187, 40, 40, 181, 197, 237, 183, 40, 188, 191, 40, 196, 192, 40, 40, 193, 189, 205, 194, 198, 190, 40, 40, 200, 40, 210, - 201, 203, 40, 40, 206, 40, 40, 215, 202, 207, - 211, 219, 204, 40, 214, 208, 217, 216, 218, 40, - 40, 209, 40, 212, 123, 123, 123, 123, 213, 225, - 225, 225, 225, 230, 40, 40, 226, 40, 40, 40, - 221, 222, 226, 232, 40, 235, 40, 223, 126, 126, + 201, 203, 40, 40, 206, 40, 217, 216, 202, 207, + 40, 211, 204, 40, 215, 208, 212, 40, 220, 40, + 40, 209, 40, 218, 213, 219, 40, 236, 40, 214, + 123, 123, 123, 123, 226, 226, 226, 226, 222, 231, + 223, 227, 40, 234, 232, 40, 224, 227, 126, 126, - 126, 126, 40, 231, 237, 127, 40, 234, 233, 40, - 269, 127, 227, 228, 40, 229, 229, 229, 229, 40, - 40, 40, 239, 40, 40, 242, 40, 40, 40, 238, - 241, 240, 247, 40, 40, 40, 245, 40, 243, 244, - 246, 248, 249, 250, 40, 40, 40, 40, 40, 40, - 255, 40, 40, 40, 40, 251, 40, 252, 261, 262, - 253, 264, 40, 259, 40, 257, 263, 40, 258, 254, - 260, 265, 40, 256, 267, 40, 268, 40, 40, 40, - 271, 40, 40, 40, 40, 266, 272, 270, 40, 40, - 40, 40, 40, 274, 40, 317, 276, 40, 273, 284, + 126, 126, 40, 40, 233, 127, 40, 40, 40, 279, + 40, 127, 228, 229, 40, 230, 230, 230, 230, 40, + 235, 238, 240, 40, 40, 244, 239, 40, 40, 243, + 241, 40, 242, 40, 40, 40, 40, 246, 40, 248, + 40, 247, 245, 250, 249, 251, 40, 40, 40, 40, + 40, 256, 40, 40, 40, 263, 40, 252, 254, 262, + 253, 260, 265, 266, 40, 255, 258, 40, 261, 259, + 40, 264, 40, 40, 257, 40, 269, 267, 40, 40, + 40, 272, 268, 40, 270, 40, 273, 40, 40, 40, + 40, 40, 40, 40, 275, 271, 40, 285, 277, 274, - 278, 40, 277, 275, 291, 40, 292, 279, 280, 280, - 280, 280, 281, 282, 280, 280, 40, 280, 280, 280, - 280, 280, 280, 40, 283, 285, 40, 286, 289, 40, - 40, 287, 40, 288, 40, 40, 40, 40, 40, 40, - 40, 40, 294, 40, 290, 300, 298, 293, 302, 297, - 40, 295, 40, 301, 40, 296, 299, 40, 40, 40, - 307, 303, 40, 308, 305, 304, 309, 313, 306, 40, - 312, 310, 40, 40, 40, 311, 40, 314, 315, 40, - 225, 225, 225, 225, 40, 40, 316, 226, 320, 320, - 320, 320, 318, 226, 339, 381, 321, 227, 227, 319, + 292, 40, 293, 40, 276, 278, 40, 40, 300, 40, + 280, 281, 281, 281, 281, 282, 283, 281, 281, 284, + 281, 281, 281, 281, 281, 281, 40, 294, 291, 290, + 40, 40, 40, 40, 40, 286, 40, 287, 40, 40, + 40, 288, 40, 289, 40, 299, 295, 303, 298, 301, + 40, 40, 296, 40, 40, 297, 40, 302, 40, 304, + 309, 40, 307, 311, 305, 306, 40, 308, 40, 312, + 310, 315, 40, 40, 313, 40, 316, 317, 40, 314, + 40, 40, 319, 226, 226, 226, 226, 318, 324, 40, + 227, 40, 40, 320, 228, 228, 227, 322, 322, 322, - 320, 320, 320, 320, 229, 229, 229, 229, 40, 229, - 229, 229, 229, 40, 40, 40, 40, 40, 40, 40, - 40, 322, 325, 40, 40, 326, 40, 40, 40, 330, - 40, 40, 323, 324, 40, 40, 335, 40, 329, 331, - 40, 40, 327, 328, 333, 334, 338, 340, 40, 40, - 40, 40, 40, 336, 332, 40, 337, 347, 40, 40, - 341, 40, 40, 40, 348, 40, 346, 40, 40, 40, - 40, 342, 343, 345, 344, 352, 40, 353, 40, 349, - 350, 351, 355, 354, 357, 40, 356, 40, 40, 40, - 40, 40, 40, 40, 358, 40, 360, 361, 362, 359, + 322, 40, 40, 321, 322, 322, 322, 322, 230, 230, + 230, 230, 40, 230, 230, 230, 230, 40, 323, 325, + 40, 40, 40, 40, 40, 40, 327, 40, 40, 328, + 40, 40, 332, 40, 40, 40, 337, 326, 40, 40, + 331, 333, 40, 40, 340, 40, 329, 330, 40, 335, + 336, 341, 342, 338, 40, 40, 40, 334, 40, 339, + 40, 349, 40, 40, 40, 40, 343, 40, 40, 350, + 40, 344, 40, 348, 40, 40, 345, 40, 346, 347, + 355, 354, 353, 351, 352, 357, 356, 40, 40, 359, + 358, 40, 40, 40, 40, 40, 40, 363, 40, 360, - 363, 365, 40, 40, 367, 40, 40, 364, 40, 40, - 400, 369, 370, 371, 372, 366, 373, 374, 368, 40, - 40, 40, 40, 40, 377, 40, 375, 40, 378, 376, - 40, 379, 383, 380, 40, 382, 40, 40, 40, 40, - 320, 320, 320, 320, 40, 40, 40, 384, 40, 388, - 391, 390, 392, 395, 40, 385, 40, 386, 40, 397, - 387, 389, 40, 394, 40, 396, 40, 40, 393, 40, - 399, 40, 40, 40, 40, 40, 402, 40, 40, 40, - 406, 407, 40, 398, 40, 401, 403, 40, 408, 405, - 409, 411, 40, 40, 404, 410, 40, 40, 40, 412, + 361, 365, 367, 40, 364, 362, 40, 369, 40, 40, + 40, 40, 366, 373, 40, 371, 368, 374, 372, 375, + 376, 370, 40, 378, 40, 379, 40, 40, 40, 377, + 40, 380, 40, 40, 40, 381, 40, 382, 386, 383, + 384, 40, 40, 40, 40, 385, 322, 322, 322, 322, + 40, 387, 40, 40, 391, 394, 393, 388, 40, 40, + 395, 40, 389, 398, 40, 390, 392, 40, 397, 40, + 40, 399, 400, 40, 40, 396, 402, 40, 40, 40, + 401, 40, 40, 405, 40, 40, 40, 40, 403, 409, + 414, 410, 404, 40, 406, 40, 408, 40, 411, 412, - 40, 40, 414, 413, 40, 417, 40, 419, 420, 415, - 40, 40, 416, 421, 418, 422, 40, 40, 425, 423, - 40, 40, 40, 40, 424, 40, 40, 40, 40, 40, - 428, 40, 427, 40, 430, 432, 434, 40, 40, 426, - 429, 435, 437, 40, 433, 441, 431, 40, 439, 40, - 436, 438, 40, 40, 40, 40, 40, 40, 40, 40, - 440, 445, 442, 40, 447, 40, 40, 451, 452, 444, - 443, 40, 454, 40, 40, 449, 450, 40, 448, 40, - 460, 446, 453, 456, 458, 40, 457, 455, 40, 459, + 40, 407, 40, 40, 413, 40, 40, 40, 415, 40, + 40, 416, 420, 40, 423, 422, 40, 418, 424, 425, + 417, 419, 421, 40, 40, 426, 427, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 431, 40, + 40, 428, 430, 433, 435, 439, 438, 429, 432, 40, + 40, 436, 40, 434, 40, 40, 437, 440, 40, 443, + 441, 40, 40, 442, 450, 40, 40, 40, 40, 40, + 40, 446, 445, 449, 451, 444, 40, 40, 40, 448, + 455, 456, 40, 40, 447, 458, 453, 454, 40, 452, + 40, 40, 460, 457, 40, 462, 40, 461, 459, 40, + + 463, 464, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 468, 465, 466, 469, 471, 467, 474, 470, 40, + 40, 472, 40, 475, 40, 476, 40, 40, 40, 473, + 40, 40, 40, 40, 40, 40, 483, 484, 478, 40, + 40, 40, 477, 479, 489, 480, 482, 485, 486, 487, + 40, 40, 481, 488, 40, 40, 494, 40, 40, 493, + 495, 490, 40, 491, 498, 40, 492, 496, 40, 40, + 40, 40, 40, 40, 40, 40, 500, 497, 504, 40, + 40, 40, 40, 40, 508, 499, 513, 505, 510, 40, + 506, 40, 501, 502, 503, 509, 511, 507, 512, 40, + + 40, 40, 40, 40, 516, 515, 514, 518, 40, 40, + 40, 40, 519, 40, 521, 40, 40, 40, 40, 40, + 524, 40, 40, 528, 517, 40, 522, 530, 40, 526, + 40, 520, 527, 40, 529, 531, 40, 40, 525, 40, + 523, 532, 535, 40, 40, 536, 40, 533, 40, 40, + 40, 40, 539, 534, 40, 40, 40, 40, 543, 540, + 537, 541, 40, 542, 545, 40, 548, 40, 538, 550, + 549, 546, 40, 544, 547, 40, 40, 40, 551, 40, + 40, 40, 40, 40, 552, 557, 40, 558, 559, 40, + 40, 40, 40, 553, 554, 40, 563, 40, 555, 564, + + 556, 40, 40, 562, 40, 40, 561, 40, 40, 40, + 40, 560, 565, 37, 37, 37, 37, 39, 39, 50, + 40, 50, 50, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 464, 40, 465, 469, 40, 462, 461, 463, 466, 467, - 470, 40, 40, 40, 40, 468, 471, 40, 40, 473, - 40, 472, 40, 478, 40, 474, 479, 40, 477, 40, - 40, 40, 475, 40, 40, 480, 484, 481, 476, 482, - 40, 483, 488, 490, 40, 489, 40, 40, 40, 40, - 40, 485, 40, 486, 492, 40, 487, 40, 40, 494, - 40, 40, 40, 40, 40, 499, 498, 491, 40, 493, - 502, 504, 40, 495, 506, 496, 503, 500, 497, 505, - 40, 501, 40, 40, 40, 40, 40, 507, 508, 40, - 511, 40, 40, 516, 40, 509, 514, 40, 512, 40, - - 40, 517, 40, 40, 40, 520, 40, 510, 515, 513, - 40, 522, 40, 40, 519, 40, 40, 521, 523, 524, - 518, 40, 527, 40, 528, 40, 40, 40, 40, 525, - 530, 40, 40, 40, 40, 526, 534, 40, 531, 529, - 532, 533, 40, 40, 536, 40, 40, 40, 539, 537, - 540, 535, 538, 40, 542, 541, 40, 40, 40, 40, - 40, 40, 40, 547, 544, 548, 543, 40, 552, 40, - 545, 553, 40, 40, 546, 40, 40, 551, 40, 40, - 40, 40, 550, 40, 40, 40, 549, 40, 554, 37, - 37, 37, 37, 39, 39, 50, 40, 50, 50, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 224, 40, 40, 40, 40, 121, 40, 38, 555, - - 3, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555 + 40, 40, 40, 225, 40, 40, 40, 40, 121, 40, + 38, 566, 3, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566 } ; -static yyconst short int yy_chk[1245] = +static yyconst short int yy_chk[1267] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -732,13 +739,13 @@ static yyconst short int yy_chk[1245] = 1, 1, 1, 9, 58, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 11, 12, 26, 20, 27, 58, 12, 13, 13, 13, 13, 13, 13, - 14, 14, 14, 14, 14, 14, 16, 20, 560, 17, + 14, 14, 14, 14, 14, 14, 16, 20, 571, 17, 27, 29, 27, 26, 16, 35, 35, 20, 17, 23, 29, 16, 17, 16, 18, 16, 13, 17, 16, 18, 17, 18, 19, 46, 35, 23, 23, 19, 46, 24, 22, 19, 18, 21, 24, 19, 18, 19, 21, 22, - 19, 21, 24, 28, 25, 22, 558, 24, 21, 25, + 19, 21, 24, 28, 25, 22, 569, 24, 21, 25, 68, 24, 21, 33, 21, 28, 34, 54, 33, 31, 64, 28, 25, 36, 31, 34, 28, 51, 25, 30, 53, 33, 36, 30, 68, 51, 54, 31, 53, 30, @@ -763,105 +770,107 @@ static yyconst short int yy_chk[1245] = 99, 96, 107, 93, 97, 101, 108, 92, 100, 139, 93, 111, 97, 98, 103, 99, 98, 104, 106, 98, 97, 107, 98, 101, 97, 114, 109, 103, 110, 111, - 104, 106, 112, 116, 108, 113, 117, 114, 104, 109, - 112, 117, 106, 115, 113, 110, 116, 115, 116, 119, - 120, 110, 130, 112, 123, 123, 123, 123, 112, 124, - 124, 124, 124, 130, 133, 131, 124, 134, 138, 140, - 119, 120, 124, 133, 136, 138, 169, 120, 126, 126, + 104, 106, 115, 112, 108, 113, 115, 114, 104, 109, + 116, 112, 106, 117, 113, 110, 112, 119, 117, 120, + 138, 110, 134, 116, 112, 116, 131, 138, 130, 112, + 123, 123, 123, 123, 124, 124, 124, 124, 119, 130, + 120, 124, 180, 134, 131, 133, 120, 124, 126, 126, - 126, 126, 126, 131, 140, 126, 141, 136, 134, 144, - 169, 126, 127, 127, 143, 127, 127, 127, 127, 127, - 146, 145, 143, 147, 148, 146, 151, 150, 152, 141, - 145, 144, 151, 153, 154, 155, 150, 156, 147, 148, - 150, 152, 153, 154, 157, 158, 159, 160, 554, 162, - 158, 164, 165, 163, 161, 154, 167, 155, 162, 163, - 156, 165, 166, 161, 170, 160, 164, 168, 160, 157, - 161, 166, 171, 159, 167, 172, 168, 173, 174, 175, - 171, 177, 178, 180, 181, 166, 172, 170, 186, 185, - 188, 220, 552, 174, 194, 220, 177, 195, 173, 188, + 126, 126, 126, 141, 133, 126, 140, 136, 144, 180, + 147, 126, 127, 127, 143, 127, 127, 127, 127, 127, + 136, 140, 143, 145, 146, 147, 141, 148, 150, 146, + 144, 152, 145, 151, 153, 156, 154, 150, 155, 151, + 157, 150, 148, 153, 152, 154, 158, 159, 160, 163, + 162, 158, 161, 165, 166, 163, 164, 154, 156, 162, + 155, 161, 165, 166, 167, 157, 160, 168, 161, 160, + 169, 164, 170, 171, 159, 172, 168, 166, 173, 174, + 175, 171, 167, 177, 169, 178, 172, 181, 188, 203, + 194, 186, 185, 195, 174, 170, 187, 188, 177, 173, - 180, 187, 178, 175, 194, 190, 195, 181, 184, 184, - 184, 184, 185, 186, 184, 184, 189, 184, 184, 184, - 184, 184, 184, 192, 187, 189, 197, 189, 190, 196, - 198, 189, 200, 189, 201, 202, 204, 203, 206, 205, - 207, 208, 197, 210, 192, 204, 202, 196, 205, 201, - 209, 198, 215, 204, 211, 200, 203, 212, 213, 214, - 210, 206, 216, 211, 208, 207, 212, 216, 209, 217, - 215, 213, 219, 218, 222, 214, 223, 217, 218, 230, - 225, 225, 225, 225, 307, 252, 219, 225, 227, 227, - 227, 227, 222, 225, 252, 307, 230, 226, 226, 223, + 194, 565, 195, 563, 175, 178, 190, 192, 203, 196, + 181, 184, 184, 184, 184, 185, 186, 184, 184, 187, + 184, 184, 184, 184, 184, 184, 189, 196, 192, 190, + 197, 198, 200, 201, 202, 189, 206, 189, 205, 207, + 204, 189, 208, 189, 209, 202, 197, 205, 201, 204, + 210, 211, 198, 212, 213, 200, 214, 204, 215, 206, + 211, 216, 209, 213, 207, 208, 217, 210, 218, 214, + 212, 217, 219, 220, 215, 223, 218, 219, 221, 216, + 224, 232, 221, 226, 226, 226, 226, 220, 232, 562, + 226, 561, 559, 223, 227, 227, 226, 227, 227, 227, - 226, 226, 226, 226, 228, 228, 228, 228, 228, 229, - 229, 229, 229, 229, 231, 232, 234, 235, 239, 240, - 241, 231, 235, 242, 243, 239, 244, 245, 246, 243, - 247, 248, 232, 234, 249, 250, 248, 255, 242, 244, - 253, 251, 240, 241, 246, 247, 251, 253, 256, 258, - 257, 261, 262, 249, 245, 263, 250, 262, 264, 265, - 255, 267, 268, 266, 263, 269, 261, 270, 274, 275, - 277, 256, 257, 258, 257, 267, 278, 268, 279, 264, - 265, 266, 270, 269, 275, 283, 274, 285, 281, 290, - 551, 332, 286, 284, 277, 287, 279, 281, 283, 278, + 227, 231, 233, 224, 228, 228, 228, 228, 229, 229, + 229, 229, 229, 230, 230, 230, 230, 230, 231, 233, + 235, 236, 240, 241, 242, 243, 236, 244, 245, 240, + 246, 249, 244, 247, 250, 248, 249, 235, 251, 252, + 243, 245, 253, 256, 252, 254, 241, 242, 257, 247, + 248, 253, 254, 250, 258, 259, 263, 246, 262, 251, + 264, 263, 265, 266, 267, 269, 256, 268, 270, 264, + 271, 257, 275, 262, 276, 278, 258, 279, 258, 259, + 269, 268, 267, 265, 266, 271, 270, 280, 282, 276, + 275, 284, 286, 287, 285, 291, 557, 282, 288, 278, - 284, 286, 288, 291, 287, 292, 293, 285, 295, 299, - 332, 288, 290, 291, 292, 286, 293, 295, 287, 296, - 298, 301, 303, 306, 299, 308, 296, 309, 301, 298, - 310, 303, 309, 306, 312, 308, 313, 315, 318, 317, - 320, 320, 320, 320, 323, 322, 325, 310, 327, 317, - 322, 318, 323, 327, 329, 312, 326, 313, 328, 329, - 315, 317, 330, 326, 331, 328, 333, 334, 325, 335, - 331, 336, 337, 338, 340, 343, 334, 344, 345, 349, - 338, 340, 346, 330, 347, 333, 335, 348, 343, 337, - 344, 346, 350, 351, 336, 345, 352, 354, 355, 347, + 279, 285, 287, 292, 284, 280, 289, 288, 293, 294, + 300, 296, 286, 292, 299, 289, 287, 293, 291, 294, + 296, 288, 297, 299, 302, 300, 304, 307, 308, 297, + 309, 302, 310, 311, 312, 304, 314, 307, 311, 308, + 309, 315, 317, 320, 319, 310, 322, 322, 322, 322, + 324, 312, 325, 327, 319, 324, 320, 314, 329, 332, + 325, 328, 315, 329, 330, 317, 319, 331, 328, 334, + 333, 330, 331, 335, 336, 327, 333, 337, 338, 339, + 332, 348, 340, 336, 342, 345, 346, 347, 334, 340, + 348, 342, 335, 349, 337, 350, 339, 351, 345, 346, - 362, 356, 349, 348, 357, 352, 358, 355, 356, 350, - 359, 360, 351, 357, 354, 358, 363, 371, 362, 359, - 372, 373, 375, 376, 360, 380, 377, 385, 390, 383, - 372, 386, 371, 384, 375, 377, 383, 389, 387, 363, - 373, 384, 386, 388, 380, 390, 376, 393, 388, 392, - 385, 387, 395, 397, 396, 398, 399, 400, 401, 406, - 389, 396, 392, 405, 398, 410, 416, 405, 405, 395, - 393, 411, 410, 418, 413, 400, 401, 414, 399, 415, - 418, 397, 406, 413, 415, 423, 414, 411, 424, 416, - 425, 427, 428, 439, 438, 440, 434, 441, 444, 442, + 352, 338, 353, 354, 347, 356, 357, 358, 349, 359, + 360, 350, 354, 362, 358, 357, 361, 352, 359, 360, + 351, 353, 356, 364, 365, 361, 362, 373, 374, 375, + 378, 377, 382, 385, 388, 379, 400, 387, 374, 386, + 556, 364, 373, 377, 379, 387, 386, 365, 375, 389, + 390, 382, 392, 378, 391, 393, 385, 388, 395, 391, + 389, 396, 398, 390, 400, 401, 399, 402, 403, 404, + 409, 395, 393, 399, 401, 392, 408, 419, 413, 398, + 408, 408, 414, 416, 396, 413, 403, 404, 417, 402, + 418, 426, 416, 409, 421, 418, 427, 417, 414, 428, - 427, 446, 428, 440, 449, 424, 423, 425, 434, 438, - 441, 450, 451, 452, 453, 439, 442, 455, 456, 446, - 459, 444, 457, 453, 458, 449, 455, 460, 452, 461, - 462, 464, 450, 465, 467, 456, 460, 457, 451, 458, - 466, 459, 465, 467, 468, 466, 470, 469, 471, 473, - 478, 461, 474, 462, 469, 475, 464, 476, 480, 471, - 479, 481, 487, 485, 503, 478, 476, 468, 489, 470, - 481, 487, 488, 473, 489, 474, 485, 479, 475, 488, - 491, 480, 493, 492, 495, 498, 500, 491, 492, 499, - 498, 501, 502, 503, 504, 493, 501, 505, 499, 506, + 419, 421, 430, 438, 431, 437, 442, 443, 446, 444, + 445, 430, 426, 427, 431, 438, 428, 444, 437, 448, + 450, 442, 453, 445, 454, 446, 455, 457, 459, 443, + 460, 456, 463, 461, 462, 464, 457, 459, 450, 465, + 466, 468, 448, 453, 464, 454, 456, 460, 461, 462, + 469, 470, 455, 463, 473, 471, 470, 474, 472, 469, + 471, 465, 475, 466, 474, 476, 468, 472, 478, 481, + 479, 480, 483, 484, 485, 486, 476, 473, 481, 492, + 495, 555, 490, 494, 486, 475, 495, 483, 492, 493, + 484, 499, 478, 479, 480, 490, 493, 485, 494, 497, - 507, 504, 508, 512, 511, 507, 509, 495, 502, 500, - 513, 509, 514, 515, 506, 516, 517, 508, 511, 512, - 505, 519, 515, 520, 516, 521, 522, 524, 525, 513, - 519, 526, 527, 531, 529, 514, 524, 534, 520, 517, - 521, 522, 533, 532, 526, 535, 536, 537, 531, 527, - 532, 525, 529, 538, 534, 533, 539, 541, 540, 542, - 544, 547, 549, 539, 536, 540, 535, 553, 547, 550, - 537, 549, 548, 546, 538, 545, 543, 544, 530, 528, - 523, 518, 542, 510, 497, 496, 541, 494, 553, 556, - 556, 556, 556, 557, 557, 559, 490, 559, 559, 486, + 498, 501, 504, 505, 499, 498, 497, 504, 506, 507, + 508, 509, 505, 510, 507, 511, 512, 513, 514, 515, + 510, 518, 516, 514, 501, 519, 508, 516, 520, 512, + 521, 506, 513, 522, 515, 518, 523, 524, 511, 526, + 509, 519, 522, 527, 528, 523, 529, 520, 530, 532, + 533, 534, 527, 521, 535, 540, 537, 538, 532, 528, + 524, 529, 541, 530, 534, 542, 538, 543, 526, 541, + 540, 535, 544, 533, 537, 546, 545, 548, 542, 547, + 549, 550, 551, 552, 543, 548, 554, 549, 550, 558, + 560, 564, 553, 544, 545, 539, 558, 536, 546, 560, - 484, 483, 482, 477, 472, 463, 454, 448, 447, 445, - 443, 437, 436, 435, 433, 432, 431, 430, 429, 426, - 422, 421, 420, 419, 417, 412, 409, 408, 407, 404, - 403, 402, 394, 391, 382, 381, 379, 378, 374, 370, - 369, 368, 367, 366, 365, 364, 361, 353, 342, 341, - 339, 324, 321, 319, 316, 314, 311, 305, 304, 302, - 300, 297, 294, 289, 282, 276, 273, 272, 271, 260, - 259, 254, 238, 237, 236, 233, 221, 199, 193, 191, - 183, 182, 179, 176, 149, 142, 137, 135, 132, 129, - 125, 121, 105, 89, 59, 39, 37, 8, 7, 3, + 547, 531, 525, 554, 517, 503, 552, 502, 500, 496, + 491, 551, 564, 567, 567, 567, 567, 568, 568, 570, + 489, 570, 570, 488, 487, 482, 477, 467, 458, 452, + 451, 449, 447, 441, 440, 439, 436, 435, 434, 433, + 432, 429, 425, 424, 423, 422, 420, 415, 412, 411, + 410, 407, 406, 405, 397, 394, 384, 383, 381, 380, + 376, 372, 371, 370, 369, 368, 367, 366, 363, 355, + 344, 343, 341, 326, 323, 321, 318, 316, 313, 306, + 305, 303, 301, 298, 295, 290, 283, 277, 274, 273, + 272, 261, 260, 255, 239, 238, 237, 234, 222, 199, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555 + 193, 191, 183, 182, 179, 176, 149, 142, 137, 135, + 132, 129, 125, 121, 105, 89, 59, 39, 37, 8, + 7, 3, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -919,6 +928,7 @@ char *yytext; #define RET_TY(sym,OldTY,NewTY,sign) \ Upgradelval.Type.newTy = new std::string(NewTY); \ Upgradelval.Type.oldTy = OldTY; \ + Upgradelval.Type.elemTy = VoidTy; \ return sym #define YY_NEVER_INTERACTIVE 1 @@ -938,7 +948,7 @@ char *yytext; /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing * it to deal with 64 bit numbers. */ -#line 942 "UpgradeLexer.cpp" +#line 952 "UpgradeLexer.cpp" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1089,10 +1099,10 @@ YY_DECL register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 98 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 99 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -#line 1096 "UpgradeLexer.cpp" +#line 1106 "UpgradeLexer.cpp" if ( yy_init ) { @@ -1140,14 +1150,14 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 556 ) + if ( yy_current_state >= 567 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; *yy_state_ptr++ = yy_current_state; ++yy_cp; } - while ( yy_current_state != 555 ); + while ( yy_current_state != 566 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -1185,641 +1195,646 @@ do_action: /* This label is used only to access EOF actions. */ { /* beginning of action switch */ case 1: YY_RULE_SETUP -#line 100 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 101 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { /* Ignore comments for now */ } YY_BREAK case 2: YY_RULE_SETUP -#line 102 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 103 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( BEGINTOK); } YY_BREAK case 3: YY_RULE_SETUP -#line 103 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 104 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( ENDTOK); } YY_BREAK case 4: YY_RULE_SETUP -#line 104 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 105 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( TRUETOK); } YY_BREAK case 5: YY_RULE_SETUP -#line 105 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 106 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( FALSETOK); } YY_BREAK case 6: YY_RULE_SETUP -#line 106 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 107 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( DECLARE); } YY_BREAK case 7: YY_RULE_SETUP -#line 107 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 108 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( GLOBAL); } YY_BREAK case 8: YY_RULE_SETUP -#line 108 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 109 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( CONSTANT); } YY_BREAK case 9: YY_RULE_SETUP -#line 109 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 110 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( INTERNAL); } YY_BREAK case 10: YY_RULE_SETUP -#line 110 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 111 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( LINKONCE); } YY_BREAK case 11: YY_RULE_SETUP -#line 111 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 112 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( WEAK); } YY_BREAK case 12: YY_RULE_SETUP -#line 112 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 113 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( APPENDING); } YY_BREAK case 13: YY_RULE_SETUP -#line 113 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 114 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( DLLIMPORT); } YY_BREAK case 14: YY_RULE_SETUP -#line 114 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 115 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( DLLEXPORT); } YY_BREAK case 15: YY_RULE_SETUP -#line 115 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 116 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( EXTERN_WEAK); } YY_BREAK case 16: YY_RULE_SETUP -#line 116 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 117 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( EXTERNAL); } YY_BREAK case 17: YY_RULE_SETUP -#line 117 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( IMPLEMENTATION); } +#line 118 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UNINITIALIZED); } // alias for external YY_BREAK case 18: YY_RULE_SETUP -#line 118 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ZEROINITIALIZER); } +#line 119 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( IMPLEMENTATION); } YY_BREAK case 19: YY_RULE_SETUP -#line 119 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DOTDOTDOT); } +#line 120 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ZEROINITIALIZER); } YY_BREAK case 20: YY_RULE_SETUP -#line 120 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNDEF); } +#line 121 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DOTDOTDOT); } YY_BREAK case 21: YY_RULE_SETUP -#line 121 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( NULL_TOK); } +#line 122 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UNDEF); } YY_BREAK case 22: YY_RULE_SETUP -#line 122 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TO); } +#line 123 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( NULL_TOK); } YY_BREAK case 23: YY_RULE_SETUP -#line 123 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TAIL); } +#line 124 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TO); } YY_BREAK case 24: YY_RULE_SETUP -#line 124 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TARGET); } +#line 125 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TAIL); } YY_BREAK case 25: YY_RULE_SETUP -#line 125 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TRIPLE); } +#line 126 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TARGET); } YY_BREAK case 26: YY_RULE_SETUP -#line 126 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DEPLIBS); } +#line 127 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TRIPLE); } YY_BREAK case 27: YY_RULE_SETUP -#line 127 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ENDIAN); } +#line 128 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DEPLIBS); } YY_BREAK case 28: YY_RULE_SETUP -#line 128 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( POINTERSIZE); } +#line 129 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ENDIAN); } YY_BREAK case 29: YY_RULE_SETUP -#line 129 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DATALAYOUT); } +#line 130 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( POINTERSIZE); } YY_BREAK case 30: YY_RULE_SETUP -#line 130 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LITTLE); } +#line 131 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DATALAYOUT); } YY_BREAK case 31: YY_RULE_SETUP -#line 131 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( BIG); } +#line 132 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LITTLE); } YY_BREAK case 32: YY_RULE_SETUP -#line 132 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( VOLATILE); } +#line 133 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( BIG); } YY_BREAK case 33: YY_RULE_SETUP -#line 133 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ALIGN); } +#line 134 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( VOLATILE); } YY_BREAK case 34: YY_RULE_SETUP -#line 134 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SECTION); } +#line 135 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ALIGN); } YY_BREAK case 35: YY_RULE_SETUP -#line 135 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( MODULE); } +#line 136 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SECTION); } YY_BREAK case 36: YY_RULE_SETUP -#line 136 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ASM_TOK); } +#line 137 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( MODULE); } YY_BREAK case 37: YY_RULE_SETUP -#line 137 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SIDEEFFECT); } +#line 138 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ASM_TOK); } YY_BREAK case 38: YY_RULE_SETUP #line 139 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CC_TOK); } +{ RET_TOK( SIDEEFFECT); } YY_BREAK case 39: YY_RULE_SETUP -#line 140 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CCC_TOK); } +#line 141 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CC_TOK); } YY_BREAK case 40: YY_RULE_SETUP -#line 141 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CSRETCC_TOK); } +#line 142 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CCC_TOK); } YY_BREAK case 41: YY_RULE_SETUP -#line 142 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FASTCC_TOK); } +#line 143 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CSRETCC_TOK); } YY_BREAK case 42: YY_RULE_SETUP -#line 143 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( COLDCC_TOK); } +#line 144 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FASTCC_TOK); } YY_BREAK case 43: YY_RULE_SETUP -#line 144 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( X86_STDCALLCC_TOK); } +#line 145 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( COLDCC_TOK); } YY_BREAK case 44: YY_RULE_SETUP -#line 145 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( X86_FASTCALLCC_TOK); } +#line 146 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( X86_STDCALLCC_TOK); } YY_BREAK case 45: YY_RULE_SETUP #line 147 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(VOID,VoidTy,"void",false); } +{ RET_TOK( X86_FASTCALLCC_TOK); } YY_BREAK case 46: YY_RULE_SETUP -#line 148 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(BOOL,BoolTy,"bool",false); } +#line 149 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(VOID,VoidTy,"void",false); } YY_BREAK case 47: YY_RULE_SETUP -#line 149 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(SBYTE,SByteTy,"sbyte",true); } +#line 150 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(BOOL,BoolTy,"bool",false); } YY_BREAK case 48: YY_RULE_SETUP -#line 150 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(UBYTE,UByteTy,"ubyte",false); } +#line 151 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(SBYTE,SByteTy,"sbyte",true); } YY_BREAK case 49: YY_RULE_SETUP -#line 151 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(SHORT,ShortTy,"short",true); } +#line 152 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(UBYTE,UByteTy,"ubyte",false); } YY_BREAK case 50: YY_RULE_SETUP -#line 152 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(USHORT,UShortTy,"ushort",false); } +#line 153 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(SHORT,ShortTy,"short",true); } YY_BREAK case 51: YY_RULE_SETUP -#line 153 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(INT,IntTy,"int",true); } +#line 154 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(USHORT,UShortTy,"ushort",false); } YY_BREAK case 52: YY_RULE_SETUP -#line 154 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(UINT,UIntTy,"uint",false); } +#line 155 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(INT,IntTy,"int",true); } YY_BREAK case 53: YY_RULE_SETUP -#line 155 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(LONG,LongTy,"long",true); } +#line 156 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(UINT,UIntTy,"uint",false); } YY_BREAK case 54: YY_RULE_SETUP -#line 156 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(ULONG,ULongTy,"ulong",false); } +#line 157 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(LONG,LongTy,"long",true); } YY_BREAK case 55: YY_RULE_SETUP -#line 157 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(FLOAT,FloatTy,"float",false); } +#line 158 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(ULONG,ULongTy,"ulong",false); } YY_BREAK case 56: YY_RULE_SETUP -#line 158 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(DOUBLE,DoubleTy,"double",false); } +#line 159 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(FLOAT,FloatTy,"float",false); } YY_BREAK case 57: YY_RULE_SETUP -#line 159 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(LABEL,LabelTy,"label",false); } +#line 160 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(DOUBLE,DoubleTy,"double",false); } YY_BREAK case 58: YY_RULE_SETUP -#line 160 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OPAQUE); } +#line 161 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(LABEL,LabelTy,"label",false); } YY_BREAK case 59: YY_RULE_SETUP -#line 161 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(TYPE); } +#line 162 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OPAQUE); } YY_BREAK case 60: YY_RULE_SETUP #line 163 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ADD); } +{ RET_TOK(TYPE); } YY_BREAK case 61: YY_RULE_SETUP -#line 164 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SUB); } +#line 165 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ADD); } YY_BREAK case 62: YY_RULE_SETUP -#line 165 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( MUL); } +#line 166 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SUB); } YY_BREAK case 63: YY_RULE_SETUP -#line 166 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UDIV); } +#line 167 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( MUL); } YY_BREAK case 64: YY_RULE_SETUP -#line 167 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UDIV); } +#line 168 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DIV); } YY_BREAK case 65: YY_RULE_SETUP -#line 168 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SDIV); } +#line 169 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UDIV); } YY_BREAK case 66: YY_RULE_SETUP -#line 169 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FDIV); } +#line 170 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SDIV); } YY_BREAK case 67: YY_RULE_SETUP -#line 170 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UREM); } +#line 171 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FDIV); } YY_BREAK case 68: YY_RULE_SETUP -#line 171 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UREM); } +#line 172 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( REM); } YY_BREAK case 69: YY_RULE_SETUP -#line 172 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SREM); } +#line 173 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UREM); } YY_BREAK case 70: YY_RULE_SETUP -#line 173 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FREM); } +#line 174 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SREM); } YY_BREAK case 71: YY_RULE_SETUP -#line 174 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( AND); } +#line 175 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FREM); } YY_BREAK case 72: YY_RULE_SETUP -#line 175 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( OR); } +#line 176 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( AND); } YY_BREAK case 73: YY_RULE_SETUP -#line 176 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( XOR); } +#line 177 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( OR); } YY_BREAK case 74: YY_RULE_SETUP -#line 177 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETNE); } +#line 178 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( XOR); } YY_BREAK case 75: YY_RULE_SETUP -#line 178 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETEQ); } +#line 179 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETNE); } YY_BREAK case 76: YY_RULE_SETUP -#line 179 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETLT); } +#line 180 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETEQ); } YY_BREAK case 77: YY_RULE_SETUP -#line 180 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETGT); } +#line 181 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETLT); } YY_BREAK case 78: YY_RULE_SETUP -#line 181 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETLE); } +#line 182 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETGT); } YY_BREAK case 79: YY_RULE_SETUP -#line 182 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETGE); } +#line 183 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETLE); } YY_BREAK case 80: YY_RULE_SETUP #line 184 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( PHI_TOK); } +{ RET_TOK( SETGE); } YY_BREAK case 81: YY_RULE_SETUP -#line 185 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CALL); } +#line 186 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( PHI_TOK); } YY_BREAK case 82: YY_RULE_SETUP -#line 186 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CAST); } +#line 187 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CALL); } YY_BREAK case 83: YY_RULE_SETUP -#line 187 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TRUNC); } +#line 188 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CAST); } YY_BREAK case 84: YY_RULE_SETUP -#line 188 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ZEXT); } +#line 189 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TRUNC); } YY_BREAK case 85: YY_RULE_SETUP -#line 189 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SEXT); } +#line 190 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ZEXT); } YY_BREAK case 86: YY_RULE_SETUP -#line 190 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPTRUNC); } +#line 191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SEXT); } YY_BREAK case 87: YY_RULE_SETUP -#line 191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPEXT); } +#line 192 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPTRUNC); } YY_BREAK case 88: YY_RULE_SETUP -#line 192 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPTOUI); } +#line 193 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPEXT); } YY_BREAK case 89: YY_RULE_SETUP -#line 193 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPTOSI); } +#line 194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPTOUI); } YY_BREAK case 90: YY_RULE_SETUP -#line 194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UITOFP); } +#line 195 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPTOSI); } YY_BREAK case 91: YY_RULE_SETUP -#line 195 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SITOFP); } +#line 196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UITOFP); } YY_BREAK case 92: YY_RULE_SETUP -#line 196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( PTRTOINT); } +#line 197 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SITOFP); } YY_BREAK case 93: YY_RULE_SETUP -#line 197 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INTTOPTR); } +#line 198 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( PTRTOINT); } YY_BREAK case 94: YY_RULE_SETUP -#line 198 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( BITCAST); } +#line 199 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INTTOPTR); } YY_BREAK case 95: YY_RULE_SETUP -#line 199 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SELECT); } +#line 200 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( BITCAST); } YY_BREAK case 96: YY_RULE_SETUP -#line 200 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SHL); } +#line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SELECT); } YY_BREAK case 97: YY_RULE_SETUP -#line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SHR); } +#line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SHL); } YY_BREAK case 98: YY_RULE_SETUP -#line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ASHR); } +#line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SHR); } YY_BREAK case 99: YY_RULE_SETUP -#line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LSHR); } +#line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ASHR); } YY_BREAK case 100: YY_RULE_SETUP -#line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( VAARG); } +#line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LSHR); } YY_BREAK case 101: YY_RULE_SETUP -#line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( RET); } +#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( VAARG); } YY_BREAK case 102: YY_RULE_SETUP -#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( BR); } +#line 207 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( RET); } YY_BREAK case 103: YY_RULE_SETUP -#line 207 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SWITCH); } +#line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( BR); } YY_BREAK case 104: YY_RULE_SETUP -#line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INVOKE); } +#line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SWITCH); } YY_BREAK case 105: YY_RULE_SETUP -#line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNWIND); } +#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INVOKE); } YY_BREAK case 106: YY_RULE_SETUP -#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( UNWIND); } YY_BREAK case 107: YY_RULE_SETUP -#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNREACHABLE); } +#line 212 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EXCEPT); } // alias for unwind YY_BREAK case 108: YY_RULE_SETUP #line 213 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( MALLOC); } +{ RET_TOK( UNREACHABLE); } YY_BREAK case 109: YY_RULE_SETUP -#line 214 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ALLOCA); } +#line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( MALLOC); } YY_BREAK case 110: YY_RULE_SETUP -#line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FREE); } +#line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ALLOCA); } YY_BREAK case 111: YY_RULE_SETUP -#line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LOAD); } +#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FREE); } YY_BREAK case 112: YY_RULE_SETUP -#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( STORE); } +#line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LOAD); } YY_BREAK case 113: YY_RULE_SETUP -#line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( GETELEMENTPTR); } +#line 219 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( STORE); } YY_BREAK case 114: YY_RULE_SETUP #line 220 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EXTRACTELEMENT); } +{ RET_TOK( GETELEMENTPTR); } YY_BREAK case 115: YY_RULE_SETUP -#line 221 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INSERTELEMENT); } +#line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EXTRACTELEMENT); } YY_BREAK case 116: YY_RULE_SETUP -#line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SHUFFLEVECTOR); } +#line 223 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INSERTELEMENT); } YY_BREAK case 117: YY_RULE_SETUP -#line 225 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( VAR_ID); } +#line 224 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SHUFFLEVECTOR); } YY_BREAK case 118: YY_RULE_SETUP -#line 226 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LABELSTR); } +#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( VAR_ID); } YY_BREAK case 119: YY_RULE_SETUP -#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( LABELSTR); } YY_BREAK case 120: YY_RULE_SETUP -#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( STRINGCONSTANT ); } +#line 229 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LABELSTR); } YY_BREAK case 121: YY_RULE_SETUP -#line 229 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EUINT64VAL ); } +#line 230 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( STRINGCONSTANT ); } YY_BREAK case 122: YY_RULE_SETUP -#line 230 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ESINT64VAL ); } +#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EUINT64VAL ); } YY_BREAK case 123: YY_RULE_SETUP -#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); } +#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ESINT64VAL ); } YY_BREAK case 124: YY_RULE_SETUP -#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UINTVAL); } +#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); } YY_BREAK case 125: YY_RULE_SETUP -#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SINTVAL); } +#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UINTVAL); } YY_BREAK case 126: YY_RULE_SETUP -#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPVAL); } +#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SINTVAL); } YY_BREAK case 127: YY_RULE_SETUP -#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPVAL); } + YY_BREAK +case 128: +YY_RULE_SETUP +#line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( FPVAL); } YY_BREAK case YY_STATE_EOF(INITIAL): -#line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 238 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { /* Make sure to free the internal buffers for flex when we are * done reading our input! @@ -1828,22 +1843,22 @@ case YY_STATE_EOF(INITIAL): return EOF; } YY_BREAK -case 128: -YY_RULE_SETUP -#line 244 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ /* Ignore whitespace */ } - YY_BREAK case 129: YY_RULE_SETUP -#line 245 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ return yytext[0]; } +#line 246 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ /* Ignore whitespace */ } YY_BREAK case 130: YY_RULE_SETUP #line 247 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ return yytext[0]; } + YY_BREAK +case 131: +YY_RULE_SETUP +#line 249 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1847 "UpgradeLexer.cpp" +#line 1862 "UpgradeLexer.cpp" case YY_END_OF_BUFFER: { @@ -2130,7 +2145,7 @@ static yy_state_type yy_get_previous_state() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 556 ) + if ( yy_current_state >= 567 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2160,11 +2175,11 @@ yy_state_type yy_current_state; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 556 ) + if ( yy_current_state >= 567 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 555); + yy_is_jam = (yy_current_state == 566); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2721,5 +2736,5 @@ int main() return 0; } #endif -#line 247 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 249 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" diff --git a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs index f01fa15f37a..04174a60fbf 100644 --- a/tools/llvm-upgrade/UpgradeLexer.cpp.cvs +++ b/tools/llvm-upgrade/UpgradeLexer.cpp.cvs @@ -317,36 +317,36 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); *yy_cp = '\0'; \ yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 130 -#define YY_END_OF_BUFFER 131 -static yyconst short int yy_acclist[208] = +#define YY_NUM_RULES 131 +#define YY_END_OF_BUFFER 132 +static yyconst short int yy_acclist[209] = { 0, - 131, 129, 130, 128, 129, 130, 128, 130, 129, 130, - 129, 130, 129, 130, 129, 130, 129, 130, 129, 130, - 121, 129, 130, 121, 129, 130, 1, 129, 130, 129, - 130, 129, 130, 129, 130, 129, 130, 129, 130, 129, - 130, 129, 130, 129, 130, 129, 130, 129, 130, 129, - 130, 129, 130, 129, 130, 129, 130, 129, 130, 129, - 130, 129, 130, 129, 130, 129, 130, 129, 130, 129, - 130, 120, 118, 117, 117, 124, 122, 126, 121, 1, - 102, 38, 72, 22, 120, 117, 117, 125, 126, 19, - 126, 127, 60, 71, 36, 31, 39, 63, 3, 51, + 132, 130, 131, 129, 130, 131, 129, 131, 130, 131, + 130, 131, 130, 131, 130, 131, 130, 131, 130, 131, + 122, 130, 131, 122, 130, 131, 1, 130, 131, 130, + 131, 130, 131, 130, 131, 130, 131, 130, 131, 130, + 131, 130, 131, 130, 131, 130, 131, 130, 131, 130, + 131, 130, 131, 130, 131, 130, 131, 130, 131, 130, + 131, 130, 131, 130, 131, 130, 131, 130, 131, 130, + 131, 121, 119, 118, 118, 125, 123, 127, 122, 1, + 103, 39, 73, 23, 121, 118, 118, 126, 127, 20, + 127, 128, 61, 72, 37, 32, 40, 64, 3, 52, - 62, 80, 67, 101, 96, 97, 61, 73, 119, 126, - 126, 98, 46, 81, 82, 66, 110, 70, 111, 53, - 99, 21, 123, 65, 85, 69, 23, 4, 59, 64, - 52, 68, 45, 11, 84, 126, 33, 2, 5, 55, - 87, 57, 47, 75, 79, 77, 78, 76, 74, 49, - 112, 83, 48, 54, 20, 109, 42, 56, 27, 106, - 41, 89, 88, 7, 104, 30, 108, 35, 58, 95, - 91, 103, 24, 25, 90, 105, 50, 100, 94, 40, - 6, 26, 86, 34, 8, 16, 9, 93, 10, 92, - 32, 12, 14, 13, 29, 37, 15, 28, 107, 113, + 63, 81, 68, 102, 97, 98, 62, 74, 120, 127, + 127, 99, 47, 82, 83, 67, 111, 71, 112, 54, + 100, 22, 124, 66, 86, 70, 24, 4, 60, 65, + 53, 69, 46, 11, 85, 127, 34, 2, 5, 56, + 88, 58, 48, 76, 80, 78, 79, 77, 75, 50, + 113, 84, 49, 55, 21, 110, 43, 57, 28, 107, + 42, 90, 89, 7, 105, 31, 109, 36, 59, 96, + 92, 104, 25, 26, 91, 106, 51, 101, 95, 41, + 6, 27, 87, 35, 8, 16, 9, 94, 10, 93, + 33, 12, 14, 13, 30, 38, 15, 29, 108, 114, - 115, 116, 43, 114, 17, 44, 18 + 116, 117, 17, 44, 115, 18, 45, 19 } ; -static yyconst short int yy_accept[557] = +static yyconst short int yy_accept[568] = { 0, 1, 1, 1, 2, 4, 7, 9, 11, 13, 15, 17, 19, 21, 24, 27, 30, 32, 34, 36, 38, @@ -372,43 +372,44 @@ static yyconst short int yy_accept[557] = 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 109, 109, 109, 110, 111, 111, 111, 111, 112, - 112, 112, 112, 113, 113, 113, 114, 115, 116, 116, + 108, 108, 109, 109, 109, 110, 111, 111, 111, 111, + 112, 112, 112, 112, 113, 113, 113, 114, 115, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 117, 117, 117, 117, 117, 118, - 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 120, 121, 122, 122, 122, 123, 123, 123, 123, - 124, 124, 125, 125, 125, 125, 125, 125, 125, 126, - 126, 126, 126, 126, 127, 127, 127, 128, 128, 128, + 116, 116, 116, 116, 116, 117, 117, 117, 117, 117, + 118, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 120, 121, 122, 122, 122, 123, 123, 123, + 123, 124, 124, 125, 125, 125, 125, 125, 125, 125, + 126, 126, 126, 126, 126, 127, 127, 127, 128, 128, - 129, 129, 130, 130, 131, 132, 132, 132, 132, 132, - 132, 133, 133, 133, 134, 134, 135, 135, 135, 136, - 137, 138, 138, 138, 139, 139, 139, 139, 139, 139, - 139, 139, 139, 139, 139, 139, 139, 139, 139, 140, - 140, 141, 142, 142, 142, 142, 142, 142, 142, 142, - 142, 142, 142, 143, 143, 143, 143, 143, 143, 143, - 143, 144, 144, 144, 145, 146, 147, 148, 149, 150, - 151, 151, 151, 151, 152, 152, 152, 152, 153, 154, - 154, 155, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 157, 157, 157, 158, 158, 158, 158, 158, 158, + 128, 129, 129, 130, 130, 131, 132, 132, 132, 132, + 132, 132, 132, 133, 133, 133, 134, 134, 135, 135, + 135, 136, 137, 138, 138, 138, 139, 139, 139, 139, + 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, + 139, 140, 140, 141, 142, 142, 142, 142, 142, 142, + 142, 142, 142, 142, 142, 143, 143, 143, 143, 143, + 143, 143, 143, 144, 144, 144, 145, 146, 147, 148, + 149, 150, 151, 151, 151, 151, 152, 152, 152, 152, + 153, 154, 154, 155, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 157, 157, 157, 158, 158, 158, - 158, 158, 159, 160, 161, 161, 161, 162, 163, 164, - 164, 164, 165, 165, 165, 165, 165, 166, 166, 167, - 168, 169, 170, 170, 170, 170, 171, 171, 171, 172, - 173, 174, 175, 176, 176, 177, 178, 179, 179, 179, - 179, 179, 179, 180, 180, 181, 181, 182, 183, 183, - 183, 183, 183, 183, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 186, 186, 186, 186, 186, 187, 187, 187, - 187, 187, 188, 189, 190, 190, 191, 191, 191, 191, - 192, 192, 192, 192, 193, 193, 194, 195, 195, 195, + 158, 158, 158, 158, 158, 159, 160, 161, 161, 161, + 162, 163, 164, 164, 164, 165, 165, 165, 165, 165, + 166, 166, 167, 168, 169, 170, 170, 170, 170, 171, + 171, 171, 172, 173, 174, 175, 176, 176, 176, 177, + 178, 179, 179, 179, 179, 179, 179, 180, 180, 181, + 181, 182, 183, 183, 183, 183, 183, 183, 184, 184, + 184, 184, 184, 184, 184, 184, 184, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 186, 186, 186, + 186, 186, 187, 187, 187, 187, 187, 188, 189, 190, + 190, 191, 191, 191, 191, 191, 192, 192, 192, 192, - 195, 195, 195, 195, 195, 195, 195, 195, 195, 195, - 196, 196, 196, 196, 196, 196, 196, 196, 197, 197, - 197, 197, 197, 198, 198, 198, 198, 198, 199, 199, + 193, 193, 194, 195, 195, 195, 195, 195, 195, 195, + 195, 195, 195, 195, 195, 195, 195, 196, 196, 196, + 196, 196, 196, 196, 196, 197, 197, 197, 197, 197, + 197, 198, 198, 198, 198, 198, 199, 199, 199, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, - 200, 200, 200, 201, 201, 202, 203, 203, 204, 204, - 205, 206, 207, 207, 208, 208 + 200, 200, 200, 201, 201, 202, 203, 204, 204, 205, + 205, 206, 207, 208, 208, 209, 209 } ; static yyconst int yy_ec[256] = @@ -452,137 +453,141 @@ static yyconst int yy_meta[44] = 3, 3, 3 } ; -static yyconst short int yy_base[561] = +static yyconst short int yy_base[572] = { 0, - 0, 0, 1200, 1201, 1201, 1201, 1195, 1184, 36, 40, + 0, 0, 1222, 1223, 1223, 1223, 1217, 1206, 36, 40, 44, 50, 56, 62, 0, 63, 66, 81, 89, 47, 100, 97, 76, 96, 111, 46, 48, 110, 68, 140, - 126, 171, 120, 123, 73, 130, 1193, 1201, 1182, 1201, + 126, 171, 120, 123, 73, 130, 1215, 1223, 1204, 1223, 0, 159, 176, 199, 204, 95, 209, 224, 229, 0, - 134, 165, 137, 124, 169, 151, 159, 31, 1181, 168, + 134, 165, 137, 124, 169, 151, 159, 31, 1203, 168, 210, 230, 233, 127, 241, 189, 176, 117, 242, 244, 240, 243, 246, 249, 252, 253, 257, 259, 263, 265, - 266, 274, 268, 269, 273, 277, 282, 211, 1180, 287, + 266, 274, 268, 269, 273, 277, 282, 211, 1202, 287, 290, 293, 294, 160, 270, 295, 304, 305, 299, 306, - 312, 296, 321, 324, 1179, 325, 309, 313, 333, 335, - 318, 339, 342, 332, 350, 340, 343, 215, 356, 357, - 1178, 0, 365, 370, 1177, 389, 406, 0, 1176, 359, - 372, 1175, 371, 374, 1174, 381, 1173, 375, 301, 376, - 393, 1172, 401, 396, 408, 407, 410, 411, 1171, 414, - 413, 415, 420, 421, 422, 424, 431, 432, 433, 434, - 441, 436, 440, 438, 439, 449, 443, 454, 383, 451, - 459, 462, 464, 465, 466, 1170, 468, 469, 1169, 470, - 471, 1168, 1167, 499, 476, 475, 488, 477, 503, 492, - 1166, 510, 1165, 481, 484, 516, 513, 517, 1164, 519, + 312, 296, 321, 324, 1201, 325, 309, 313, 333, 335, + 318, 340, 342, 332, 339, 347, 350, 215, 354, 356, + 1200, 0, 371, 375, 1199, 389, 406, 0, 1198, 365, + 363, 1197, 382, 359, 1196, 394, 1195, 357, 301, 393, + 390, 1194, 401, 395, 410, 411, 397, 414, 1193, 415, + 420, 418, 421, 423, 425, 422, 427, 433, 434, 435, + 439, 437, 436, 443, 440, 441, 451, 454, 457, 459, + 460, 462, 465, 466, 467, 1192, 470, 472, 1191, 379, + 474, 1190, 1189, 502, 479, 478, 483, 475, 513, 493, + 1188, 494, 1187, 477, 480, 496, 517, 518, 1186, 519, - 521, 522, 524, 523, 526, 525, 527, 528, 537, 530, - 541, 544, 545, 546, 539, 549, 556, 560, 559, 478, - 1163, 561, 563, 1201, 571, 591, 579, 595, 600, 566, - 601, 602, 1162, 603, 604, 1161, 1160, 1159, 605, 606, - 607, 610, 611, 613, 614, 615, 617, 618, 621, 622, - 628, 572, 627, 1158, 624, 635, 637, 636, 1157, 1156, - 638, 639, 642, 645, 646, 650, 648, 649, 652, 654, - 1155, 1154, 1153, 655, 656, 1152, 657, 663, 665, 0, - 675, 1151, 672, 680, 674, 679, 682, 689, 1150, 676, - 690, 692, 693, 1149, 695, 706, 1148, 707, 696, 1147, + 520, 521, 476, 527, 525, 523, 526, 529, 531, 537, + 538, 540, 541, 543, 545, 548, 553, 555, 559, 560, + 565, 1185, 562, 567, 1223, 574, 588, 595, 599, 604, + 588, 568, 589, 1184, 607, 608, 1183, 1182, 1181, 609, + 610, 611, 612, 614, 615, 617, 620, 622, 618, 621, + 625, 626, 629, 632, 1180, 630, 635, 641, 642, 1179, + 1178, 645, 643, 647, 649, 650, 651, 654, 652, 655, + 657, 1177, 1176, 1175, 659, 661, 1174, 662, 664, 674, + 0, 675, 1173, 678, 681, 679, 680, 685, 693, 1172, + 682, 690, 695, 696, 1171, 698, 709, 1170, 701, 697, - 708, 1146, 709, 1145, 1144, 710, 571, 712, 714, 717, - 1143, 721, 723, 1142, 724, 1141, 726, 725, 1140, 731, - 1139, 732, 731, 1138, 733, 743, 735, 745, 741, 749, - 751, 678, 753, 754, 756, 758, 759, 760, 1137, 761, - 1136, 1135, 762, 764, 765, 769, 771, 774, 766, 779, - 780, 783, 1134, 784, 785, 788, 791, 793, 797, 798, - 1133, 787, 803, 1132, 1131, 1130, 1129, 1128, 1127, 1126, - 804, 807, 808, 1125, 809, 810, 813, 1124, 1123, 812, - 1122, 1121, 816, 820, 814, 818, 825, 830, 824, 815, - 1120, 836, 834, 1119, 839, 841, 840, 842, 843, 844, + 1169, 711, 1168, 713, 1167, 1166, 714, 715, 717, 719, + 720, 721, 1165, 723, 728, 1164, 729, 1163, 731, 730, + 1162, 737, 1161, 737, 739, 1160, 740, 748, 745, 751, + 754, 746, 757, 756, 760, 761, 764, 765, 766, 769, + 1159, 771, 1158, 1157, 772, 773, 774, 768, 780, 782, + 784, 787, 789, 790, 1156, 792, 793, 794, 796, 797, + 803, 800, 1155, 810, 811, 1154, 1153, 1152, 1151, 1150, + 1149, 1148, 814, 815, 816, 1147, 818, 817, 822, 1146, + 1145, 819, 1144, 1143, 820, 826, 824, 821, 836, 837, + 841, 839, 842, 1142, 845, 848, 1141, 849, 853, 823, - 845, 1118, 1117, 1116, 850, 846, 1115, 1114, 1113, 852, - 858, 1112, 861, 864, 866, 853, 1111, 860, 1110, 1109, - 1108, 1107, 872, 875, 877, 1106, 878, 879, 1105, 1104, - 1103, 1102, 1101, 883, 1100, 1099, 1098, 881, 880, 882, - 884, 886, 1097, 885, 1096, 888, 1095, 1094, 891, 898, - 899, 900, 901, 1093, 904, 905, 909, 911, 907, 914, - 916, 917, 1092, 918, 920, 927, 921, 931, 934, 933, - 935, 1091, 936, 939, 942, 944, 1090, 937, 947, 945, - 948, 1089, 1088, 1087, 950, 1086, 949, 959, 955, 1083, - 967, 970, 969, 1074, 971, 1072, 1071, 972, 976, 973, + 852, 854, 855, 856, 1140, 1139, 1138, 863, 857, 1137, + 1136, 1135, 865, 869, 1134, 870, 875, 877, 864, 1133, + 881, 1132, 1131, 1130, 1129, 878, 883, 886, 1128, 889, + 891, 1127, 1126, 1125, 1124, 1123, 892, 890, 1122, 1121, + 1120, 893, 894, 896, 897, 895, 1119, 906, 1118, 907, + 1117, 1116, 909, 911, 913, 918, 914, 1115, 915, 917, + 920, 921, 919, 922, 926, 927, 1114, 928, 937, 938, + 942, 945, 941, 944, 949, 952, 1113, 955, 957, 958, + 956, 1112, 959, 960, 961, 962, 1111, 1110, 1107, 969, + 1097, 966, 976, 970, 967, 1096, 986, 987, 978, 1095, - 978, 979, 951, 981, 984, 986, 987, 989, 993, 1070, - 991, 990, 997, 999, 1000, 1002, 1003, 1068, 1008, 1010, - 1012, 1013, 1067, 1014, 1015, 1018, 1019, 1066, 1021, 1065, - 1020, 1030, 1029, 1024, 1032, 1033, 1034, 1040, 1043, 1045, - 1044, 1046, 1063, 1047, 1062, 1060, 1048, 1059, 1049, 1056, - 677, 479, 1054, 435, 1201, 1089, 1091, 124, 1095, 76 + 988, 1094, 1092, 989, 990, 995, 996, 997, 998, 1000, + 1002, 1003, 1004, 1005, 1006, 1009, 1091, 1008, 1012, 1015, + 1017, 1020, 1023, 1024, 1089, 1026, 1030, 1031, 1033, 1035, + 1088, 1036, 1037, 1038, 1041, 1084, 1043, 1044, 1082, 1042, + 1049, 1052, 1054, 1059, 1063, 1062, 1066, 1064, 1067, 1068, + 1069, 1070, 1079, 1073, 968, 827, 683, 1076, 579, 1077, + 578, 576, 490, 1078, 488, 1223, 1113, 1115, 124, 1119, + 76 } ; -static yyconst short int yy_def[561] = +static yyconst short int yy_def[572] = { 0, - 555, 1, 555, 555, 555, 555, 556, 557, 558, 555, - 557, 557, 557, 557, 559, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 556, 555, 557, 555, - 560, 560, 555, 555, 557, 557, 557, 557, 557, 559, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 566, 1, 566, 566, 566, 566, 567, 568, 569, 566, + 568, 568, 568, 568, 570, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 567, 566, 568, 566, + 571, 571, 566, 566, 568, 568, 568, 568, 568, 570, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 555, 560, 560, 555, 557, 557, 557, 49, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 49, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 566, 571, 571, 566, 568, 568, 568, 49, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 49, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 555, 555, 555, 555, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 184, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 566, 566, 566, 566, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 184, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 555, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 566, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 557, 557, 557, 557, 557, 557, - 557, 557, 557, 557, 0, 555, 555, 555, 555, 555 + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 568, 568, 568, 568, 568, + 568, 568, 568, 568, 568, 0, 566, 566, 566, 566, + 566 } ; -static yyconst short int yy_nxt[1245] = +static yyconst short int yy_nxt[1267] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 14, 14, 4, 15, 8, 8, 8, 16, 17, @@ -608,7 +613,7 @@ static yyconst short int yy_nxt[1245] = 184, 112, 40, 141, 150, 113, 114, 124, 44, 44, 44, 44, 47, 45, 45, 45, 45, 40, 126, 126, - 126, 126, 40, 40, 40, 127, 220, 149, 40, 178, + 126, 126, 40, 40, 40, 127, 221, 149, 40, 178, 142, 127, 47, 48, 48, 48, 48, 40, 128, 128, 128, 128, 40, 40, 128, 128, 40, 128, 128, 128, 128, 128, 128, 40, 40, 40, 40, 40, 143, 40, @@ -619,111 +624,113 @@ static yyconst short int yy_nxt[1245] = 40, 167, 170, 40, 172, 176, 40, 40, 40, 40, 177, 185, 40, 179, 40, 199, 180, 40, 40, 40, - 195, 186, 40, 182, 187, 40, 40, 181, 197, 236, + 195, 186, 40, 182, 187, 40, 40, 181, 197, 237, 183, 40, 188, 191, 40, 196, 192, 40, 40, 193, 189, 205, 194, 198, 190, 40, 40, 200, 40, 210, - 201, 203, 40, 40, 206, 40, 40, 215, 202, 207, - 211, 219, 204, 40, 214, 208, 217, 216, 218, 40, - 40, 209, 40, 212, 123, 123, 123, 123, 213, 225, - 225, 225, 225, 230, 40, 40, 226, 40, 40, 40, - 221, 222, 226, 232, 40, 235, 40, 223, 126, 126, + 201, 203, 40, 40, 206, 40, 217, 216, 202, 207, + 40, 211, 204, 40, 215, 208, 212, 40, 220, 40, + 40, 209, 40, 218, 213, 219, 40, 236, 40, 214, + 123, 123, 123, 123, 226, 226, 226, 226, 222, 231, + 223, 227, 40, 234, 232, 40, 224, 227, 126, 126, - 126, 126, 40, 231, 237, 127, 40, 234, 233, 40, - 269, 127, 227, 228, 40, 229, 229, 229, 229, 40, - 40, 40, 239, 40, 40, 242, 40, 40, 40, 238, - 241, 240, 247, 40, 40, 40, 245, 40, 243, 244, - 246, 248, 249, 250, 40, 40, 40, 40, 40, 40, - 255, 40, 40, 40, 40, 251, 40, 252, 261, 262, - 253, 264, 40, 259, 40, 257, 263, 40, 258, 254, - 260, 265, 40, 256, 267, 40, 268, 40, 40, 40, - 271, 40, 40, 40, 40, 266, 272, 270, 40, 40, - 40, 40, 40, 274, 40, 317, 276, 40, 273, 284, + 126, 126, 40, 40, 233, 127, 40, 40, 40, 279, + 40, 127, 228, 229, 40, 230, 230, 230, 230, 40, + 235, 238, 240, 40, 40, 244, 239, 40, 40, 243, + 241, 40, 242, 40, 40, 40, 40, 246, 40, 248, + 40, 247, 245, 250, 249, 251, 40, 40, 40, 40, + 40, 256, 40, 40, 40, 263, 40, 252, 254, 262, + 253, 260, 265, 266, 40, 255, 258, 40, 261, 259, + 40, 264, 40, 40, 257, 40, 269, 267, 40, 40, + 40, 272, 268, 40, 270, 40, 273, 40, 40, 40, + 40, 40, 40, 40, 275, 271, 40, 285, 277, 274, - 278, 40, 277, 275, 291, 40, 292, 279, 280, 280, - 280, 280, 281, 282, 280, 280, 40, 280, 280, 280, - 280, 280, 280, 40, 283, 285, 40, 286, 289, 40, - 40, 287, 40, 288, 40, 40, 40, 40, 40, 40, - 40, 40, 294, 40, 290, 300, 298, 293, 302, 297, - 40, 295, 40, 301, 40, 296, 299, 40, 40, 40, - 307, 303, 40, 308, 305, 304, 309, 313, 306, 40, - 312, 310, 40, 40, 40, 311, 40, 314, 315, 40, - 225, 225, 225, 225, 40, 40, 316, 226, 320, 320, - 320, 320, 318, 226, 339, 381, 321, 227, 227, 319, + 292, 40, 293, 40, 276, 278, 40, 40, 300, 40, + 280, 281, 281, 281, 281, 282, 283, 281, 281, 284, + 281, 281, 281, 281, 281, 281, 40, 294, 291, 290, + 40, 40, 40, 40, 40, 286, 40, 287, 40, 40, + 40, 288, 40, 289, 40, 299, 295, 303, 298, 301, + 40, 40, 296, 40, 40, 297, 40, 302, 40, 304, + 309, 40, 307, 311, 305, 306, 40, 308, 40, 312, + 310, 315, 40, 40, 313, 40, 316, 317, 40, 314, + 40, 40, 319, 226, 226, 226, 226, 318, 324, 40, + 227, 40, 40, 320, 228, 228, 227, 322, 322, 322, - 320, 320, 320, 320, 229, 229, 229, 229, 40, 229, - 229, 229, 229, 40, 40, 40, 40, 40, 40, 40, - 40, 322, 325, 40, 40, 326, 40, 40, 40, 330, - 40, 40, 323, 324, 40, 40, 335, 40, 329, 331, - 40, 40, 327, 328, 333, 334, 338, 340, 40, 40, - 40, 40, 40, 336, 332, 40, 337, 347, 40, 40, - 341, 40, 40, 40, 348, 40, 346, 40, 40, 40, - 40, 342, 343, 345, 344, 352, 40, 353, 40, 349, - 350, 351, 355, 354, 357, 40, 356, 40, 40, 40, - 40, 40, 40, 40, 358, 40, 360, 361, 362, 359, + 322, 40, 40, 321, 322, 322, 322, 322, 230, 230, + 230, 230, 40, 230, 230, 230, 230, 40, 323, 325, + 40, 40, 40, 40, 40, 40, 327, 40, 40, 328, + 40, 40, 332, 40, 40, 40, 337, 326, 40, 40, + 331, 333, 40, 40, 340, 40, 329, 330, 40, 335, + 336, 341, 342, 338, 40, 40, 40, 334, 40, 339, + 40, 349, 40, 40, 40, 40, 343, 40, 40, 350, + 40, 344, 40, 348, 40, 40, 345, 40, 346, 347, + 355, 354, 353, 351, 352, 357, 356, 40, 40, 359, + 358, 40, 40, 40, 40, 40, 40, 363, 40, 360, - 363, 365, 40, 40, 367, 40, 40, 364, 40, 40, - 400, 369, 370, 371, 372, 366, 373, 374, 368, 40, - 40, 40, 40, 40, 377, 40, 375, 40, 378, 376, - 40, 379, 383, 380, 40, 382, 40, 40, 40, 40, - 320, 320, 320, 320, 40, 40, 40, 384, 40, 388, - 391, 390, 392, 395, 40, 385, 40, 386, 40, 397, - 387, 389, 40, 394, 40, 396, 40, 40, 393, 40, - 399, 40, 40, 40, 40, 40, 402, 40, 40, 40, - 406, 407, 40, 398, 40, 401, 403, 40, 408, 405, - 409, 411, 40, 40, 404, 410, 40, 40, 40, 412, + 361, 365, 367, 40, 364, 362, 40, 369, 40, 40, + 40, 40, 366, 373, 40, 371, 368, 374, 372, 375, + 376, 370, 40, 378, 40, 379, 40, 40, 40, 377, + 40, 380, 40, 40, 40, 381, 40, 382, 386, 383, + 384, 40, 40, 40, 40, 385, 322, 322, 322, 322, + 40, 387, 40, 40, 391, 394, 393, 388, 40, 40, + 395, 40, 389, 398, 40, 390, 392, 40, 397, 40, + 40, 399, 400, 40, 40, 396, 402, 40, 40, 40, + 401, 40, 40, 405, 40, 40, 40, 40, 403, 409, + 414, 410, 404, 40, 406, 40, 408, 40, 411, 412, - 40, 40, 414, 413, 40, 417, 40, 419, 420, 415, - 40, 40, 416, 421, 418, 422, 40, 40, 425, 423, - 40, 40, 40, 40, 424, 40, 40, 40, 40, 40, - 428, 40, 427, 40, 430, 432, 434, 40, 40, 426, - 429, 435, 437, 40, 433, 441, 431, 40, 439, 40, - 436, 438, 40, 40, 40, 40, 40, 40, 40, 40, - 440, 445, 442, 40, 447, 40, 40, 451, 452, 444, - 443, 40, 454, 40, 40, 449, 450, 40, 448, 40, - 460, 446, 453, 456, 458, 40, 457, 455, 40, 459, + 40, 407, 40, 40, 413, 40, 40, 40, 415, 40, + 40, 416, 420, 40, 423, 422, 40, 418, 424, 425, + 417, 419, 421, 40, 40, 426, 427, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 431, 40, + 40, 428, 430, 433, 435, 439, 438, 429, 432, 40, + 40, 436, 40, 434, 40, 40, 437, 440, 40, 443, + 441, 40, 40, 442, 450, 40, 40, 40, 40, 40, + 40, 446, 445, 449, 451, 444, 40, 40, 40, 448, + 455, 456, 40, 40, 447, 458, 453, 454, 40, 452, + 40, 40, 460, 457, 40, 462, 40, 461, 459, 40, + + 463, 464, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 468, 465, 466, 469, 471, 467, 474, 470, 40, + 40, 472, 40, 475, 40, 476, 40, 40, 40, 473, + 40, 40, 40, 40, 40, 40, 483, 484, 478, 40, + 40, 40, 477, 479, 489, 480, 482, 485, 486, 487, + 40, 40, 481, 488, 40, 40, 494, 40, 40, 493, + 495, 490, 40, 491, 498, 40, 492, 496, 40, 40, + 40, 40, 40, 40, 40, 40, 500, 497, 504, 40, + 40, 40, 40, 40, 508, 499, 513, 505, 510, 40, + 506, 40, 501, 502, 503, 509, 511, 507, 512, 40, + + 40, 40, 40, 40, 516, 515, 514, 518, 40, 40, + 40, 40, 519, 40, 521, 40, 40, 40, 40, 40, + 524, 40, 40, 528, 517, 40, 522, 530, 40, 526, + 40, 520, 527, 40, 529, 531, 40, 40, 525, 40, + 523, 532, 535, 40, 40, 536, 40, 533, 40, 40, + 40, 40, 539, 534, 40, 40, 40, 40, 543, 540, + 537, 541, 40, 542, 545, 40, 548, 40, 538, 550, + 549, 546, 40, 544, 547, 40, 40, 40, 551, 40, + 40, 40, 40, 40, 552, 557, 40, 558, 559, 40, + 40, 40, 40, 553, 554, 40, 563, 40, 555, 564, + + 556, 40, 40, 562, 40, 40, 561, 40, 40, 40, + 40, 560, 565, 37, 37, 37, 37, 39, 39, 50, + 40, 50, 50, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, + 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 464, 40, 465, 469, 40, 462, 461, 463, 466, 467, - 470, 40, 40, 40, 40, 468, 471, 40, 40, 473, - 40, 472, 40, 478, 40, 474, 479, 40, 477, 40, - 40, 40, 475, 40, 40, 480, 484, 481, 476, 482, - 40, 483, 488, 490, 40, 489, 40, 40, 40, 40, - 40, 485, 40, 486, 492, 40, 487, 40, 40, 494, - 40, 40, 40, 40, 40, 499, 498, 491, 40, 493, - 502, 504, 40, 495, 506, 496, 503, 500, 497, 505, - 40, 501, 40, 40, 40, 40, 40, 507, 508, 40, - 511, 40, 40, 516, 40, 509, 514, 40, 512, 40, - - 40, 517, 40, 40, 40, 520, 40, 510, 515, 513, - 40, 522, 40, 40, 519, 40, 40, 521, 523, 524, - 518, 40, 527, 40, 528, 40, 40, 40, 40, 525, - 530, 40, 40, 40, 40, 526, 534, 40, 531, 529, - 532, 533, 40, 40, 536, 40, 40, 40, 539, 537, - 540, 535, 538, 40, 542, 541, 40, 40, 40, 40, - 40, 40, 40, 547, 544, 548, 543, 40, 552, 40, - 545, 553, 40, 40, 546, 40, 40, 551, 40, 40, - 40, 40, 550, 40, 40, 40, 549, 40, 554, 37, - 37, 37, 37, 39, 39, 50, 40, 50, 50, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, - 40, 224, 40, 40, 40, 40, 121, 40, 38, 555, - - 3, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555 + 40, 40, 40, 225, 40, 40, 40, 40, 121, 40, + 38, 566, 3, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566 } ; -static yyconst short int yy_chk[1245] = +static yyconst short int yy_chk[1267] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -732,13 +739,13 @@ static yyconst short int yy_chk[1245] = 1, 1, 1, 9, 58, 9, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 11, 12, 26, 20, 27, 58, 12, 13, 13, 13, 13, 13, 13, - 14, 14, 14, 14, 14, 14, 16, 20, 560, 17, + 14, 14, 14, 14, 14, 14, 16, 20, 571, 17, 27, 29, 27, 26, 16, 35, 35, 20, 17, 23, 29, 16, 17, 16, 18, 16, 13, 17, 16, 18, 17, 18, 19, 46, 35, 23, 23, 19, 46, 24, 22, 19, 18, 21, 24, 19, 18, 19, 21, 22, - 19, 21, 24, 28, 25, 22, 558, 24, 21, 25, + 19, 21, 24, 28, 25, 22, 569, 24, 21, 25, 68, 24, 21, 33, 21, 28, 34, 54, 33, 31, 64, 28, 25, 36, 31, 34, 28, 51, 25, 30, 53, 33, 36, 30, 68, 51, 54, 31, 53, 30, @@ -763,105 +770,107 @@ static yyconst short int yy_chk[1245] = 99, 96, 107, 93, 97, 101, 108, 92, 100, 139, 93, 111, 97, 98, 103, 99, 98, 104, 106, 98, 97, 107, 98, 101, 97, 114, 109, 103, 110, 111, - 104, 106, 112, 116, 108, 113, 117, 114, 104, 109, - 112, 117, 106, 115, 113, 110, 116, 115, 116, 119, - 120, 110, 130, 112, 123, 123, 123, 123, 112, 124, - 124, 124, 124, 130, 133, 131, 124, 134, 138, 140, - 119, 120, 124, 133, 136, 138, 169, 120, 126, 126, + 104, 106, 115, 112, 108, 113, 115, 114, 104, 109, + 116, 112, 106, 117, 113, 110, 112, 119, 117, 120, + 138, 110, 134, 116, 112, 116, 131, 138, 130, 112, + 123, 123, 123, 123, 124, 124, 124, 124, 119, 130, + 120, 124, 180, 134, 131, 133, 120, 124, 126, 126, - 126, 126, 126, 131, 140, 126, 141, 136, 134, 144, - 169, 126, 127, 127, 143, 127, 127, 127, 127, 127, - 146, 145, 143, 147, 148, 146, 151, 150, 152, 141, - 145, 144, 151, 153, 154, 155, 150, 156, 147, 148, - 150, 152, 153, 154, 157, 158, 159, 160, 554, 162, - 158, 164, 165, 163, 161, 154, 167, 155, 162, 163, - 156, 165, 166, 161, 170, 160, 164, 168, 160, 157, - 161, 166, 171, 159, 167, 172, 168, 173, 174, 175, - 171, 177, 178, 180, 181, 166, 172, 170, 186, 185, - 188, 220, 552, 174, 194, 220, 177, 195, 173, 188, + 126, 126, 126, 141, 133, 126, 140, 136, 144, 180, + 147, 126, 127, 127, 143, 127, 127, 127, 127, 127, + 136, 140, 143, 145, 146, 147, 141, 148, 150, 146, + 144, 152, 145, 151, 153, 156, 154, 150, 155, 151, + 157, 150, 148, 153, 152, 154, 158, 159, 160, 163, + 162, 158, 161, 165, 166, 163, 164, 154, 156, 162, + 155, 161, 165, 166, 167, 157, 160, 168, 161, 160, + 169, 164, 170, 171, 159, 172, 168, 166, 173, 174, + 175, 171, 167, 177, 169, 178, 172, 181, 188, 203, + 194, 186, 185, 195, 174, 170, 187, 188, 177, 173, - 180, 187, 178, 175, 194, 190, 195, 181, 184, 184, - 184, 184, 185, 186, 184, 184, 189, 184, 184, 184, - 184, 184, 184, 192, 187, 189, 197, 189, 190, 196, - 198, 189, 200, 189, 201, 202, 204, 203, 206, 205, - 207, 208, 197, 210, 192, 204, 202, 196, 205, 201, - 209, 198, 215, 204, 211, 200, 203, 212, 213, 214, - 210, 206, 216, 211, 208, 207, 212, 216, 209, 217, - 215, 213, 219, 218, 222, 214, 223, 217, 218, 230, - 225, 225, 225, 225, 307, 252, 219, 225, 227, 227, - 227, 227, 222, 225, 252, 307, 230, 226, 226, 223, + 194, 565, 195, 563, 175, 178, 190, 192, 203, 196, + 181, 184, 184, 184, 184, 185, 186, 184, 184, 187, + 184, 184, 184, 184, 184, 184, 189, 196, 192, 190, + 197, 198, 200, 201, 202, 189, 206, 189, 205, 207, + 204, 189, 208, 189, 209, 202, 197, 205, 201, 204, + 210, 211, 198, 212, 213, 200, 214, 204, 215, 206, + 211, 216, 209, 213, 207, 208, 217, 210, 218, 214, + 212, 217, 219, 220, 215, 223, 218, 219, 221, 216, + 224, 232, 221, 226, 226, 226, 226, 220, 232, 562, + 226, 561, 559, 223, 227, 227, 226, 227, 227, 227, - 226, 226, 226, 226, 228, 228, 228, 228, 228, 229, - 229, 229, 229, 229, 231, 232, 234, 235, 239, 240, - 241, 231, 235, 242, 243, 239, 244, 245, 246, 243, - 247, 248, 232, 234, 249, 250, 248, 255, 242, 244, - 253, 251, 240, 241, 246, 247, 251, 253, 256, 258, - 257, 261, 262, 249, 245, 263, 250, 262, 264, 265, - 255, 267, 268, 266, 263, 269, 261, 270, 274, 275, - 277, 256, 257, 258, 257, 267, 278, 268, 279, 264, - 265, 266, 270, 269, 275, 283, 274, 285, 281, 290, - 551, 332, 286, 284, 277, 287, 279, 281, 283, 278, + 227, 231, 233, 224, 228, 228, 228, 228, 229, 229, + 229, 229, 229, 230, 230, 230, 230, 230, 231, 233, + 235, 236, 240, 241, 242, 243, 236, 244, 245, 240, + 246, 249, 244, 247, 250, 248, 249, 235, 251, 252, + 243, 245, 253, 256, 252, 254, 241, 242, 257, 247, + 248, 253, 254, 250, 258, 259, 263, 246, 262, 251, + 264, 263, 265, 266, 267, 269, 256, 268, 270, 264, + 271, 257, 275, 262, 276, 278, 258, 279, 258, 259, + 269, 268, 267, 265, 266, 271, 270, 280, 282, 276, + 275, 284, 286, 287, 285, 291, 557, 282, 288, 278, - 284, 286, 288, 291, 287, 292, 293, 285, 295, 299, - 332, 288, 290, 291, 292, 286, 293, 295, 287, 296, - 298, 301, 303, 306, 299, 308, 296, 309, 301, 298, - 310, 303, 309, 306, 312, 308, 313, 315, 318, 317, - 320, 320, 320, 320, 323, 322, 325, 310, 327, 317, - 322, 318, 323, 327, 329, 312, 326, 313, 328, 329, - 315, 317, 330, 326, 331, 328, 333, 334, 325, 335, - 331, 336, 337, 338, 340, 343, 334, 344, 345, 349, - 338, 340, 346, 330, 347, 333, 335, 348, 343, 337, - 344, 346, 350, 351, 336, 345, 352, 354, 355, 347, + 279, 285, 287, 292, 284, 280, 289, 288, 293, 294, + 300, 296, 286, 292, 299, 289, 287, 293, 291, 294, + 296, 288, 297, 299, 302, 300, 304, 307, 308, 297, + 309, 302, 310, 311, 312, 304, 314, 307, 311, 308, + 309, 315, 317, 320, 319, 310, 322, 322, 322, 322, + 324, 312, 325, 327, 319, 324, 320, 314, 329, 332, + 325, 328, 315, 329, 330, 317, 319, 331, 328, 334, + 333, 330, 331, 335, 336, 327, 333, 337, 338, 339, + 332, 348, 340, 336, 342, 345, 346, 347, 334, 340, + 348, 342, 335, 349, 337, 350, 339, 351, 345, 346, - 362, 356, 349, 348, 357, 352, 358, 355, 356, 350, - 359, 360, 351, 357, 354, 358, 363, 371, 362, 359, - 372, 373, 375, 376, 360, 380, 377, 385, 390, 383, - 372, 386, 371, 384, 375, 377, 383, 389, 387, 363, - 373, 384, 386, 388, 380, 390, 376, 393, 388, 392, - 385, 387, 395, 397, 396, 398, 399, 400, 401, 406, - 389, 396, 392, 405, 398, 410, 416, 405, 405, 395, - 393, 411, 410, 418, 413, 400, 401, 414, 399, 415, - 418, 397, 406, 413, 415, 423, 414, 411, 424, 416, - 425, 427, 428, 439, 438, 440, 434, 441, 444, 442, + 352, 338, 353, 354, 347, 356, 357, 358, 349, 359, + 360, 350, 354, 362, 358, 357, 361, 352, 359, 360, + 351, 353, 356, 364, 365, 361, 362, 373, 374, 375, + 378, 377, 382, 385, 388, 379, 400, 387, 374, 386, + 556, 364, 373, 377, 379, 387, 386, 365, 375, 389, + 390, 382, 392, 378, 391, 393, 385, 388, 395, 391, + 389, 396, 398, 390, 400, 401, 399, 402, 403, 404, + 409, 395, 393, 399, 401, 392, 408, 419, 413, 398, + 408, 408, 414, 416, 396, 413, 403, 404, 417, 402, + 418, 426, 416, 409, 421, 418, 427, 417, 414, 428, - 427, 446, 428, 440, 449, 424, 423, 425, 434, 438, - 441, 450, 451, 452, 453, 439, 442, 455, 456, 446, - 459, 444, 457, 453, 458, 449, 455, 460, 452, 461, - 462, 464, 450, 465, 467, 456, 460, 457, 451, 458, - 466, 459, 465, 467, 468, 466, 470, 469, 471, 473, - 478, 461, 474, 462, 469, 475, 464, 476, 480, 471, - 479, 481, 487, 485, 503, 478, 476, 468, 489, 470, - 481, 487, 488, 473, 489, 474, 485, 479, 475, 488, - 491, 480, 493, 492, 495, 498, 500, 491, 492, 499, - 498, 501, 502, 503, 504, 493, 501, 505, 499, 506, + 419, 421, 430, 438, 431, 437, 442, 443, 446, 444, + 445, 430, 426, 427, 431, 438, 428, 444, 437, 448, + 450, 442, 453, 445, 454, 446, 455, 457, 459, 443, + 460, 456, 463, 461, 462, 464, 457, 459, 450, 465, + 466, 468, 448, 453, 464, 454, 456, 460, 461, 462, + 469, 470, 455, 463, 473, 471, 470, 474, 472, 469, + 471, 465, 475, 466, 474, 476, 468, 472, 478, 481, + 479, 480, 483, 484, 485, 486, 476, 473, 481, 492, + 495, 555, 490, 494, 486, 475, 495, 483, 492, 493, + 484, 499, 478, 479, 480, 490, 493, 485, 494, 497, - 507, 504, 508, 512, 511, 507, 509, 495, 502, 500, - 513, 509, 514, 515, 506, 516, 517, 508, 511, 512, - 505, 519, 515, 520, 516, 521, 522, 524, 525, 513, - 519, 526, 527, 531, 529, 514, 524, 534, 520, 517, - 521, 522, 533, 532, 526, 535, 536, 537, 531, 527, - 532, 525, 529, 538, 534, 533, 539, 541, 540, 542, - 544, 547, 549, 539, 536, 540, 535, 553, 547, 550, - 537, 549, 548, 546, 538, 545, 543, 544, 530, 528, - 523, 518, 542, 510, 497, 496, 541, 494, 553, 556, - 556, 556, 556, 557, 557, 559, 490, 559, 559, 486, + 498, 501, 504, 505, 499, 498, 497, 504, 506, 507, + 508, 509, 505, 510, 507, 511, 512, 513, 514, 515, + 510, 518, 516, 514, 501, 519, 508, 516, 520, 512, + 521, 506, 513, 522, 515, 518, 523, 524, 511, 526, + 509, 519, 522, 527, 528, 523, 529, 520, 530, 532, + 533, 534, 527, 521, 535, 540, 537, 538, 532, 528, + 524, 529, 541, 530, 534, 542, 538, 543, 526, 541, + 540, 535, 544, 533, 537, 546, 545, 548, 542, 547, + 549, 550, 551, 552, 543, 548, 554, 549, 550, 558, + 560, 564, 553, 544, 545, 539, 558, 536, 546, 560, - 484, 483, 482, 477, 472, 463, 454, 448, 447, 445, - 443, 437, 436, 435, 433, 432, 431, 430, 429, 426, - 422, 421, 420, 419, 417, 412, 409, 408, 407, 404, - 403, 402, 394, 391, 382, 381, 379, 378, 374, 370, - 369, 368, 367, 366, 365, 364, 361, 353, 342, 341, - 339, 324, 321, 319, 316, 314, 311, 305, 304, 302, - 300, 297, 294, 289, 282, 276, 273, 272, 271, 260, - 259, 254, 238, 237, 236, 233, 221, 199, 193, 191, - 183, 182, 179, 176, 149, 142, 137, 135, 132, 129, - 125, 121, 105, 89, 59, 39, 37, 8, 7, 3, + 547, 531, 525, 554, 517, 503, 552, 502, 500, 496, + 491, 551, 564, 567, 567, 567, 567, 568, 568, 570, + 489, 570, 570, 488, 487, 482, 477, 467, 458, 452, + 451, 449, 447, 441, 440, 439, 436, 435, 434, 433, + 432, 429, 425, 424, 423, 422, 420, 415, 412, 411, + 410, 407, 406, 405, 397, 394, 384, 383, 381, 380, + 376, 372, 371, 370, 369, 368, 367, 366, 363, 355, + 344, 343, 341, 326, 323, 321, 318, 316, 313, 306, + 305, 303, 301, 298, 295, 290, 283, 277, 274, 273, + 272, 261, 260, 255, 239, 238, 237, 234, 222, 199, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555, 555, 555, 555, 555, 555, 555, - 555, 555, 555, 555 + 193, 191, 183, 182, 179, 176, 149, 142, 137, 135, + 132, 129, 125, 121, 105, 89, 59, 39, 37, 8, + 7, 3, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566, 566, 566, 566, 566, + 566, 566, 566, 566, 566, 566 } ; static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr; @@ -919,6 +928,7 @@ char *yytext; #define RET_TY(sym,OldTY,NewTY,sign) \ Upgradelval.Type.newTy = new std::string(NewTY); \ Upgradelval.Type.oldTy = OldTY; \ + Upgradelval.Type.elemTy = VoidTy; \ return sym #define YY_NEVER_INTERACTIVE 1 @@ -938,7 +948,7 @@ char *yytext; /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing * it to deal with 64 bit numbers. */ -#line 942 "UpgradeLexer.cpp" +#line 952 "UpgradeLexer.cpp" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1089,10 +1099,10 @@ YY_DECL register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -#line 98 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 99 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -#line 1096 "UpgradeLexer.cpp" +#line 1106 "UpgradeLexer.cpp" if ( yy_init ) { @@ -1140,14 +1150,14 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 556 ) + if ( yy_current_state >= 567 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; *yy_state_ptr++ = yy_current_state; ++yy_cp; } - while ( yy_current_state != 555 ); + while ( yy_current_state != 566 ); yy_find_action: yy_current_state = *--yy_state_ptr; @@ -1185,641 +1195,646 @@ do_action: /* This label is used only to access EOF actions. */ { /* beginning of action switch */ case 1: YY_RULE_SETUP -#line 100 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 101 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { /* Ignore comments for now */ } YY_BREAK case 2: YY_RULE_SETUP -#line 102 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 103 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( BEGINTOK); } YY_BREAK case 3: YY_RULE_SETUP -#line 103 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 104 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( ENDTOK); } YY_BREAK case 4: YY_RULE_SETUP -#line 104 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 105 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( TRUETOK); } YY_BREAK case 5: YY_RULE_SETUP -#line 105 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 106 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( FALSETOK); } YY_BREAK case 6: YY_RULE_SETUP -#line 106 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 107 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( DECLARE); } YY_BREAK case 7: YY_RULE_SETUP -#line 107 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 108 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( GLOBAL); } YY_BREAK case 8: YY_RULE_SETUP -#line 108 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 109 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( CONSTANT); } YY_BREAK case 9: YY_RULE_SETUP -#line 109 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 110 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( INTERNAL); } YY_BREAK case 10: YY_RULE_SETUP -#line 110 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 111 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( LINKONCE); } YY_BREAK case 11: YY_RULE_SETUP -#line 111 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 112 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( WEAK); } YY_BREAK case 12: YY_RULE_SETUP -#line 112 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 113 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( APPENDING); } YY_BREAK case 13: YY_RULE_SETUP -#line 113 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 114 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( DLLIMPORT); } YY_BREAK case 14: YY_RULE_SETUP -#line 114 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 115 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( DLLEXPORT); } YY_BREAK case 15: YY_RULE_SETUP -#line 115 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 116 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( EXTERN_WEAK); } YY_BREAK case 16: YY_RULE_SETUP -#line 116 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 117 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( EXTERNAL); } YY_BREAK case 17: YY_RULE_SETUP -#line 117 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( IMPLEMENTATION); } +#line 118 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UNINITIALIZED); } // alias for external YY_BREAK case 18: YY_RULE_SETUP -#line 118 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ZEROINITIALIZER); } +#line 119 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( IMPLEMENTATION); } YY_BREAK case 19: YY_RULE_SETUP -#line 119 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DOTDOTDOT); } +#line 120 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ZEROINITIALIZER); } YY_BREAK case 20: YY_RULE_SETUP -#line 120 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNDEF); } +#line 121 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DOTDOTDOT); } YY_BREAK case 21: YY_RULE_SETUP -#line 121 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( NULL_TOK); } +#line 122 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UNDEF); } YY_BREAK case 22: YY_RULE_SETUP -#line 122 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TO); } +#line 123 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( NULL_TOK); } YY_BREAK case 23: YY_RULE_SETUP -#line 123 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TAIL); } +#line 124 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TO); } YY_BREAK case 24: YY_RULE_SETUP -#line 124 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TARGET); } +#line 125 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TAIL); } YY_BREAK case 25: YY_RULE_SETUP -#line 125 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TRIPLE); } +#line 126 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TARGET); } YY_BREAK case 26: YY_RULE_SETUP -#line 126 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DEPLIBS); } +#line 127 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TRIPLE); } YY_BREAK case 27: YY_RULE_SETUP -#line 127 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ENDIAN); } +#line 128 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DEPLIBS); } YY_BREAK case 28: YY_RULE_SETUP -#line 128 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( POINTERSIZE); } +#line 129 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ENDIAN); } YY_BREAK case 29: YY_RULE_SETUP -#line 129 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( DATALAYOUT); } +#line 130 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( POINTERSIZE); } YY_BREAK case 30: YY_RULE_SETUP -#line 130 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LITTLE); } +#line 131 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DATALAYOUT); } YY_BREAK case 31: YY_RULE_SETUP -#line 131 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( BIG); } +#line 132 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LITTLE); } YY_BREAK case 32: YY_RULE_SETUP -#line 132 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( VOLATILE); } +#line 133 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( BIG); } YY_BREAK case 33: YY_RULE_SETUP -#line 133 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ALIGN); } +#line 134 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( VOLATILE); } YY_BREAK case 34: YY_RULE_SETUP -#line 134 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SECTION); } +#line 135 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ALIGN); } YY_BREAK case 35: YY_RULE_SETUP -#line 135 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( MODULE); } +#line 136 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SECTION); } YY_BREAK case 36: YY_RULE_SETUP -#line 136 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ASM_TOK); } +#line 137 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( MODULE); } YY_BREAK case 37: YY_RULE_SETUP -#line 137 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SIDEEFFECT); } +#line 138 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ASM_TOK); } YY_BREAK case 38: YY_RULE_SETUP #line 139 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CC_TOK); } +{ RET_TOK( SIDEEFFECT); } YY_BREAK case 39: YY_RULE_SETUP -#line 140 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CCC_TOK); } +#line 141 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CC_TOK); } YY_BREAK case 40: YY_RULE_SETUP -#line 141 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CSRETCC_TOK); } +#line 142 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CCC_TOK); } YY_BREAK case 41: YY_RULE_SETUP -#line 142 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FASTCC_TOK); } +#line 143 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CSRETCC_TOK); } YY_BREAK case 42: YY_RULE_SETUP -#line 143 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( COLDCC_TOK); } +#line 144 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FASTCC_TOK); } YY_BREAK case 43: YY_RULE_SETUP -#line 144 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( X86_STDCALLCC_TOK); } +#line 145 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( COLDCC_TOK); } YY_BREAK case 44: YY_RULE_SETUP -#line 145 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( X86_FASTCALLCC_TOK); } +#line 146 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( X86_STDCALLCC_TOK); } YY_BREAK case 45: YY_RULE_SETUP #line 147 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(VOID,VoidTy,"void",false); } +{ RET_TOK( X86_FASTCALLCC_TOK); } YY_BREAK case 46: YY_RULE_SETUP -#line 148 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(BOOL,BoolTy,"bool",false); } +#line 149 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(VOID,VoidTy,"void",false); } YY_BREAK case 47: YY_RULE_SETUP -#line 149 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(SBYTE,SByteTy,"sbyte",true); } +#line 150 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(BOOL,BoolTy,"bool",false); } YY_BREAK case 48: YY_RULE_SETUP -#line 150 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(UBYTE,UByteTy,"ubyte",false); } +#line 151 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(SBYTE,SByteTy,"sbyte",true); } YY_BREAK case 49: YY_RULE_SETUP -#line 151 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(SHORT,ShortTy,"short",true); } +#line 152 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(UBYTE,UByteTy,"ubyte",false); } YY_BREAK case 50: YY_RULE_SETUP -#line 152 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(USHORT,UShortTy,"ushort",false); } +#line 153 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(SHORT,ShortTy,"short",true); } YY_BREAK case 51: YY_RULE_SETUP -#line 153 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(INT,IntTy,"int",true); } +#line 154 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(USHORT,UShortTy,"ushort",false); } YY_BREAK case 52: YY_RULE_SETUP -#line 154 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(UINT,UIntTy,"uint",false); } +#line 155 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(INT,IntTy,"int",true); } YY_BREAK case 53: YY_RULE_SETUP -#line 155 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(LONG,LongTy,"long",true); } +#line 156 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(UINT,UIntTy,"uint",false); } YY_BREAK case 54: YY_RULE_SETUP -#line 156 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(ULONG,ULongTy,"ulong",false); } +#line 157 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(LONG,LongTy,"long",true); } YY_BREAK case 55: YY_RULE_SETUP -#line 157 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(FLOAT,FloatTy,"float",false); } +#line 158 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(ULONG,ULongTy,"ulong",false); } YY_BREAK case 56: YY_RULE_SETUP -#line 158 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(DOUBLE,DoubleTy,"double",false); } +#line 159 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(FLOAT,FloatTy,"float",false); } YY_BREAK case 57: YY_RULE_SETUP -#line 159 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TY(LABEL,LabelTy,"label",false); } +#line 160 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(DOUBLE,DoubleTy,"double",false); } YY_BREAK case 58: YY_RULE_SETUP -#line 160 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(OPAQUE); } +#line 161 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TY(LABEL,LabelTy,"label",false); } YY_BREAK case 59: YY_RULE_SETUP -#line 161 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK(TYPE); } +#line 162 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK(OPAQUE); } YY_BREAK case 60: YY_RULE_SETUP #line 163 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ADD); } +{ RET_TOK(TYPE); } YY_BREAK case 61: YY_RULE_SETUP -#line 164 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SUB); } +#line 165 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ADD); } YY_BREAK case 62: YY_RULE_SETUP -#line 165 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( MUL); } +#line 166 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SUB); } YY_BREAK case 63: YY_RULE_SETUP -#line 166 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UDIV); } +#line 167 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( MUL); } YY_BREAK case 64: YY_RULE_SETUP -#line 167 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UDIV); } +#line 168 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( DIV); } YY_BREAK case 65: YY_RULE_SETUP -#line 168 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SDIV); } +#line 169 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UDIV); } YY_BREAK case 66: YY_RULE_SETUP -#line 169 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FDIV); } +#line 170 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SDIV); } YY_BREAK case 67: YY_RULE_SETUP -#line 170 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UREM); } +#line 171 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FDIV); } YY_BREAK case 68: YY_RULE_SETUP -#line 171 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UREM); } +#line 172 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( REM); } YY_BREAK case 69: YY_RULE_SETUP -#line 172 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SREM); } +#line 173 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UREM); } YY_BREAK case 70: YY_RULE_SETUP -#line 173 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FREM); } +#line 174 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SREM); } YY_BREAK case 71: YY_RULE_SETUP -#line 174 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( AND); } +#line 175 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FREM); } YY_BREAK case 72: YY_RULE_SETUP -#line 175 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( OR); } +#line 176 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( AND); } YY_BREAK case 73: YY_RULE_SETUP -#line 176 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( XOR); } +#line 177 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( OR); } YY_BREAK case 74: YY_RULE_SETUP -#line 177 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETNE); } +#line 178 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( XOR); } YY_BREAK case 75: YY_RULE_SETUP -#line 178 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETEQ); } +#line 179 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETNE); } YY_BREAK case 76: YY_RULE_SETUP -#line 179 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETLT); } +#line 180 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETEQ); } YY_BREAK case 77: YY_RULE_SETUP -#line 180 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETGT); } +#line 181 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETLT); } YY_BREAK case 78: YY_RULE_SETUP -#line 181 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETLE); } +#line 182 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETGT); } YY_BREAK case 79: YY_RULE_SETUP -#line 182 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SETGE); } +#line 183 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SETLE); } YY_BREAK case 80: YY_RULE_SETUP #line 184 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( PHI_TOK); } +{ RET_TOK( SETGE); } YY_BREAK case 81: YY_RULE_SETUP -#line 185 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CALL); } +#line 186 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( PHI_TOK); } YY_BREAK case 82: YY_RULE_SETUP -#line 186 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( CAST); } +#line 187 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CALL); } YY_BREAK case 83: YY_RULE_SETUP -#line 187 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( TRUNC); } +#line 188 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( CAST); } YY_BREAK case 84: YY_RULE_SETUP -#line 188 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ZEXT); } +#line 189 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( TRUNC); } YY_BREAK case 85: YY_RULE_SETUP -#line 189 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SEXT); } +#line 190 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ZEXT); } YY_BREAK case 86: YY_RULE_SETUP -#line 190 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPTRUNC); } +#line 191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SEXT); } YY_BREAK case 87: YY_RULE_SETUP -#line 191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPEXT); } +#line 192 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPTRUNC); } YY_BREAK case 88: YY_RULE_SETUP -#line 192 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPTOUI); } +#line 193 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPEXT); } YY_BREAK case 89: YY_RULE_SETUP -#line 193 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPTOSI); } +#line 194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPTOUI); } YY_BREAK case 90: YY_RULE_SETUP -#line 194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UITOFP); } +#line 195 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPTOSI); } YY_BREAK case 91: YY_RULE_SETUP -#line 195 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SITOFP); } +#line 196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UITOFP); } YY_BREAK case 92: YY_RULE_SETUP -#line 196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( PTRTOINT); } +#line 197 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SITOFP); } YY_BREAK case 93: YY_RULE_SETUP -#line 197 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INTTOPTR); } +#line 198 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( PTRTOINT); } YY_BREAK case 94: YY_RULE_SETUP -#line 198 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( BITCAST); } +#line 199 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INTTOPTR); } YY_BREAK case 95: YY_RULE_SETUP -#line 199 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SELECT); } +#line 200 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( BITCAST); } YY_BREAK case 96: YY_RULE_SETUP -#line 200 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SHL); } +#line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SELECT); } YY_BREAK case 97: YY_RULE_SETUP -#line 201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SHR); } +#line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SHL); } YY_BREAK case 98: YY_RULE_SETUP -#line 202 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ASHR); } +#line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SHR); } YY_BREAK case 99: YY_RULE_SETUP -#line 203 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LSHR); } +#line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ASHR); } YY_BREAK case 100: YY_RULE_SETUP -#line 204 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( VAARG); } +#line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LSHR); } YY_BREAK case 101: YY_RULE_SETUP -#line 205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( RET); } +#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( VAARG); } YY_BREAK case 102: YY_RULE_SETUP -#line 206 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( BR); } +#line 207 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( RET); } YY_BREAK case 103: YY_RULE_SETUP -#line 207 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SWITCH); } +#line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( BR); } YY_BREAK case 104: YY_RULE_SETUP -#line 208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INVOKE); } +#line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SWITCH); } YY_BREAK case 105: YY_RULE_SETUP -#line 209 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNWIND); } +#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INVOKE); } YY_BREAK case 106: YY_RULE_SETUP -#line 210 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( UNWIND); } YY_BREAK case 107: YY_RULE_SETUP -#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UNREACHABLE); } +#line 212 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EXCEPT); } // alias for unwind YY_BREAK case 108: YY_RULE_SETUP #line 213 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( MALLOC); } +{ RET_TOK( UNREACHABLE); } YY_BREAK case 109: YY_RULE_SETUP -#line 214 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ALLOCA); } +#line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( MALLOC); } YY_BREAK case 110: YY_RULE_SETUP -#line 215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FREE); } +#line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ALLOCA); } YY_BREAK case 111: YY_RULE_SETUP -#line 216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LOAD); } +#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FREE); } YY_BREAK case 112: YY_RULE_SETUP -#line 217 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( STORE); } +#line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LOAD); } YY_BREAK case 113: YY_RULE_SETUP -#line 218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( GETELEMENTPTR); } +#line 219 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( STORE); } YY_BREAK case 114: YY_RULE_SETUP #line 220 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EXTRACTELEMENT); } +{ RET_TOK( GETELEMENTPTR); } YY_BREAK case 115: YY_RULE_SETUP -#line 221 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( INSERTELEMENT); } +#line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EXTRACTELEMENT); } YY_BREAK case 116: YY_RULE_SETUP -#line 222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SHUFFLEVECTOR); } +#line 223 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( INSERTELEMENT); } YY_BREAK case 117: YY_RULE_SETUP -#line 225 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( VAR_ID); } +#line 224 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SHUFFLEVECTOR); } YY_BREAK case 118: YY_RULE_SETUP -#line 226 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( LABELSTR); } +#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( VAR_ID); } YY_BREAK case 119: YY_RULE_SETUP -#line 227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( LABELSTR); } YY_BREAK case 120: YY_RULE_SETUP -#line 228 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( STRINGCONSTANT ); } +#line 229 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( LABELSTR); } YY_BREAK case 121: YY_RULE_SETUP -#line 229 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( EUINT64VAL ); } +#line 230 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( STRINGCONSTANT ); } YY_BREAK case 122: YY_RULE_SETUP -#line 230 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( ESINT64VAL ); } +#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( EUINT64VAL ); } YY_BREAK case 123: YY_RULE_SETUP -#line 231 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); } +#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( ESINT64VAL ); } YY_BREAK case 124: YY_RULE_SETUP -#line 232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( UINTVAL); } +#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( yytext[0] == 's' ? ESINT64VAL : EUINT64VAL ); } YY_BREAK case 125: YY_RULE_SETUP -#line 233 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( SINTVAL); } +#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( UINTVAL); } YY_BREAK case 126: YY_RULE_SETUP -#line 234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ RET_TOK( FPVAL); } +#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( SINTVAL); } YY_BREAK case 127: YY_RULE_SETUP -#line 235 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ RET_TOK( FPVAL); } + YY_BREAK +case 128: +YY_RULE_SETUP +#line 237 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { RET_TOK( FPVAL); } YY_BREAK case YY_STATE_EOF(INITIAL): -#line 236 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 238 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" { /* Make sure to free the internal buffers for flex when we are * done reading our input! @@ -1828,22 +1843,22 @@ case YY_STATE_EOF(INITIAL): return EOF; } YY_BREAK -case 128: -YY_RULE_SETUP -#line 244 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ /* Ignore whitespace */ } - YY_BREAK case 129: YY_RULE_SETUP -#line 245 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" -{ return yytext[0]; } +#line 246 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ /* Ignore whitespace */ } YY_BREAK case 130: YY_RULE_SETUP #line 247 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +{ return yytext[0]; } + YY_BREAK +case 131: +YY_RULE_SETUP +#line 249 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1847 "UpgradeLexer.cpp" +#line 1862 "UpgradeLexer.cpp" case YY_END_OF_BUFFER: { @@ -2130,7 +2145,7 @@ static yy_state_type yy_get_previous_state() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 556 ) + if ( yy_current_state >= 567 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2160,11 +2175,11 @@ yy_state_type yy_current_state; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 556 ) + if ( yy_current_state >= 567 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 555); + yy_is_jam = (yy_current_state == 566); if ( ! yy_is_jam ) *yy_state_ptr++ = yy_current_state; @@ -2721,5 +2736,5 @@ int main() return 0; } #endif -#line 247 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" +#line 249 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeLexer.l" diff --git a/tools/llvm-upgrade/UpgradeLexer.l.cvs b/tools/llvm-upgrade/UpgradeLexer.l.cvs index 0e62e4c9501..4b5fde7d09f 100644 --- a/tools/llvm-upgrade/UpgradeLexer.l.cvs +++ b/tools/llvm-upgrade/UpgradeLexer.l.cvs @@ -50,6 +50,7 @@ #define RET_TY(sym,OldTY,NewTY,sign) \ Upgradelval.Type.newTy = new std::string(NewTY); \ Upgradelval.Type.oldTy = OldTY; \ + Upgradelval.Type.elemTy = VoidTy; \ return sym #define YY_NEVER_INTERACTIVE 1 @@ -114,6 +115,7 @@ dllimport { RET_TOK( DLLIMPORT); } dllexport { RET_TOK( DLLEXPORT); } extern_weak { RET_TOK( EXTERN_WEAK); } external { RET_TOK( EXTERNAL); } +uninitialized { RET_TOK( UNINITIALIZED); } // alias for external implementation { RET_TOK( IMPLEMENTATION); } zeroinitializer { RET_TOK( ZEROINITIALIZER); } \.\.\. { RET_TOK( DOTDOTDOT); } @@ -163,11 +165,11 @@ type { RET_TOK(TYPE); } add { RET_TOK( ADD); } sub { RET_TOK( SUB); } mul { RET_TOK( MUL); } -div { RET_TOK( UDIV); } +div { RET_TOK( DIV); } udiv { RET_TOK( UDIV); } sdiv { RET_TOK( SDIV); } fdiv { RET_TOK( FDIV); } -rem { RET_TOK( UREM); } +rem { RET_TOK( REM); } urem { RET_TOK( UREM); } srem { RET_TOK( SREM); } frem { RET_TOK( FREM); } @@ -207,7 +209,7 @@ br { RET_TOK( BR); } switch { RET_TOK( SWITCH); } invoke { RET_TOK( INVOKE); } unwind { RET_TOK( UNWIND); } -except { RET_TOK( UNWIND); } +except { RET_TOK( EXCEPT); } // alias for unwind unreachable { RET_TOK( UNREACHABLE); } malloc { RET_TOK( MALLOC); } diff --git a/tools/llvm-upgrade/UpgradeParser.cpp b/tools/llvm-upgrade/UpgradeParser.cpp index 2e776cf434d..843dd33c4ef 100644 --- a/tools/llvm-upgrade/UpgradeParser.cpp +++ b/tools/llvm-upgrade/UpgradeParser.cpp @@ -119,73 +119,77 @@ LITTLE = 310, BIG = 311, ALIGN = 312, - DEPLIBS = 313, - CALL = 314, - TAIL = 315, - ASM_TOK = 316, - MODULE = 317, - SIDEEFFECT = 318, - CC_TOK = 319, - CCC_TOK = 320, - CSRETCC_TOK = 321, - FASTCC_TOK = 322, - COLDCC_TOK = 323, - X86_STDCALLCC_TOK = 324, - X86_FASTCALLCC_TOK = 325, - DATALAYOUT = 326, - RET = 327, - BR = 328, - SWITCH = 329, - INVOKE = 330, - UNWIND = 331, - UNREACHABLE = 332, - ADD = 333, - SUB = 334, - MUL = 335, - UDIV = 336, - SDIV = 337, - FDIV = 338, - UREM = 339, - SREM = 340, - FREM = 341, - AND = 342, - OR = 343, - XOR = 344, - SETLE = 345, - SETGE = 346, - SETLT = 347, - SETGT = 348, - SETEQ = 349, - SETNE = 350, - MALLOC = 351, - ALLOCA = 352, - FREE = 353, - LOAD = 354, - STORE = 355, - GETELEMENTPTR = 356, - PHI_TOK = 357, - SELECT = 358, - SHL = 359, - SHR = 360, - ASHR = 361, - LSHR = 362, - VAARG = 363, - EXTRACTELEMENT = 364, - INSERTELEMENT = 365, - SHUFFLEVECTOR = 366, - CAST = 367, - TRUNC = 368, - ZEXT = 369, - SEXT = 370, - FPTRUNC = 371, - FPEXT = 372, - FPTOUI = 373, - FPTOSI = 374, - UITOFP = 375, - SITOFP = 376, - PTRTOINT = 377, - INTTOPTR = 378, - BITCAST = 379 + UNINITIALIZED = 313, + DEPLIBS = 314, + CALL = 315, + TAIL = 316, + ASM_TOK = 317, + MODULE = 318, + SIDEEFFECT = 319, + CC_TOK = 320, + CCC_TOK = 321, + CSRETCC_TOK = 322, + FASTCC_TOK = 323, + COLDCC_TOK = 324, + X86_STDCALLCC_TOK = 325, + X86_FASTCALLCC_TOK = 326, + DATALAYOUT = 327, + RET = 328, + BR = 329, + SWITCH = 330, + INVOKE = 331, + EXCEPT = 332, + UNWIND = 333, + UNREACHABLE = 334, + ADD = 335, + SUB = 336, + MUL = 337, + DIV = 338, + UDIV = 339, + SDIV = 340, + FDIV = 341, + REM = 342, + UREM = 343, + SREM = 344, + FREM = 345, + AND = 346, + OR = 347, + XOR = 348, + SETLE = 349, + SETGE = 350, + SETLT = 351, + SETGT = 352, + SETEQ = 353, + SETNE = 354, + MALLOC = 355, + ALLOCA = 356, + FREE = 357, + LOAD = 358, + STORE = 359, + GETELEMENTPTR = 360, + PHI_TOK = 361, + SELECT = 362, + SHL = 363, + SHR = 364, + ASHR = 365, + LSHR = 366, + VAARG = 367, + EXTRACTELEMENT = 368, + INSERTELEMENT = 369, + SHUFFLEVECTOR = 370, + CAST = 371, + TRUNC = 372, + ZEXT = 373, + SEXT = 374, + FPTRUNC = 375, + FPEXT = 376, + FPTOUI = 377, + FPTOSI = 378, + UITOFP = 379, + SITOFP = 380, + PTRTOINT = 381, + INTTOPTR = 382, + BITCAST = 383 }; #endif /* Tokens. */ @@ -244,73 +248,77 @@ #define LITTLE 310 #define BIG 311 #define ALIGN 312 -#define DEPLIBS 313 -#define CALL 314 -#define TAIL 315 -#define ASM_TOK 316 -#define MODULE 317 -#define SIDEEFFECT 318 -#define CC_TOK 319 -#define CCC_TOK 320 -#define CSRETCC_TOK 321 -#define FASTCC_TOK 322 -#define COLDCC_TOK 323 -#define X86_STDCALLCC_TOK 324 -#define X86_FASTCALLCC_TOK 325 -#define DATALAYOUT 326 -#define RET 327 -#define BR 328 -#define SWITCH 329 -#define INVOKE 330 -#define UNWIND 331 -#define UNREACHABLE 332 -#define ADD 333 -#define SUB 334 -#define MUL 335 -#define UDIV 336 -#define SDIV 337 -#define FDIV 338 -#define UREM 339 -#define SREM 340 -#define FREM 341 -#define AND 342 -#define OR 343 -#define XOR 344 -#define SETLE 345 -#define SETGE 346 -#define SETLT 347 -#define SETGT 348 -#define SETEQ 349 -#define SETNE 350 -#define MALLOC 351 -#define ALLOCA 352 -#define FREE 353 -#define LOAD 354 -#define STORE 355 -#define GETELEMENTPTR 356 -#define PHI_TOK 357 -#define SELECT 358 -#define SHL 359 -#define SHR 360 -#define ASHR 361 -#define LSHR 362 -#define VAARG 363 -#define EXTRACTELEMENT 364 -#define INSERTELEMENT 365 -#define SHUFFLEVECTOR 366 -#define CAST 367 -#define TRUNC 368 -#define ZEXT 369 -#define SEXT 370 -#define FPTRUNC 371 -#define FPEXT 372 -#define FPTOUI 373 -#define FPTOSI 374 -#define UITOFP 375 -#define SITOFP 376 -#define PTRTOINT 377 -#define INTTOPTR 378 -#define BITCAST 379 +#define UNINITIALIZED 313 +#define DEPLIBS 314 +#define CALL 315 +#define TAIL 316 +#define ASM_TOK 317 +#define MODULE 318 +#define SIDEEFFECT 319 +#define CC_TOK 320 +#define CCC_TOK 321 +#define CSRETCC_TOK 322 +#define FASTCC_TOK 323 +#define COLDCC_TOK 324 +#define X86_STDCALLCC_TOK 325 +#define X86_FASTCALLCC_TOK 326 +#define DATALAYOUT 327 +#define RET 328 +#define BR 329 +#define SWITCH 330 +#define INVOKE 331 +#define EXCEPT 332 +#define UNWIND 333 +#define UNREACHABLE 334 +#define ADD 335 +#define SUB 336 +#define MUL 337 +#define DIV 338 +#define UDIV 339 +#define SDIV 340 +#define FDIV 341 +#define REM 342 +#define UREM 343 +#define SREM 344 +#define FREM 345 +#define AND 346 +#define OR 347 +#define XOR 348 +#define SETLE 349 +#define SETGE 350 +#define SETLT 351 +#define SETGT 352 +#define SETEQ 353 +#define SETNE 354 +#define MALLOC 355 +#define ALLOCA 356 +#define FREE 357 +#define LOAD 358 +#define STORE 359 +#define GETELEMENTPTR 360 +#define PHI_TOK 361 +#define SELECT 362 +#define SHL 363 +#define SHR 364 +#define ASHR 365 +#define LSHR 366 +#define VAARG 367 +#define EXTRACTELEMENT 368 +#define INSERTELEMENT 369 +#define SHUFFLEVECTOR 370 +#define CAST 371 +#define TRUNC 372 +#define ZEXT 373 +#define SEXT 374 +#define FPTRUNC 375 +#define FPEXT 376 +#define FPTOUI 377 +#define FPTOSI 378 +#define UITOFP 379 +#define SITOFP 380 +#define PTRTOINT 381 +#define INTTOPTR 382 +#define BITCAST 383 @@ -371,9 +379,10 @@ void UpgradeAssembly(const std::string &infile, std::istream& in, static void ResolveType(TypeInfo& Ty) { if (Ty.oldTy == UnresolvedTy) { TypeMap::iterator I = NamedTypes.find(*Ty.newTy); - if (I != NamedTypes.end()) + if (I != NamedTypes.end()) { Ty.oldTy = I->second.oldTy; - else { + Ty.elemTy = I->second.elemTy; + } else { std::string msg("Can't resolve type: "); msg += *Ty.newTy; yyerror(msg.c_str()); @@ -382,6 +391,7 @@ static void ResolveType(TypeInfo& Ty) { unsigned ref = atoi(&((Ty.newTy->c_str())[1])); // Skip the '\\' if (ref < EnumeratedTypes.size()) { Ty.oldTy = EnumeratedTypes[ref].oldTy; + Ty.elemTy = EnumeratedTypes[ref].elemTy; } else { std::string msg("Can't resolve type: "); msg += *Ty.newTy; @@ -510,6 +520,32 @@ static std::string getCastUpgrade( return Result; } +const char* getDivRemOpcode(const std::string& opcode, const TypeInfo& TI) { + const char* op = opcode.c_str(); + TypeInfo Ty = TI; + ResolveType(Ty); + if (Ty.isPacked()) + Ty.oldTy = Ty.getElementType(); + if (opcode == "div") + if (Ty.isFloatingPoint()) + op = "fdiv"; + else if (Ty.isUnsigned()) + op = "udiv"; + else if (Ty.isSigned()) + op = "sdiv"; + else + yyerror("Invalid type for div instruction"); + else if (opcode == "rem") + if (Ty.isFloatingPoint()) + op = "frem"; + else if (Ty.isUnsigned()) + op = "urem"; + else if (Ty.isSigned()) + op = "srem"; + else + yyerror("Invalid type for rem instruction"); + return op; +} /* Enabling traces. */ @@ -531,7 +567,7 @@ static std::string getCastUpgrade( #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 239 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" typedef union YYSTYPE { std::string* String; TypeInfo Type; @@ -540,7 +576,7 @@ typedef union YYSTYPE { ValueList* ValList; } YYSTYPE; /* Line 196 of yacc.c. */ -#line 544 "UpgradeParser.tab.c" +#line 580 "UpgradeParser.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -552,7 +588,7 @@ typedef union YYSTYPE { /* Line 219 of yacc.c. */ -#line 556 "UpgradeParser.tab.c" +#line 592 "UpgradeParser.tab.c" #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -703,20 +739,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1335 +#define YYLAST 1324 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 139 +#define YYNTOKENS 143 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 71 +#define YYNNTS 73 /* YYNRULES -- Number of rules. */ -#define YYNRULES 263 +#define YYNRULES 269 /* YYNRULES -- Number of states. */ -#define YYNSTATES 522 +#define YYNSTATES 528 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 379 +#define YYMAXUTOK 383 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -728,15 +764,15 @@ static const unsigned char yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 128, 129, 137, 2, 126, 2, 2, 2, 2, 2, + 132, 133, 141, 2, 130, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 133, 125, 134, 2, 2, 2, 2, 2, 2, 2, + 137, 129, 138, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 130, 127, 132, 2, 2, 2, 2, 2, 138, + 2, 134, 131, 136, 2, 2, 2, 2, 2, 142, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 131, 2, 2, 135, 2, 136, 2, 2, 2, 2, + 135, 2, 2, 139, 2, 140, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -761,7 +797,8 @@ static const unsigned char yytranslate[] = 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124 + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128 }; #if YYDEBUG @@ -774,149 +811,150 @@ static const unsigned short int yyprhs[] = 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 89, 91, 93, 95, 97, - 99, 101, 103, 105, 108, 109, 111, 113, 115, 117, - 119, 121, 123, 124, 126, 128, 130, 132, 134, 136, - 139, 140, 141, 144, 145, 149, 152, 153, 155, 156, - 160, 162, 165, 167, 169, 171, 173, 175, 177, 179, + 99, 101, 103, 105, 107, 109, 112, 113, 115, 117, + 119, 121, 123, 125, 127, 128, 130, 132, 134, 136, + 138, 140, 143, 144, 145, 148, 149, 153, 156, 157, + 159, 160, 164, 166, 169, 171, 173, 175, 177, 179, 181, 183, 185, 187, 189, 191, 193, 195, 197, 199, - 201, 203, 205, 208, 213, 219, 225, 229, 232, 235, - 237, 241, 243, 247, 249, 250, 255, 259, 263, 268, - 273, 277, 280, 283, 286, 289, 292, 295, 298, 301, - 304, 307, 314, 320, 329, 336, 343, 350, 357, 364, - 373, 382, 386, 388, 390, 392, 394, 397, 400, 405, - 408, 410, 415, 418, 423, 430, 437, 444, 451, 455, - 460, 461, 463, 465, 467, 471, 475, 479, 483, 487, - 491, 493, 494, 496, 498, 500, 501, 504, 508, 510, - 512, 516, 518, 519, 528, 530, 532, 536, 538, 540, - 544, 545, 547, 549, 553, 554, 556, 558, 560, 562, - 564, 566, 568, 570, 572, 576, 578, 584, 586, 588, - 590, 592, 595, 598, 600, 603, 606, 607, 609, 612, - 615, 619, 629, 639, 648, 663, 665, 667, 674, 680, - 683, 690, 698, 700, 704, 706, 707, 710, 712, 718, - 724, 730, 733, 738, 743, 750, 755, 760, 767, 774, - 777, 785, 787, 790, 791, 793, 794, 798, 805, 809, - 816, 819, 824, 831 + 201, 203, 205, 207, 209, 212, 217, 223, 229, 233, + 236, 239, 241, 245, 247, 251, 253, 254, 259, 263, + 267, 272, 277, 281, 284, 287, 290, 293, 296, 299, + 302, 305, 308, 311, 318, 324, 333, 340, 347, 354, + 361, 368, 377, 386, 390, 392, 394, 396, 398, 401, + 404, 409, 412, 414, 416, 418, 423, 426, 431, 438, + 445, 452, 459, 463, 468, 469, 471, 473, 475, 479, + 483, 487, 491, 495, 499, 501, 502, 504, 506, 508, + 509, 512, 516, 518, 520, 524, 526, 527, 536, 538, + 540, 544, 546, 548, 552, 553, 555, 557, 561, 562, + 564, 566, 568, 570, 572, 574, 576, 578, 580, 584, + 586, 592, 594, 596, 598, 600, 603, 606, 608, 611, + 614, 615, 617, 619, 621, 624, 627, 631, 641, 651, + 660, 675, 677, 679, 686, 692, 695, 702, 710, 712, + 716, 718, 719, 722, 724, 730, 736, 742, 745, 750, + 755, 762, 767, 772, 779, 786, 789, 797, 799, 802, + 803, 805, 806, 810, 817, 821, 828, 831, 836, 843 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const short int yyrhs[] = { - 171, 0, -1, 19, -1, 20, -1, 17, -1, 18, - -1, 78, -1, 79, -1, 80, -1, 81, -1, 82, - -1, 83, -1, 84, -1, 85, -1, 86, -1, 87, - -1, 88, -1, 89, -1, 90, -1, 91, -1, 92, - -1, 93, -1, 94, -1, 95, -1, 104, -1, 105, - -1, 106, -1, 107, -1, 113, -1, 114, -1, 115, - -1, 116, -1, 117, -1, 118, -1, 119, -1, 120, - -1, 121, -1, 122, -1, 123, -1, 124, -1, 112, - -1, 11, -1, 9, -1, 7, -1, 5, -1, 12, - -1, 10, -1, 8, -1, 6, -1, 147, -1, 148, - -1, 13, -1, 14, -1, 179, 125, -1, -1, 42, - -1, 43, -1, 44, -1, 48, -1, 45, -1, 46, - -1, 47, -1, -1, 65, -1, 66, -1, 67, -1, - 68, -1, 69, -1, 70, -1, 64, 18, -1, -1, - -1, 57, 18, -1, -1, 126, 57, 18, -1, 37, - 30, -1, -1, 156, -1, -1, 126, 159, 158, -1, - 156, -1, 57, 18, -1, 162, -1, 3, -1, 164, - -1, 3, -1, 164, -1, 4, -1, 5, -1, 6, - -1, 7, -1, 8, -1, 9, -1, 10, -1, 11, - -1, 12, -1, 13, -1, 14, -1, 15, -1, 16, - -1, 193, -1, 163, -1, 127, 18, -1, 161, 128, - 166, 129, -1, 130, 18, 131, 164, 132, -1, 133, - 18, 131, 164, 134, -1, 135, 165, 136, -1, 135, - 136, -1, 164, 137, -1, 164, -1, 165, 126, 164, - -1, 165, -1, 165, 126, 40, -1, 40, -1, -1, - 162, 130, 169, 132, -1, 162, 130, 132, -1, 162, - 138, 30, -1, 162, 133, 169, 134, -1, 162, 135, - 169, 136, -1, 162, 135, 136, -1, 162, 22, -1, - 162, 23, -1, 162, 193, -1, 162, 168, -1, 162, - 24, -1, 147, 141, -1, 148, 18, -1, 4, 25, - -1, 4, 26, -1, 150, 21, -1, 146, 128, 167, - 39, 162, 129, -1, 101, 128, 167, 207, 129, -1, - 103, 128, 167, 126, 167, 126, 167, 129, -1, 142, - 128, 167, 126, 167, 129, -1, 143, 128, 167, 126, - 167, 129, -1, 144, 128, 167, 126, 167, 129, -1, - 145, 128, 167, 126, 167, 129, -1, 109, 128, 167, - 126, 167, 129, -1, 110, 128, 167, 126, 167, 126, - 167, 129, -1, 111, 128, 167, 126, 167, 126, 167, - 129, -1, 169, 126, 167, -1, 167, -1, 35, -1, - 36, -1, 172, -1, 172, 188, -1, 172, 190, -1, - 172, 62, 61, 174, -1, 172, 31, -1, 173, -1, - 173, 151, 27, 160, -1, 173, 190, -1, 173, 62, - 61, 174, -1, 173, 151, 152, 170, 167, 158, -1, - 173, 151, 50, 170, 162, 158, -1, 173, 151, 45, - 170, 162, 158, -1, 173, 151, 47, 170, 162, 158, - -1, 173, 51, 176, -1, 173, 58, 125, 177, -1, - -1, 30, -1, 56, -1, 55, -1, 53, 125, 175, - -1, 54, 125, 18, -1, 52, 125, 30, -1, 71, - 125, 30, -1, 130, 178, 132, -1, 178, 126, 30, - -1, 30, -1, -1, 28, -1, 30, -1, 179, -1, - -1, 162, 180, -1, 182, 126, 181, -1, 181, -1, - 182, -1, 182, 126, 40, -1, 40, -1, -1, 153, - 160, 179, 128, 183, 129, 157, 154, -1, 32, -1, - 135, -1, 152, 184, 185, -1, 33, -1, 136, -1, - 186, 196, 187, -1, -1, 45, -1, 47, -1, 34, - 189, 184, -1, -1, 63, -1, 17, -1, 18, -1, - 21, -1, 25, -1, 26, -1, 22, -1, 23, -1, - 24, -1, 133, 169, 134, -1, 168, -1, 61, 191, - 30, 126, 30, -1, 140, -1, 179, -1, 193, -1, - 192, -1, 162, 194, -1, 196, 197, -1, 197, -1, - 198, 199, -1, 198, 201, -1, -1, 29, -1, 72, - 195, -1, 72, 3, -1, 73, 15, 194, -1, 73, - 4, 194, 126, 15, 194, 126, 15, 194, -1, 74, - 149, 194, 126, 15, 194, 130, 200, 132, -1, 74, - 149, 194, 126, 15, 194, 130, 132, -1, 151, 75, - 153, 160, 194, 128, 204, 129, 39, 15, 194, 76, - 15, 194, -1, 76, -1, 77, -1, 200, 149, 192, - 126, 15, 194, -1, 149, 192, 126, 15, 194, -1, - 151, 206, -1, 162, 130, 194, 126, 194, 132, -1, - 202, 126, 130, 194, 126, 194, 132, -1, 195, -1, - 203, 126, 195, -1, 203, -1, -1, 60, 59, -1, - 59, -1, 142, 162, 194, 126, 194, -1, 143, 162, - 194, 126, 194, -1, 144, 162, 194, 126, 194, -1, - 49, 195, -1, 145, 195, 126, 195, -1, 146, 195, - 39, 162, -1, 103, 195, 126, 195, 126, 195, -1, - 108, 195, 126, 162, -1, 109, 195, 126, 195, -1, - 110, 195, 126, 195, 126, 195, -1, 111, 195, 126, - 195, 126, 195, -1, 102, 202, -1, 205, 153, 160, - 194, 128, 204, 129, -1, 209, -1, 126, 203, -1, - -1, 38, -1, -1, 96, 162, 155, -1, 96, 162, - 126, 10, 194, 155, -1, 97, 162, 155, -1, 97, - 162, 126, 10, 194, 155, -1, 98, 195, -1, 208, - 99, 162, 194, -1, 208, 100, 195, 126, 162, 194, - -1, 101, 162, 194, 207, -1 + 175, 0, -1, 19, -1, 20, -1, 17, -1, 18, + -1, 80, -1, 81, -1, 82, -1, 83, -1, 84, + -1, 85, -1, 86, -1, 87, -1, 88, -1, 89, + -1, 90, -1, 91, -1, 92, -1, 93, -1, 94, + -1, 95, -1, 96, -1, 97, -1, 98, -1, 99, + -1, 108, -1, 109, -1, 110, -1, 111, -1, 117, + -1, 118, -1, 119, -1, 120, -1, 121, -1, 122, + -1, 123, -1, 124, -1, 125, -1, 126, -1, 127, + -1, 128, -1, 116, -1, 11, -1, 9, -1, 7, + -1, 5, -1, 12, -1, 10, -1, 8, -1, 6, + -1, 151, -1, 152, -1, 13, -1, 14, -1, 184, + 129, -1, -1, 42, -1, 43, -1, 44, -1, 48, + -1, 45, -1, 46, -1, 47, -1, -1, 66, -1, + 67, -1, 68, -1, 69, -1, 70, -1, 71, -1, + 65, 18, -1, -1, -1, 57, 18, -1, -1, 130, + 57, 18, -1, 37, 30, -1, -1, 160, -1, -1, + 130, 163, 162, -1, 160, -1, 57, 18, -1, 166, + -1, 3, -1, 168, -1, 3, -1, 168, -1, 4, + -1, 5, -1, 6, -1, 7, -1, 8, -1, 9, + -1, 10, -1, 11, -1, 12, -1, 13, -1, 14, + -1, 15, -1, 16, -1, 198, -1, 167, -1, 131, + 18, -1, 165, 132, 170, 133, -1, 134, 18, 135, + 168, 136, -1, 137, 18, 135, 168, 138, -1, 139, + 169, 140, -1, 139, 140, -1, 168, 141, -1, 168, + -1, 169, 130, 168, -1, 169, -1, 169, 130, 40, + -1, 40, -1, -1, 166, 134, 173, 136, -1, 166, + 134, 136, -1, 166, 142, 30, -1, 166, 137, 173, + 138, -1, 166, 139, 173, 140, -1, 166, 139, 140, + -1, 166, 22, -1, 166, 23, -1, 166, 198, -1, + 166, 172, -1, 166, 24, -1, 151, 145, -1, 152, + 18, -1, 4, 25, -1, 4, 26, -1, 154, 21, + -1, 150, 132, 171, 39, 166, 133, -1, 105, 132, + 171, 213, 133, -1, 107, 132, 171, 130, 171, 130, + 171, 133, -1, 146, 132, 171, 130, 171, 133, -1, + 147, 132, 171, 130, 171, 133, -1, 148, 132, 171, + 130, 171, 133, -1, 149, 132, 171, 130, 171, 133, + -1, 113, 132, 171, 130, 171, 133, -1, 114, 132, + 171, 130, 171, 130, 171, 133, -1, 115, 132, 171, + 130, 171, 130, 171, 133, -1, 173, 130, 171, -1, + 171, -1, 35, -1, 36, -1, 176, -1, 176, 193, + -1, 176, 195, -1, 176, 63, 62, 179, -1, 176, + 31, -1, 178, -1, 50, -1, 58, -1, 178, 155, + 27, 164, -1, 178, 195, -1, 178, 63, 62, 179, + -1, 178, 155, 156, 174, 171, 162, -1, 178, 155, + 177, 174, 166, 162, -1, 178, 155, 45, 174, 166, + 162, -1, 178, 155, 47, 174, 166, 162, -1, 178, + 51, 181, -1, 178, 59, 129, 182, -1, -1, 30, + -1, 56, -1, 55, -1, 53, 129, 180, -1, 54, + 129, 18, -1, 52, 129, 30, -1, 72, 129, 30, + -1, 134, 183, 136, -1, 183, 130, 30, -1, 30, + -1, -1, 28, -1, 30, -1, 184, -1, -1, 166, + 185, -1, 187, 130, 186, -1, 186, -1, 187, -1, + 187, 130, 40, -1, 40, -1, -1, 157, 164, 184, + 132, 188, 133, 161, 158, -1, 32, -1, 139, -1, + 156, 189, 190, -1, 33, -1, 140, -1, 191, 201, + 192, -1, -1, 45, -1, 47, -1, 34, 194, 189, + -1, -1, 64, -1, 17, -1, 18, -1, 21, -1, + 25, -1, 26, -1, 22, -1, 23, -1, 24, -1, + 137, 173, 138, -1, 172, -1, 62, 196, 30, 130, + 30, -1, 144, -1, 184, -1, 198, -1, 197, -1, + 166, 199, -1, 201, 202, -1, 202, -1, 203, 205, + -1, 203, 207, -1, -1, 29, -1, 78, -1, 77, + -1, 73, 200, -1, 73, 3, -1, 74, 15, 199, + -1, 74, 4, 199, 130, 15, 199, 130, 15, 199, + -1, 75, 153, 199, 130, 15, 199, 134, 206, 136, + -1, 75, 153, 199, 130, 15, 199, 134, 136, -1, + 155, 76, 157, 164, 199, 132, 210, 133, 39, 15, + 199, 204, 15, 199, -1, 204, -1, 79, -1, 206, + 153, 197, 130, 15, 199, -1, 153, 197, 130, 15, + 199, -1, 155, 212, -1, 166, 134, 199, 130, 199, + 136, -1, 208, 130, 134, 199, 130, 199, 136, -1, + 200, -1, 209, 130, 200, -1, 209, -1, -1, 61, + 60, -1, 60, -1, 146, 166, 199, 130, 199, -1, + 147, 166, 199, 130, 199, -1, 148, 166, 199, 130, + 199, -1, 49, 200, -1, 149, 200, 130, 200, -1, + 150, 200, 39, 166, -1, 107, 200, 130, 200, 130, + 200, -1, 112, 200, 130, 166, -1, 113, 200, 130, + 200, -1, 114, 200, 130, 200, 130, 200, -1, 115, + 200, 130, 200, 130, 200, -1, 106, 208, -1, 211, + 157, 164, 199, 132, 210, 133, -1, 215, -1, 130, + 209, -1, -1, 38, -1, -1, 100, 166, 159, -1, + 100, 166, 130, 10, 199, 159, -1, 101, 166, 159, + -1, 101, 166, 130, 10, 199, 159, -1, 102, 200, + -1, 214, 103, 166, 199, -1, 214, 104, 200, 130, + 166, 199, -1, 105, 166, 199, 213, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 271, 271, 271, 272, 272, 276, 276, 276, 276, - 276, 276, 276, 276, 276, 277, 277, 277, 278, 278, - 278, 278, 278, 278, 279, 279, 279, 279, 280, 280, - 280, 280, 280, 280, 280, 281, 281, 281, 281, 281, - 281, 286, 286, 286, 286, 287, 287, 287, 287, 288, - 288, 289, 289, 292, 295, 300, 300, 300, 300, 300, - 300, 301, 302, 305, 305, 305, 305, 305, 306, 307, - 312, 317, 318, 321, 322, 330, 336, 337, 340, 341, - 350, 351, 364, 364, 365, 365, 366, 370, 370, 370, - 370, 370, 370, 370, 371, 371, 371, 371, 371, 373, - 377, 381, 386, 391, 397, 404, 411, 417, 421, 431, - 434, 442, 443, 448, 451, 461, 467, 472, 478, 484, - 490, 495, 501, 507, 513, 519, 525, 531, 537, 543, - 549, 557, 571, 583, 588, 593, 598, 603, 611, 616, - 621, 631, 636, 641, 641, 651, 656, 659, 664, 668, - 672, 675, 686, 691, 696, 703, 710, 717, 724, 729, - 734, 739, 741, 741, 744, 749, 756, 761, 768, 775, - 780, 781, 789, 789, 790, 790, 792, 799, 803, 807, - 810, 815, 818, 820, 840, 843, 847, 856, 857, 859, - 867, 868, 869, 873, 886, 887, 890, 890, 890, 890, - 890, 890, 890, 891, 892, 897, 898, 907, 907, 911, - 917, 928, 934, 937, 945, 949, 954, 957, 963, 968, - 973, 978, 986, 993, 999, 1019, 1024, 1030, 1035, 1043, - 1052, 1059, 1067, 1071, 1078, 1079, 1083, 1088, 1091, 1096, - 1101, 1106, 1111, 1119, 1133, 1138, 1143, 1148, 1153, 1158, - 1163, 1180, 1185, 1186, 1190, 1191, 1194, 1201, 1208, 1215, - 1222, 1227, 1234, 1241 + 0, 299, 299, 299, 300, 300, 304, 304, 304, 304, + 304, 304, 304, 305, 305, 305, 305, 306, 306, 306, + 307, 307, 307, 307, 307, 307, 308, 308, 308, 308, + 309, 309, 309, 309, 309, 309, 309, 310, 310, 310, + 310, 310, 310, 315, 315, 315, 315, 316, 316, 316, + 316, 317, 317, 318, 318, 321, 324, 329, 329, 329, + 329, 329, 329, 330, 331, 334, 334, 334, 334, 334, + 335, 336, 341, 346, 347, 350, 351, 359, 365, 366, + 369, 370, 379, 380, 393, 393, 394, 394, 395, 399, + 399, 399, 399, 399, 399, 399, 400, 400, 400, 400, + 400, 402, 406, 410, 413, 418, 424, 432, 440, 446, + 450, 461, 464, 472, 473, 478, 481, 491, 497, 502, + 508, 514, 520, 525, 531, 537, 543, 549, 555, 561, + 567, 573, 579, 587, 601, 613, 618, 624, 629, 634, + 642, 647, 652, 662, 667, 672, 672, 682, 687, 690, + 695, 699, 703, 705, 705, 708, 720, 725, 730, 737, + 744, 751, 758, 763, 768, 773, 775, 775, 778, 783, + 790, 795, 802, 809, 814, 815, 823, 823, 824, 824, + 826, 833, 837, 841, 844, 849, 852, 854, 874, 875, + 877, 886, 887, 889, 897, 898, 899, 903, 916, 917, + 920, 920, 920, 920, 920, 920, 920, 921, 922, 927, + 928, 937, 937, 941, 947, 958, 964, 967, 975, 979, + 984, 987, 993, 993, 995, 1000, 1005, 1010, 1018, 1025, + 1031, 1051, 1056, 1062, 1067, 1075, 1084, 1091, 1099, 1103, + 1110, 1111, 1115, 1120, 1123, 1129, 1134, 1139, 1144, 1152, + 1166, 1171, 1176, 1181, 1186, 1191, 1196, 1213, 1218, 1219, + 1223, 1224, 1227, 1234, 1241, 1248, 1255, 1260, 1267, 1274 }; #endif @@ -934,30 +972,31 @@ static const char *const yytname[] = "VOLATILE", "TO", "DOTDOTDOT", "CONST", "INTERNAL", "LINKONCE", "WEAK", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "APPENDING", "NOT", "EXTERNAL", "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE", "BIG", "ALIGN", - "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", "SIDEEFFECT", "CC_TOK", - "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK", "COLDCC_TOK", - "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT", "RET", "BR", - "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL", "UDIV", - "SDIV", "FDIV", "UREM", "SREM", "FREM", "AND", "OR", "XOR", "SETLE", - "SETGE", "SETLT", "SETGT", "SETEQ", "SETNE", "MALLOC", "ALLOCA", "FREE", - "LOAD", "STORE", "GETELEMENTPTR", "PHI_TOK", "SELECT", "SHL", "SHR", - "ASHR", "LSHR", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", - "SHUFFLEVECTOR", "CAST", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", - "FPTOUI", "FPTOSI", "UITOFP", "SITOFP", "PTRTOINT", "INTTOPTR", - "BITCAST", "'='", "','", "'\\\\'", "'('", "')'", "'['", "'x'", "']'", - "'<'", "'>'", "'{'", "'}'", "'*'", "'c'", "$accept", "IntVal", - "EInt64Val", "ArithmeticOps", "LogicalOps", "SetCondOps", "ShiftOps", - "CastOps", "SIntType", "UIntType", "IntType", "FPType", "OptAssign", - "OptLinkage", "OptCallingConv", "OptAlign", "OptCAlign", "SectionString", - "OptSection", "GlobalVarAttributes", "GlobalVarAttribute", "TypesV", - "UpRTypesV", "Types", "PrimType", "UpRTypes", "TypeListI", - "ArgTypeListI", "ConstVal", "ConstExpr", "ConstVector", "GlobalType", - "Module", "DefinitionList", "ConstPool", "AsmBlock", "BigOrLittle", - "TargetDefinition", "LibrariesDefinition", "LibList", "Name", "OptName", - "ArgVal", "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", - "FunctionHeader", "END", "Function", "FnDeclareLinkage", "FunctionProto", - "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef", - "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList", + "UNINITIALIZED", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", + "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK", + "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT", + "RET", "BR", "SWITCH", "INVOKE", "EXCEPT", "UNWIND", "UNREACHABLE", + "ADD", "SUB", "MUL", "DIV", "UDIV", "SDIV", "FDIV", "REM", "UREM", + "SREM", "FREM", "AND", "OR", "XOR", "SETLE", "SETGE", "SETLT", "SETGT", + "SETEQ", "SETNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE", + "GETELEMENTPTR", "PHI_TOK", "SELECT", "SHL", "SHR", "ASHR", "LSHR", + "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR", "CAST", + "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", "FPTOUI", "FPTOSI", + "UITOFP", "SITOFP", "PTRTOINT", "INTTOPTR", "BITCAST", "'='", "','", + "'\\\\'", "'('", "')'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'", + "'*'", "'c'", "$accept", "IntVal", "EInt64Val", "ArithmeticOps", + "LogicalOps", "SetCondOps", "ShiftOps", "CastOps", "SIntType", + "UIntType", "IntType", "FPType", "OptAssign", "OptLinkage", + "OptCallingConv", "OptAlign", "OptCAlign", "SectionString", "OptSection", + "GlobalVarAttributes", "GlobalVarAttribute", "TypesV", "UpRTypesV", + "Types", "PrimType", "UpRTypes", "TypeListI", "ArgTypeListI", "ConstVal", + "ConstExpr", "ConstVector", "GlobalType", "Module", "DefinitionList", + "External", "ConstPool", "AsmBlock", "BigOrLittle", "TargetDefinition", + "LibrariesDefinition", "LibList", "Name", "OptName", "ArgVal", + "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader", + "END", "Function", "FnDeclareLinkage", "FunctionProto", "OptSideEffect", + "ConstValueRef", "SymbolicValueRef", "ValueRef", "ResolvedVal", + "BasicBlockList", "BasicBlock", "InstructionList", "Unwind", "BBTerminatorInst", "JumpTable", "Inst", "PHIList", "ValueRefList", "ValueRefListE", "OptTailCall", "InstVal", "IndexList", "OptVolatile", "MemoryInst", 0 @@ -981,41 +1020,42 @@ static const unsigned short int yytoknum[] = 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, - 375, 376, 377, 378, 379, 61, 44, 92, 40, 41, - 91, 120, 93, 60, 62, 123, 125, 42, 99 + 375, 376, 377, 378, 379, 380, 381, 382, 383, 61, + 44, 92, 40, 41, 91, 120, 93, 60, 62, 123, + 125, 42, 99 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 139, 140, 140, 141, 141, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 143, 143, 143, 144, 144, - 144, 144, 144, 144, 145, 145, 145, 145, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 146, 147, 147, 147, 147, 148, 148, 148, 148, 149, - 149, 150, 150, 151, 151, 152, 152, 152, 152, 152, - 152, 152, 152, 153, 153, 153, 153, 153, 153, 153, - 153, 154, 154, 155, 155, 156, 157, 157, 158, 158, - 159, 159, 160, 160, 161, 161, 162, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 164, - 164, 164, 164, 164, 164, 164, 164, 164, 164, 165, - 165, 166, 166, 166, 166, 167, 167, 167, 167, 167, + 0, 143, 144, 144, 145, 145, 146, 146, 146, 146, + 146, 146, 146, 146, 146, 146, 146, 147, 147, 147, + 148, 148, 148, 148, 148, 148, 149, 149, 149, 149, + 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, + 150, 150, 150, 151, 151, 151, 151, 152, 152, 152, + 152, 153, 153, 154, 154, 155, 155, 156, 156, 156, + 156, 156, 156, 156, 156, 157, 157, 157, 157, 157, + 157, 157, 157, 158, 158, 159, 159, 160, 161, 161, + 162, 162, 163, 163, 164, 164, 165, 165, 166, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 169, 169, 170, 170, 171, 172, 172, 172, 172, - 172, 173, 173, 173, 173, 173, 173, 173, 173, 173, - 173, 174, 175, 175, 176, 176, 176, 176, 177, 178, - 178, 178, 179, 179, 180, 180, 181, 182, 182, 183, - 183, 183, 183, 184, 185, 185, 186, 187, 187, 188, - 189, 189, 189, 190, 191, 191, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 193, 193, 194, - 194, 195, 196, 196, 197, 198, 198, 198, 199, 199, - 199, 199, 199, 199, 199, 199, 199, 200, 200, 201, - 202, 202, 203, 203, 204, 204, 205, 205, 206, 206, - 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, - 206, 206, 207, 207, 208, 208, 209, 209, 209, 209, - 209, 209, 209, 209 + 168, 169, 169, 170, 170, 170, 170, 171, 171, 171, + 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, + 171, 171, 171, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 173, 173, 174, 174, 175, 176, 176, + 176, 176, 176, 177, 177, 178, 178, 178, 178, 178, + 178, 178, 178, 178, 178, 179, 180, 180, 181, 181, + 181, 181, 182, 183, 183, 183, 184, 184, 185, 185, + 186, 187, 187, 188, 188, 188, 188, 189, 190, 190, + 191, 192, 192, 193, 194, 194, 194, 195, 196, 196, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 198, 198, 199, 199, 200, 201, 201, 202, 203, + 203, 203, 204, 204, 205, 205, 205, 205, 205, 205, + 205, 205, 205, 206, 206, 207, 208, 208, 209, 209, + 210, 210, 211, 211, 212, 212, 212, 212, 212, 212, + 212, 212, 212, 212, 212, 212, 212, 212, 213, 213, + 214, 214, 215, 215, 215, 215, 215, 215, 215, 215 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1026,28 +1066,28 @@ static const unsigned char yyr2[] = 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, 2, 0, 1, 1, 1, 1, 1, - 1, 1, 0, 1, 1, 1, 1, 1, 1, 2, - 0, 0, 2, 0, 3, 2, 0, 1, 0, 3, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, + 1, 2, 0, 0, 2, 0, 3, 2, 0, 1, + 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 4, 5, 5, 3, 2, 2, 1, - 3, 1, 3, 1, 0, 4, 3, 3, 4, 4, - 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 6, 5, 8, 6, 6, 6, 6, 6, 8, - 8, 3, 1, 1, 1, 1, 2, 2, 4, 2, - 1, 4, 2, 4, 6, 6, 6, 6, 3, 4, - 0, 1, 1, 1, 3, 3, 3, 3, 3, 3, - 1, 0, 1, 1, 1, 0, 2, 3, 1, 1, - 3, 1, 0, 8, 1, 1, 3, 1, 1, 3, - 0, 1, 1, 3, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 3, 1, 5, 1, 1, 1, - 1, 2, 2, 1, 2, 2, 0, 1, 2, 2, - 3, 9, 9, 8, 14, 1, 1, 6, 5, 2, - 6, 7, 1, 3, 1, 0, 2, 1, 5, 5, - 5, 2, 4, 4, 6, 4, 4, 6, 6, 2, - 7, 1, 2, 0, 1, 0, 3, 6, 3, 6, - 2, 4, 6, 4 + 1, 1, 1, 1, 2, 4, 5, 5, 3, 2, + 2, 1, 3, 1, 3, 1, 0, 4, 3, 3, + 4, 4, 3, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 6, 5, 8, 6, 6, 6, 6, + 6, 8, 8, 3, 1, 1, 1, 1, 2, 2, + 4, 2, 1, 1, 1, 4, 2, 4, 6, 6, + 6, 6, 3, 4, 0, 1, 1, 1, 3, 3, + 3, 3, 3, 3, 1, 0, 1, 1, 1, 0, + 2, 3, 1, 1, 3, 1, 0, 8, 1, 1, + 3, 1, 1, 3, 0, 1, 1, 3, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, + 5, 1, 1, 1, 1, 2, 2, 1, 2, 2, + 0, 1, 1, 1, 2, 2, 3, 9, 9, 8, + 14, 1, 1, 6, 5, 2, 6, 7, 1, 3, + 1, 0, 2, 1, 5, 5, 5, 2, 4, 4, + 6, 4, 4, 6, 6, 2, 7, 1, 2, 0, + 1, 0, 3, 6, 3, 6, 2, 4, 6, 4 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -1055,485 +1095,483 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned short int yydefact[] = { - 160, 0, 62, 150, 1, 149, 190, 55, 56, 57, - 59, 60, 61, 58, 0, 70, 216, 146, 147, 172, - 173, 0, 0, 0, 62, 0, 152, 191, 192, 70, - 0, 0, 63, 64, 65, 66, 67, 68, 0, 0, - 217, 216, 213, 54, 0, 0, 0, 0, 158, 0, - 0, 0, 0, 0, 0, 0, 53, 193, 161, 148, - 69, 83, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 2, 3, 0, 0, 0, - 0, 207, 0, 0, 82, 101, 86, 208, 100, 184, - 185, 186, 187, 188, 189, 212, 0, 0, 0, 225, - 226, 255, 214, 215, 0, 0, 0, 0, 171, 159, - 153, 151, 143, 144, 0, 0, 0, 0, 102, 0, - 0, 85, 107, 109, 0, 0, 114, 108, 219, 0, - 218, 0, 0, 44, 48, 43, 47, 42, 46, 41, - 45, 49, 50, 0, 254, 0, 237, 0, 70, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 0, 0, 0, - 0, 0, 0, 24, 25, 26, 27, 0, 0, 0, - 0, 40, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 0, 0, 0, 0, 0, 70, - 229, 0, 251, 166, 163, 162, 164, 165, 167, 170, - 0, 78, 78, 78, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 0, 0, 0, 0, 78, - 0, 0, 0, 106, 182, 113, 111, 0, 196, 197, - 198, 201, 202, 203, 199, 200, 194, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 205, 210, - 209, 211, 0, 220, 0, 241, 236, 0, 73, 73, - 260, 0, 0, 249, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 168, 0, - 156, 157, 155, 128, 129, 4, 5, 126, 127, 130, - 121, 122, 125, 0, 0, 0, 0, 124, 123, 154, - 84, 84, 110, 181, 175, 178, 179, 0, 0, 103, - 195, 0, 0, 0, 0, 0, 0, 142, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 256, 0, - 258, 253, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 169, 0, 0, - 80, 78, 116, 0, 0, 120, 0, 117, 104, 105, - 174, 176, 0, 76, 112, 0, 253, 0, 0, 0, - 0, 0, 204, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 263, 0, 0, 0, 245, - 246, 0, 0, 0, 0, 0, 242, 243, 0, 261, - 0, 75, 81, 79, 115, 118, 119, 180, 177, 77, - 71, 0, 0, 0, 0, 0, 0, 141, 0, 0, - 0, 0, 0, 0, 0, 235, 73, 74, 73, 232, - 252, 0, 0, 0, 0, 0, 238, 239, 240, 235, - 0, 0, 183, 206, 132, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 234, 0, 0, 257, - 259, 0, 0, 0, 244, 247, 248, 0, 262, 72, - 0, 138, 0, 0, 134, 135, 136, 137, 131, 0, - 223, 0, 0, 0, 233, 230, 0, 250, 0, 0, - 0, 221, 0, 222, 0, 0, 231, 133, 139, 140, - 0, 0, 0, 0, 0, 0, 228, 0, 0, 227, - 0, 224 + 164, 0, 64, 152, 1, 151, 194, 57, 58, 59, + 61, 62, 63, 60, 0, 72, 220, 148, 149, 176, + 177, 0, 0, 0, 64, 0, 156, 195, 196, 72, + 0, 0, 65, 66, 67, 68, 69, 70, 0, 0, + 221, 220, 217, 56, 0, 0, 0, 0, 162, 0, + 0, 0, 0, 0, 153, 154, 0, 0, 55, 197, + 165, 150, 71, 85, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 2, 3, 0, + 0, 0, 0, 211, 0, 0, 84, 103, 88, 212, + 102, 188, 189, 190, 191, 192, 193, 216, 0, 0, + 0, 223, 222, 232, 261, 231, 218, 219, 0, 0, + 0, 0, 175, 163, 157, 155, 145, 146, 0, 0, + 0, 0, 104, 0, 0, 87, 109, 111, 0, 0, + 116, 110, 225, 0, 224, 0, 0, 46, 50, 45, + 49, 44, 48, 43, 47, 51, 52, 0, 260, 0, + 243, 0, 72, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 0, 0, 0, 0, 0, 0, 26, + 27, 28, 29, 0, 0, 0, 0, 42, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 0, 0, 0, 0, 0, 72, 235, 0, 257, 170, + 167, 166, 168, 169, 171, 174, 0, 80, 80, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 0, 0, 0, 0, 80, 80, 0, 0, 0, 108, + 186, 115, 113, 0, 200, 201, 202, 205, 206, 207, + 203, 204, 198, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 209, 214, 213, 215, 0, 226, + 0, 247, 242, 0, 75, 75, 266, 0, 0, 255, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 172, 0, 160, 161, 130, 131, + 4, 5, 128, 129, 132, 123, 124, 127, 0, 0, + 0, 0, 126, 125, 158, 159, 86, 86, 112, 185, + 179, 182, 183, 0, 0, 105, 199, 0, 0, 0, + 0, 0, 0, 144, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 262, 0, 264, 259, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 173, 0, 0, 82, 80, 118, 0, + 0, 122, 0, 119, 106, 107, 178, 180, 0, 78, + 114, 0, 259, 0, 0, 0, 0, 0, 208, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 269, 0, 0, 0, 251, 252, 0, 0, 0, + 0, 0, 248, 249, 0, 267, 0, 77, 83, 81, + 117, 120, 121, 184, 181, 79, 73, 0, 0, 0, + 0, 0, 0, 143, 0, 0, 0, 0, 0, 0, + 0, 241, 75, 76, 75, 238, 258, 0, 0, 0, + 0, 0, 244, 245, 246, 241, 0, 0, 187, 210, + 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 240, 0, 0, 263, 265, 0, 0, 0, + 250, 253, 254, 0, 268, 74, 0, 140, 0, 0, + 136, 137, 138, 139, 133, 0, 229, 0, 0, 0, + 239, 236, 0, 256, 0, 0, 0, 227, 0, 228, + 0, 0, 237, 135, 141, 142, 0, 0, 0, 0, + 0, 0, 234, 0, 0, 233, 0, 230 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short int yydefgoto[] = { - -1, 81, 297, 253, 254, 255, 256, 257, 225, 226, - 143, 227, 24, 15, 38, 452, 338, 360, 420, 290, - 361, 82, 83, 228, 85, 86, 124, 237, 327, 258, - 328, 114, 1, 2, 3, 59, 206, 48, 109, 210, - 87, 371, 315, 316, 317, 39, 91, 16, 94, 17, - 29, 18, 321, 259, 88, 261, 439, 41, 42, 43, - 102, 492, 103, 273, 466, 467, 199, 200, 395, 201, - 202 + -1, 83, 302, 259, 260, 261, 262, 263, 230, 231, + 147, 232, 24, 15, 38, 458, 344, 366, 426, 296, + 367, 84, 85, 233, 87, 88, 128, 243, 333, 264, + 334, 118, 1, 2, 57, 3, 61, 212, 48, 113, + 216, 89, 377, 321, 322, 323, 39, 93, 16, 96, + 17, 29, 18, 327, 265, 90, 267, 445, 41, 42, + 43, 105, 106, 498, 107, 279, 472, 473, 205, 206, + 401, 207, 208 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -472 +#define YYPACT_NINF -477 static const short int yypact[] = { - -472, 38, 138, 1015, -472, -472, 59, -472, -472, -472, - -472, -472, -472, -472, -2, 80, 35, -472, -472, -472, - -472, -29, -50, 18, 174, -37, -472, -472, -472, 80, - 73, 93, -472, -472, -472, -472, -472, -472, 744, -22, - -472, -21, -472, 9, 3, 12, 54, 64, -472, 37, - 73, 744, 84, 84, 84, 84, -472, -472, -472, -472, - -472, 62, -472, -472, -472, -472, -472, -472, -472, -472, - -472, -472, -472, -472, -472, -472, -472, 173, 176, 177, - 431, -472, 86, 69, -472, -472, -106, -472, -472, -472, - -472, -472, -472, -472, -472, -472, 772, 28, 343, -472, - -472, 1211, -472, -472, 162, 66, 180, 169, 172, -472, - -472, -472, -472, -472, 802, 802, 802, 831, -472, 72, - 74, -472, -472, -106, -46, 76, 504, -472, 62, 1011, - -472, 1011, 1011, -472, -472, -472, -472, -472, -472, -472, - -472, -472, -472, 1011, -472, 802, -472, 148, 80, -472, - -472, -472, -472, -472, -472, -472, -472, -472, -472, -472, - -472, -472, -472, -472, -472, -472, -472, 802, 802, 802, - 802, 802, 802, -472, -472, -472, -472, 802, 802, 802, - 802, -472, -472, -472, -472, -472, -472, -472, -472, -472, - -472, -472, -472, -472, 802, 802, 802, 802, 802, 80, - -472, 24, -472, -472, -472, -472, -472, -472, -472, -472, - -70, 83, 83, 83, 101, 118, 192, 137, 193, 147, - 194, 153, 195, 204, 207, 170, 197, 209, 889, 83, - 802, 802, 802, -472, 565, -472, 105, 103, -472, -472, - -472, -472, -472, -472, -472, -472, 171, 107, 108, 109, - 110, 113, 831, 114, 115, 116, 117, 122, -472, -472, - -472, -472, 127, -472, 128, -472, -472, 744, 129, 130, - -472, 1011, 132, 131, 133, 144, 145, 152, 154, 1011, - 1011, 1011, 155, 219, 744, 802, 802, 243, -472, -16, - -472, -472, -472, -472, -472, -472, -472, -472, -472, -472, - -472, -472, -472, 610, 831, 476, 244, -472, -472, -472, - -102, -32, -106, -472, 86, -472, 156, 150, 638, -472, - -472, 253, 831, 831, 831, 831, 831, -472, -90, 831, - 831, 831, 831, 831, 269, 272, 1011, 4, -472, 17, - -472, 163, 1011, 161, 802, 802, 802, 802, 802, 166, - 167, 178, 802, 802, 1011, 1011, 179, -472, 265, 278, - -472, 83, -472, -39, -71, -472, -35, -472, -472, -472, - -472, -472, 698, 260, -472, 185, 163, 186, 203, 205, - 206, 831, -472, 210, 211, 213, 214, 259, 1011, 1011, - 175, 1011, 281, 1011, 802, -472, 215, 1011, 216, -472, - -472, 217, 218, 1011, 1011, 1011, -472, -472, 202, -472, - 802, -472, -472, -472, -472, -472, -472, -472, -472, -472, - 266, 303, 228, 831, 831, 831, 831, -472, 831, 831, - 831, 831, 802, 220, 229, 802, 232, -472, 232, -472, - 234, 1011, 236, 802, 802, 802, -472, -472, -472, 802, - 1011, 317, -472, -472, -472, 240, 238, 245, 247, 246, - 248, 249, 250, 251, 359, 42, 234, 252, 325, -472, - -472, 802, 255, 1011, -472, -472, -472, 254, -472, -472, - 831, -472, 831, 831, -472, -472, -472, -472, -472, 1011, - -472, 1124, 61, 349, -472, -472, 258, -472, 264, 270, - 271, -472, 275, -472, 1124, 383, -472, -472, -472, -472, - 387, 277, 1011, 1011, 389, 332, -472, 1011, 397, -472, - 1011, -472 + -477, 20, 54, 872, -477, -477, 86, -477, -477, -477, + -477, -477, -477, -477, 24, 110, 65, -477, -477, -477, + -477, 37, -105, 51, 3, -8, -477, -477, -477, 110, + 111, 126, -477, -477, -477, -477, -477, -477, 703, -23, + -477, -18, -477, -1, 23, 43, 64, 74, -477, 70, + 111, 703, 71, 71, -477, -477, 71, 71, -477, -477, + -477, -477, -477, 73, -477, -477, -477, -477, -477, -477, + -477, -477, -477, -477, -477, -477, -477, -477, -477, 188, + 189, 190, 457, -477, 104, 77, -477, -477, -29, -477, + -477, -477, -477, -477, -477, -477, -477, -477, 736, 80, + 118, -477, -477, -477, 1196, -477, -477, -477, 181, 87, + 192, 182, 183, -477, -477, -477, -477, -477, 764, 764, + 802, 764, -477, 81, 82, -477, -477, -29, -114, 83, + 513, -477, 73, 988, -477, 988, 988, -477, -477, -477, + -477, -477, -477, -477, -477, -477, -477, 988, -477, 764, + -477, 158, 110, -477, -477, -477, -477, -477, -477, -477, + -477, -477, -477, -477, -477, -477, -477, -477, -477, -477, + -477, -477, -477, 764, 764, 764, 764, 764, 764, -477, + -477, -477, -477, 764, 764, 764, 764, -477, -477, -477, + -477, -477, -477, -477, -477, -477, -477, -477, -477, -477, + 764, 764, 764, 764, 764, 110, -477, 57, -477, -477, + -477, -477, -477, -477, -477, -477, -26, 89, 89, 160, + 170, 203, 172, 204, 174, 205, 178, 207, 206, 208, + 180, 210, 209, 862, 89, 89, 764, 764, 764, -477, + 552, -477, 96, 98, -477, -477, -477, -477, -477, -477, + -477, -477, 173, 102, 106, 108, 112, 114, 802, 115, + 116, 117, 119, 127, -477, -477, -477, -477, 113, -477, + 125, -477, -477, 703, 130, 131, -477, 988, 128, 133, + 134, 135, 138, 140, 142, 988, 988, 988, 143, 197, + 703, 764, 764, 212, -477, -2, -477, -477, -477, -477, + -477, -477, -477, -477, -477, -477, -477, -477, 598, 802, + 485, 244, -477, -477, -477, -477, 15, -82, -29, -477, + 104, -477, 147, 145, 626, -477, -477, 250, 802, 802, + 802, 802, 802, -477, -113, 802, 802, 802, 802, 802, + 273, 274, 988, 0, -477, 18, -477, 163, 988, 156, + 764, 764, 764, 764, 764, 165, 167, 168, 764, 764, + 988, 988, 169, -477, 271, 284, -477, 89, -477, -22, + -51, -477, -48, -477, -477, -477, -477, -477, 665, 266, + -477, 179, 163, 187, 211, 213, 215, 802, -477, 216, + 217, 218, 219, 272, 988, 988, 186, 988, 292, 988, + 764, -477, 220, 988, 222, -477, -477, 224, 225, 988, + 988, 988, -477, -477, 226, -477, 764, -477, -477, -477, + -477, -477, -477, -477, -477, -477, 265, 305, 223, 802, + 802, 802, 802, -477, 802, 802, 802, 802, 764, 227, + 202, 764, 229, -477, 229, -477, 230, 988, 231, 764, + 764, 764, -477, -477, -477, 764, 988, 319, -477, -477, + -477, 233, 232, 234, 236, 235, 237, 238, 240, 242, + 323, 31, 230, 246, 282, -477, -477, 764, 241, 988, + -477, -477, -477, 247, -477, -477, 802, -477, 802, 802, + -477, -477, -477, -477, -477, 988, -477, 1105, 58, 303, + -477, -477, 245, -477, 251, 252, 253, -477, 239, -477, + 1105, 368, -477, -477, -477, -477, 372, 258, 988, 988, + 374, 123, -477, 988, 379, -477, 988, -477 }; /* YYPGOTO[NTERM-NUM]. */ static const short int yypgoto[] = { - -472, -472, -472, 312, 314, 315, 321, 326, -97, -96, - -446, -472, 385, 405, -139, -472, -263, 57, -472, -195, - -472, -44, -472, -38, -472, -69, 305, -472, -5, 221, - -209, 55, -472, -472, -472, 382, -472, -472, -472, -472, - 2, -472, 81, -472, -472, 419, -472, -472, -472, -472, - -472, 449, -472, -471, -103, -128, -80, -472, 413, -472, - -472, -472, -472, -472, 63, 6, -472, -472, 82, -472, - -472 + -477, -477, -477, 293, 298, 300, 301, 302, -99, -97, + -440, -477, 353, 383, -134, -477, -271, 29, -477, -212, + -477, -49, -477, -38, -477, -68, 279, -477, -5, 177, + -190, 97, -477, -477, -477, -477, 364, -477, -477, -477, + -477, 9, -477, 40, -477, -477, 390, -477, -477, -477, + -477, -477, 418, -477, -476, -128, -103, 101, -477, 381, + -477, -93, -477, -477, -477, -477, 33, -21, -477, -477, + 53, -477, -477 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -146 +#define YYTABLE_NINF -148 static const short int yytable[] = { - 84, 141, 142, 262, 263, 25, 340, 111, 40, 267, - 89, 123, 92, 84, 391, 264, 130, 291, 292, 491, - 502, 358, -84, 44, 45, 46, 260, 393, 260, 260, - 368, 127, 131, 511, 309, 127, 381, 19, 4, 20, - 260, 359, 47, 132, 382, 25, 504, 133, 134, 135, - 136, 137, 138, 139, 140, 381, 287, 123, 129, 30, - 284, 392, 288, 415, 40, 265, 133, 134, 135, 136, - 137, 138, 139, 140, 392, 49, 211, 212, 213, 50, - 232, 96, 97, 98, 125, 99, 100, 381, 56, 270, - 233, 381, 274, 414, 363, 364, 366, 275, 276, 277, - 278, 416, 369, 58, 27, 127, 28, 129, 115, 116, - 117, 60, 229, 90, 19, 93, 20, 282, 283, 112, - 113, 204, 205, 285, 286, 308, 293, 294, 104, 268, - 269, 129, 271, 272, 129, -44, -44, 105, -145, 129, - 129, 129, 129, 341, 31, 32, 33, 34, 35, 36, - 37, 349, 350, 351, -43, -43, 279, 280, 281, 129, - 129, 310, 311, 312, -42, -42, 413, 108, 260, 5, - -41, -41, 6, 469, 490, 470, 260, 260, 260, 106, - 7, 8, 9, 10, 11, 12, 13, 295, 296, 107, - -85, 118, 203, 503, 119, 120, 314, 126, 207, 208, - 14, 51, 209, 230, 234, 231, 356, 266, 390, 289, - -48, -47, -46, -45, 396, 298, 7, 8, 9, 52, - 11, 53, 13, 336, 54, -51, 408, 409, -52, 84, - 299, 318, 319, 260, 320, 322, 323, 324, 325, 260, - 354, 326, 329, 330, 331, 332, 84, 355, 129, 312, - 333, 260, 260, 334, 335, 337, 339, 343, 353, 344, - 433, 434, 342, 436, 398, 438, 400, 401, 402, 442, - 345, 346, 406, 357, 367, 446, 447, 448, 347, 373, - 348, 352, 372, 375, 388, 260, 260, 389, 260, 394, - 260, 397, 403, 404, 260, 411, 412, 358, 432, 437, - 260, 260, 260, 435, 405, 410, 129, 399, 129, 129, - 129, 421, 423, 472, 129, 407, 370, 376, 377, 378, - 379, 380, 478, 451, 383, 384, 385, 386, 387, 424, - 449, 425, 426, 453, 314, 479, 428, 429, 260, 430, - 431, 441, 443, 444, 445, 496, 464, 260, 133, 134, - 135, 136, 137, 138, 139, 140, 129, 454, 468, 465, - 471, 501, 473, 474, 475, 476, 480, 481, 141, 142, - 260, 482, 450, 483, 489, 484, 427, 485, 486, 487, - 488, 493, 392, 497, 515, 516, 260, 495, 505, 519, - 506, 494, 521, 507, 463, 141, 142, 129, 512, 508, - 509, 510, 513, 514, 517, 129, 129, 129, 518, 260, - 260, 129, 520, 194, 260, 195, 196, 260, 455, 456, - 457, 458, 197, 459, 460, 461, 462, 198, 101, 55, - 419, 236, 110, 129, 121, 62, 63, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 57, 307, - 75, 76, 26, 418, 95, 477, 0, 440, 422, 19, - 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 498, 0, 499, 500, 121, - 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, - 224, 73, 74, 0, 0, 75, 76, 0, 0, 0, - 0, 0, 0, 0, 19, 0, 20, 121, 62, 63, + 86, 145, 115, 146, 346, 266, 297, 266, 266, 91, + 397, 40, 25, 86, 127, 94, 238, 387, 273, 266, + 4, 508, 314, 315, 49, 388, 239, 19, 399, 20, + 51, 497, 268, 269, 517, 364, 137, 138, 139, 140, + 141, 142, 143, 144, 270, 7, 8, 9, 52, 11, + 53, 13, 25, 54, -147, 365, 375, 398, 510, 131, + 133, 55, 127, 137, 138, 139, 140, 141, 142, 143, + 144, 290, 98, 99, 100, 398, 101, 102, 103, 387, + 217, 218, 387, 235, 135, 5, 30, 421, 6, 44, + 45, 46, 422, 129, 40, 136, 7, 8, 9, 10, + 11, 12, 13, -86, 293, 313, 116, 117, 387, 47, + 294, 133, 131, 50, 420, 234, 92, 14, 369, 370, + 372, 58, 95, 137, 138, 139, 140, 141, 142, 143, + 144, 27, 19, 28, 20, 274, 275, 133, 277, 278, + 133, 60, 210, 211, 62, 133, 133, 133, 133, 266, + 119, 374, 108, 120, 121, 419, 131, 266, 266, 266, + 291, 292, 285, 286, 287, 133, 133, 496, 316, 317, + 318, 475, 109, 476, 347, 31, 32, 33, 34, 35, + 36, 37, 355, 356, 357, 298, 299, -46, -46, -45, + -45, -44, -44, 110, 509, -43, -43, 300, 301, 134, + 101, 102, 320, 111, 112, -87, 122, 123, 124, 130, + 213, 209, 214, 215, 266, 240, 236, 237, 272, 295, + 266, -50, -49, -48, 342, -47, 324, -53, 303, -54, + 304, 325, 266, 266, 328, 86, 359, 326, 329, 396, + 330, 360, 363, 340, 331, 402, 332, 335, 336, 337, + 271, 338, 86, 361, 133, 341, 318, 414, 415, 339, + 343, 345, 348, 349, 350, 351, 266, 266, 352, 266, + 353, 266, 354, 358, 373, 266, 276, 378, 379, 280, + 381, 266, 266, 266, 281, 282, 283, 284, 394, 395, + 403, 439, 440, 400, 442, 409, 444, 410, 411, 416, + 448, 417, 418, 364, 288, 289, 452, 453, 454, 427, + 443, 438, 133, 405, 133, 133, 133, 429, 441, 266, + 133, 413, 457, 382, 383, 384, 385, 386, 266, 376, + 389, 390, 391, 392, 393, 459, 471, 485, 495, 398, + 320, 430, 511, 431, 478, 432, 434, 435, 436, 437, + 447, 266, 449, 484, 450, 451, 460, 470, 455, 474, + 477, 479, 133, 486, 488, 487, 489, 266, 490, 516, + 491, 492, 145, 493, 146, 494, 502, 501, 456, 499, + 503, 512, 433, 518, 513, 514, 515, 519, 520, 523, + 266, 266, 507, 362, 526, 266, 104, 200, 266, 145, + 469, 146, 201, 133, 202, 203, 204, 56, 425, 242, + 312, 133, 133, 133, 114, 521, 522, 133, 424, 59, + 525, 26, 97, 527, 461, 462, 463, 464, 524, 465, + 466, 467, 468, 446, 483, 428, 0, 0, 0, 133, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 404, 0, 406, 407, 408, 0, 0, 0, 412, + 125, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 0, 0, 77, 78, 0, 0, + 0, 504, 0, 505, 506, 19, 0, 20, 125, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, + 75, 76, 0, 0, 77, 78, 0, 0, 0, 0, + 0, 0, 0, 19, 0, 20, 125, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 0, 0, 77, 78, 0, 0, 0, 0, 0, 0, + 0, 19, 0, 20, 0, 0, 0, 0, 0, 0, + 480, 481, 482, 241, 0, 125, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 0, + 0, 77, 78, 0, 0, 0, 0, 0, 500, 0, + 19, 0, 20, 0, 0, 0, 0, 0, 79, 0, + 0, 80, 319, 0, 81, 0, 82, 126, 0, 0, + 0, 125, 219, 220, 221, 222, 223, 224, 225, 226, + 227, 228, 229, 75, 76, 0, 79, 77, 78, 80, + 0, 0, 81, 0, 82, 371, 19, 0, 20, 125, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 0, 0, 75, 76, 0, 0, 0, 0, 0, - 0, 0, 19, 0, 20, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 235, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 77, 0, - 0, 78, 0, 0, 79, 0, 80, 122, 121, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 0, 0, 75, 76, 0, 0, 0, 0, - 0, 0, 0, 19, 0, 20, 0, 0, 0, 0, - 0, 0, 0, 77, 0, 313, 78, 0, 0, 79, - 0, 80, 365, 121, 214, 215, 216, 217, 218, 219, - 220, 221, 222, 223, 224, 73, 74, 0, 0, 75, - 76, 77, 0, 0, 78, 0, 0, 79, 19, 80, - 20, 121, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 0, 0, 75, 76, 0, - 0, 0, 0, 0, 0, 0, 19, 0, 20, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 374, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 77, 0, 0, 78, 0, 0, 79, 0, - 80, 121, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 0, 0, 75, 76, 0, - 0, 0, 0, 0, 0, 0, 19, 0, 20, 0, - 0, 0, 0, 0, 0, 0, 0, 77, 417, 0, - 78, 0, 362, 79, 0, 80, 0, 61, 62, 63, + 74, 75, 76, 0, 79, 77, 78, 80, 0, 0, + 81, 0, 82, 0, 19, 0, 20, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 380, 0, 125, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 0, 79, 77, 78, 80, 0, 0, 81, + 0, 82, 0, 19, 0, 20, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 423, 63, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 0, 0, 77, 78, 0, 0, 0, 0, 0, 79, + 0, 19, 80, 20, 368, 81, 0, 82, 0, 132, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 0, 0, 75, 76, 77, 0, 0, 78, 0, - 0, 79, 19, 80, 20, 128, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 0, - 0, 75, 76, 0, 0, 0, 0, 0, 0, 0, - 19, 0, 20, 0, 0, 121, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 0, - 0, 75, 76, 0, 0, 77, 0, 0, 78, 0, - 19, 79, 20, 80, 121, 214, 215, 216, 217, 218, - 219, 220, 221, 222, 223, 224, 73, 74, 0, 0, - 75, 76, 0, 0, 0, 0, 0, 0, 0, 19, - 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 77, 0, 0, 78, 0, 0, 79, 0, 80, + 74, 75, 76, 0, 0, 77, 78, 79, 0, 0, + 80, 0, 0, 81, 19, 82, 20, 125, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 0, 0, 77, 78, 0, 0, 0, 0, 0, + 0, 0, 19, 0, 20, 0, 79, 0, 0, 80, + 0, 0, 81, 0, 82, 125, 219, 220, 221, 222, + 223, 224, 225, 226, 227, 228, 229, 75, 76, 0, + 0, 77, 78, 0, 0, 0, 0, 0, 0, 0, + 19, 0, 20, 0, 79, 0, 0, 80, 0, 0, + 81, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, - 0, 0, 78, 0, 0, 79, 0, 80, 75, 76, - 0, 300, 301, 302, 0, 0, 0, 19, 0, 20, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, - 0, 0, 78, 0, 0, 79, 0, 80, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 77, 0, - 0, 78, 0, 0, 79, 0, 80, 149, 150, 151, - 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, - 162, 163, 164, 165, 166, 0, 0, 0, 0, 0, - 247, 0, 248, 173, 174, 175, 176, 0, 249, 250, - 251, 181, 182, 183, 184, 185, 186, 187, 188, 189, - 190, 191, 192, 193, 0, 0, 0, 0, 0, 303, - 0, 0, 304, 0, 305, 0, 0, 306, 238, 239, - 75, 76, 240, 241, 242, 243, 244, 245, 0, 19, - 0, 20, -54, 19, 0, 20, 0, 0, 0, 6, - -54, -54, 0, 0, 0, 0, 0, -54, -54, -54, - -54, -54, -54, -54, 0, -54, 21, 0, 0, 0, - 0, 0, 246, 22, 0, 0, 0, 23, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 149, - 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 0, 0, 0, - 0, 0, 247, 0, 248, 173, 174, 175, 176, 0, - 249, 250, 251, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 191, 192, 193, 0, 0, 0, 0, - 0, 238, 239, 0, 252, 240, 241, 242, 243, 244, - 245, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 79, 0, 0, + 80, 0, 0, 81, 0, 82, 0, 0, 0, 0, + 0, 77, 78, 0, 305, 306, 307, 0, 0, 0, + 19, 0, 20, 0, 0, 79, 0, 0, 80, -56, + 19, 81, 20, 82, 0, 0, 6, -56, -56, 0, + 0, 0, 0, 0, -56, -56, -56, -56, -56, -56, + -56, 0, -56, 21, 0, 0, 0, 0, 0, 0, + -56, 22, 0, 79, 0, 23, 80, 0, 0, 81, + 0, 82, 153, 154, 155, 156, 157, 158, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 172, 0, 0, 0, 0, 0, 253, 0, 254, + 179, 180, 181, 182, 0, 255, 256, 257, 187, 188, + 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, + 199, 0, 0, 0, 0, 0, 308, 0, 0, 309, + 0, 310, 0, 0, 311, 244, 245, 77, 78, 246, + 247, 248, 249, 250, 251, 0, 19, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 246, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 149, 150, 151, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 0, 0, 0, 0, 0, 247, 0, 248, 173, 174, - 175, 176, 0, 249, 250, 251, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 192, 193, 144, + 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 153, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 0, 0, + 0, 0, 0, 253, 0, 254, 179, 180, 181, 182, + 0, 255, 256, 257, 187, 188, 189, 190, 191, 192, + 193, 194, 195, 196, 197, 198, 199, 0, 0, 0, + 0, 0, 244, 245, 0, 258, 246, 247, 248, 249, + 250, 251, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252, 0, 0, - 145, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 146, 147, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 148, 0, 0, 149, - 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 0, 0, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 191, 192, 193 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 153, 154, 155, 156, 157, + 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 0, 0, 0, 0, 0, + 253, 0, 254, 179, 180, 181, 182, 0, 255, 256, + 257, 187, 188, 189, 190, 191, 192, 193, 194, 195, + 196, 197, 198, 199, 148, 0, 0, 0, 0, 0, + 0, 0, 258, 0, 0, 149, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 150, 151, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 152, 0, 0, 0, 153, 154, 155, 156, + 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, + 167, 168, 169, 170, 171, 172, 173, 174, 175, 0, + 0, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, + 195, 196, 197, 198, 199 }; static const short int yycheck[] = { - 38, 98, 98, 131, 132, 3, 269, 51, 29, 148, - 32, 80, 33, 51, 10, 143, 96, 212, 213, 465, - 491, 37, 128, 52, 53, 54, 129, 10, 131, 132, - 132, 137, 4, 504, 229, 137, 126, 28, 0, 30, - 143, 57, 71, 15, 134, 43, 492, 5, 6, 7, - 8, 9, 10, 11, 12, 126, 126, 126, 96, 61, - 199, 57, 132, 134, 29, 145, 5, 6, 7, 8, - 9, 10, 11, 12, 57, 125, 114, 115, 116, 61, - 126, 72, 73, 74, 82, 76, 77, 126, 125, 169, - 136, 126, 172, 132, 303, 304, 305, 177, 178, 179, - 180, 136, 134, 30, 45, 137, 47, 145, 53, 54, - 55, 18, 117, 135, 28, 136, 30, 197, 198, 35, - 36, 55, 56, 99, 100, 228, 25, 26, 125, 167, - 168, 169, 170, 171, 172, 17, 18, 125, 0, 177, - 178, 179, 180, 271, 64, 65, 66, 67, 68, 69, - 70, 279, 280, 281, 17, 18, 194, 195, 196, 197, - 198, 230, 231, 232, 17, 18, 361, 130, 271, 31, - 17, 18, 34, 436, 132, 438, 279, 280, 281, 125, - 42, 43, 44, 45, 46, 47, 48, 17, 18, 125, - 128, 18, 30, 132, 18, 18, 234, 128, 18, 30, - 62, 27, 30, 131, 128, 131, 286, 59, 336, 126, - 18, 18, 18, 18, 342, 18, 42, 43, 44, 45, - 46, 47, 48, 267, 50, 21, 354, 355, 21, 267, - 21, 126, 129, 336, 63, 128, 128, 128, 128, 342, - 284, 128, 128, 128, 128, 128, 284, 285, 286, 318, - 128, 354, 355, 126, 126, 126, 126, 126, 39, 126, - 388, 389, 130, 391, 344, 393, 346, 347, 348, 397, - 126, 126, 352, 30, 30, 403, 404, 405, 126, 129, - 126, 126, 126, 30, 15, 388, 389, 15, 391, 126, - 393, 130, 126, 126, 397, 30, 18, 37, 39, 18, - 403, 404, 405, 128, 126, 126, 344, 345, 346, 347, - 348, 126, 126, 441, 352, 353, 314, 322, 323, 324, - 325, 326, 450, 57, 329, 330, 331, 332, 333, 126, - 128, 126, 126, 30, 372, 18, 126, 126, 441, 126, - 126, 126, 126, 126, 126, 473, 126, 450, 5, 6, - 7, 8, 9, 10, 11, 12, 394, 129, 126, 130, - 126, 489, 126, 443, 444, 445, 126, 129, 465, 465, - 473, 126, 410, 126, 15, 129, 381, 129, 129, 129, - 129, 129, 57, 129, 512, 513, 489, 132, 39, 517, - 132, 471, 520, 129, 432, 492, 492, 435, 15, 129, - 129, 126, 15, 126, 15, 443, 444, 445, 76, 512, - 513, 449, 15, 101, 517, 101, 101, 520, 423, 424, - 425, 426, 101, 428, 429, 430, 431, 101, 43, 24, - 373, 126, 50, 471, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 29, 228, - 19, 20, 3, 372, 41, 449, -1, 394, 376, 28, - -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 480, -1, 482, 483, 3, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, -1, -1, 19, 20, -1, -1, -1, - -1, -1, -1, -1, 28, -1, 30, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, - -1, -1, 28, -1, 30, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 127, -1, - -1, 130, -1, -1, 133, -1, 135, 136, 3, 4, + 38, 100, 51, 100, 275, 133, 218, 135, 136, 32, + 10, 29, 3, 51, 82, 33, 130, 130, 152, 147, + 0, 497, 234, 235, 129, 138, 140, 28, 10, 30, + 27, 471, 135, 136, 510, 37, 5, 6, 7, 8, + 9, 10, 11, 12, 147, 42, 43, 44, 45, 46, + 47, 48, 43, 50, 0, 57, 138, 57, 498, 141, + 98, 58, 130, 5, 6, 7, 8, 9, 10, 11, + 12, 205, 73, 74, 75, 57, 77, 78, 79, 130, + 118, 119, 130, 121, 4, 31, 62, 138, 34, 52, + 53, 54, 140, 84, 29, 15, 42, 43, 44, 45, + 46, 47, 48, 132, 130, 233, 35, 36, 130, 72, + 136, 149, 141, 62, 136, 120, 139, 63, 308, 309, + 310, 129, 140, 5, 6, 7, 8, 9, 10, 11, + 12, 45, 28, 47, 30, 173, 174, 175, 176, 177, + 178, 30, 55, 56, 18, 183, 184, 185, 186, 277, + 53, 136, 129, 56, 57, 367, 141, 285, 286, 287, + 103, 104, 200, 201, 202, 203, 204, 136, 236, 237, + 238, 442, 129, 444, 277, 65, 66, 67, 68, 69, + 70, 71, 285, 286, 287, 25, 26, 17, 18, 17, + 18, 17, 18, 129, 136, 17, 18, 17, 18, 98, + 77, 78, 240, 129, 134, 132, 18, 18, 18, 132, + 18, 30, 30, 30, 342, 132, 135, 135, 60, 130, + 348, 18, 18, 18, 273, 18, 130, 21, 18, 21, + 21, 133, 360, 361, 132, 273, 39, 64, 132, 342, + 132, 290, 30, 130, 132, 348, 132, 132, 132, 132, + 149, 132, 290, 291, 292, 130, 324, 360, 361, 132, + 130, 130, 134, 130, 130, 130, 394, 395, 130, 397, + 130, 399, 130, 130, 30, 403, 175, 130, 133, 178, + 30, 409, 410, 411, 183, 184, 185, 186, 15, 15, + 134, 394, 395, 130, 397, 130, 399, 130, 130, 130, + 403, 30, 18, 37, 203, 204, 409, 410, 411, 130, + 18, 39, 350, 351, 352, 353, 354, 130, 132, 447, + 358, 359, 57, 328, 329, 330, 331, 332, 456, 320, + 335, 336, 337, 338, 339, 30, 134, 18, 15, 57, + 378, 130, 39, 130, 447, 130, 130, 130, 130, 130, + 130, 479, 130, 456, 130, 130, 133, 130, 132, 130, + 130, 130, 400, 130, 130, 133, 130, 495, 133, 130, + 133, 133, 471, 133, 471, 133, 479, 136, 416, 133, + 133, 136, 387, 15, 133, 133, 133, 15, 130, 15, + 518, 519, 495, 292, 15, 523, 43, 104, 526, 498, + 438, 498, 104, 441, 104, 104, 104, 24, 379, 130, + 233, 449, 450, 451, 50, 518, 519, 455, 378, 29, + 523, 3, 41, 526, 429, 430, 431, 432, 521, 434, + 435, 436, 437, 400, 455, 382, -1, -1, -1, 477, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 350, -1, 352, 353, 354, -1, -1, -1, 358, + 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, + -1, 486, -1, 488, 489, 28, -1, 30, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, -1, -1, - -1, -1, -1, 28, -1, 30, -1, -1, -1, -1, - -1, -1, -1, 127, -1, 40, 130, -1, -1, 133, - -1, 135, 136, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, -1, -1, 19, - 20, 127, -1, -1, 130, -1, -1, 133, 28, 135, - 30, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, - -1, -1, -1, -1, -1, -1, 28, -1, 30, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 40, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 127, -1, -1, 130, -1, -1, 133, -1, - 135, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, - -1, -1, -1, -1, -1, -1, 28, -1, 30, -1, - -1, -1, -1, -1, -1, -1, -1, 127, 40, -1, - 130, -1, 132, 133, -1, 135, -1, 3, 4, 5, + -1, -1, -1, 28, -1, 30, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, 19, 20, -1, -1, -1, -1, -1, -1, + -1, 28, -1, 30, -1, -1, -1, -1, -1, -1, + 449, 450, 451, 40, -1, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, 19, 20, -1, -1, -1, -1, -1, 477, -1, + 28, -1, 30, -1, -1, -1, -1, -1, 131, -1, + -1, 134, 40, -1, 137, -1, 139, 140, -1, -1, + -1, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, -1, 131, 19, 20, 134, + -1, -1, 137, -1, 139, 140, 28, -1, 30, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, -1, 131, 19, 20, 134, -1, -1, + 137, -1, 139, -1, 28, -1, 30, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 40, -1, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, -1, 131, 19, 20, 134, -1, -1, 137, + -1, 139, -1, 28, -1, 30, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 40, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, 19, 20, -1, -1, -1, -1, -1, 131, + -1, 28, 134, 30, 136, 137, -1, 139, -1, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, -1, -1, 19, 20, 131, -1, -1, + 134, -1, -1, 137, 28, 139, 30, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, 127, -1, -1, 130, -1, - -1, 133, 28, 135, 30, 3, 4, 5, 6, 7, + 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, + -1, -1, 28, -1, 30, -1, 131, -1, -1, 134, + -1, -1, 137, -1, 139, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, -1, -1, - 28, -1, 30, -1, -1, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, 19, 20, -1, -1, 127, -1, -1, 130, -1, - 28, 133, 30, 135, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, - 19, 20, -1, -1, -1, -1, -1, -1, -1, 28, - -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 127, -1, -1, 130, -1, -1, 133, -1, 135, + 28, -1, 30, -1, 131, -1, -1, 134, -1, -1, + 137, -1, 139, -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, 127, - -1, -1, 130, -1, -1, 133, -1, 135, 19, 20, - -1, 22, 23, 24, -1, -1, -1, 28, -1, 30, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 127, - -1, -1, 130, -1, -1, 133, -1, 135, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 127, -1, - -1, 130, -1, -1, 133, -1, 135, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 91, 92, 93, 94, 95, -1, -1, -1, -1, -1, - 101, -1, 103, 104, 105, 106, 107, -1, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, -1, -1, -1, -1, -1, 130, - -1, -1, 133, -1, 135, -1, -1, 138, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, -1, 28, - -1, 30, 27, 28, -1, 30, -1, -1, -1, 34, - 35, 36, -1, -1, -1, -1, -1, 42, 43, 44, - 45, 46, 47, 48, -1, 50, 51, -1, -1, -1, - -1, -1, 61, 58, -1, -1, -1, 62, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 93, 94, 95, -1, -1, -1, - -1, -1, 101, -1, 103, 104, 105, 106, 107, -1, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, -1, -1, -1, -1, - -1, 17, 18, -1, 133, 21, 22, 23, 24, 25, - 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 131, -1, -1, + 134, -1, -1, 137, -1, 139, -1, -1, -1, -1, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + 28, -1, 30, -1, -1, 131, -1, -1, 134, 27, + 28, 137, 30, 139, -1, -1, 34, 35, 36, -1, + -1, -1, -1, -1, 42, 43, 44, 45, 46, 47, + 48, -1, 50, 51, -1, -1, -1, -1, -1, -1, + 58, 59, -1, 131, -1, 63, 134, -1, -1, 137, + -1, 139, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + 98, 99, -1, -1, -1, -1, -1, 105, -1, 107, + 108, 109, 110, 111, -1, 113, 114, 115, 116, 117, + 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, -1, -1, -1, -1, -1, 134, -1, -1, 137, + -1, 139, -1, -1, 142, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, -1, 28, -1, 30, -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, 61, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - -1, -1, -1, -1, -1, 101, -1, 103, 104, 105, - 106, 107, -1, 109, 110, 111, 112, 113, 114, 115, - 116, 117, 118, 119, 120, 121, 122, 123, 124, 38, - -1, -1, -1, -1, -1, -1, -1, 133, -1, -1, - 49, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 59, 60, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 75, -1, -1, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - -1, -1, 101, 102, 103, 104, 105, 106, 107, 108, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124 + 62, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 95, 96, 97, 98, 99, -1, -1, + -1, -1, -1, 105, -1, 107, 108, 109, 110, 111, + -1, 113, 114, 115, 116, 117, 118, 119, 120, 121, + 122, 123, 124, 125, 126, 127, 128, -1, -1, -1, + -1, -1, 17, 18, -1, 137, 21, 22, 23, 24, + 25, 26, -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, 62, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, -1, -1, -1, -1, -1, + 105, -1, 107, 108, 109, 110, 111, -1, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 38, -1, -1, -1, -1, -1, + -1, -1, 137, -1, -1, 49, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 60, 61, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 76, -1, -1, -1, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, -1, + -1, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 171, 172, 173, 0, 31, 34, 42, 43, 44, - 45, 46, 47, 48, 62, 152, 186, 188, 190, 28, - 30, 51, 58, 62, 151, 179, 190, 45, 47, 189, - 61, 64, 65, 66, 67, 68, 69, 70, 153, 184, - 29, 196, 197, 198, 52, 53, 54, 71, 176, 125, - 61, 27, 45, 47, 50, 152, 125, 184, 30, 174, - 18, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 19, 20, 127, 130, 133, - 135, 140, 160, 161, 162, 163, 164, 179, 193, 32, - 135, 185, 33, 136, 187, 197, 72, 73, 74, 76, - 77, 151, 199, 201, 125, 125, 125, 125, 130, 177, - 174, 160, 35, 36, 170, 170, 170, 170, 18, 18, - 18, 3, 136, 164, 165, 179, 128, 137, 3, 162, - 195, 4, 15, 5, 6, 7, 8, 9, 10, 11, - 12, 147, 148, 149, 38, 49, 59, 60, 75, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 142, 143, 144, 145, 146, 205, - 206, 208, 209, 30, 55, 56, 175, 18, 30, 30, - 178, 162, 162, 162, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 147, 148, 150, 162, 167, - 131, 131, 126, 136, 128, 40, 165, 166, 17, 18, - 21, 22, 23, 24, 25, 26, 61, 101, 103, 109, - 110, 111, 133, 142, 143, 144, 145, 146, 168, 192, - 193, 194, 194, 194, 194, 195, 59, 153, 162, 162, - 195, 162, 162, 202, 195, 195, 195, 195, 195, 162, - 162, 162, 195, 195, 153, 99, 100, 126, 132, 126, - 158, 158, 158, 25, 26, 17, 18, 141, 18, 21, - 22, 23, 24, 130, 133, 135, 138, 168, 193, 158, - 164, 164, 164, 40, 162, 181, 182, 183, 126, 129, - 63, 191, 128, 128, 128, 128, 128, 167, 169, 128, - 128, 128, 128, 128, 126, 126, 160, 126, 155, 126, - 155, 194, 130, 126, 126, 126, 126, 126, 126, 194, - 194, 194, 126, 39, 160, 162, 195, 30, 37, 57, - 156, 159, 132, 169, 169, 136, 169, 30, 132, 134, - 179, 180, 126, 129, 40, 30, 167, 167, 167, 167, - 167, 126, 134, 167, 167, 167, 167, 167, 15, 15, - 194, 10, 57, 10, 126, 207, 194, 130, 195, 162, - 195, 195, 195, 126, 126, 126, 195, 162, 194, 194, - 126, 30, 18, 158, 132, 134, 136, 40, 181, 156, - 157, 126, 207, 126, 126, 126, 126, 167, 126, 126, - 126, 126, 39, 194, 194, 128, 194, 18, 194, 195, - 203, 126, 194, 126, 126, 126, 194, 194, 194, 128, - 162, 57, 154, 30, 129, 167, 167, 167, 167, 167, - 167, 167, 167, 162, 126, 130, 203, 204, 126, 155, - 155, 126, 194, 126, 195, 195, 195, 204, 194, 18, - 126, 129, 126, 126, 129, 129, 129, 129, 129, 15, - 132, 149, 200, 129, 195, 132, 194, 129, 167, 167, - 167, 194, 192, 132, 149, 39, 132, 129, 129, 129, - 126, 192, 15, 15, 126, 194, 194, 15, 76, 194, - 15, 194 + 0, 175, 176, 178, 0, 31, 34, 42, 43, 44, + 45, 46, 47, 48, 63, 156, 191, 193, 195, 28, + 30, 51, 59, 63, 155, 184, 195, 45, 47, 194, + 62, 65, 66, 67, 68, 69, 70, 71, 157, 189, + 29, 201, 202, 203, 52, 53, 54, 72, 181, 129, + 62, 27, 45, 47, 50, 58, 156, 177, 129, 189, + 30, 179, 18, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 19, 20, 131, + 134, 137, 139, 144, 164, 165, 166, 167, 168, 184, + 198, 32, 139, 190, 33, 140, 192, 202, 73, 74, + 75, 77, 78, 79, 155, 204, 205, 207, 129, 129, + 129, 129, 134, 182, 179, 164, 35, 36, 174, 174, + 174, 174, 18, 18, 18, 3, 140, 168, 169, 184, + 132, 141, 3, 166, 200, 4, 15, 5, 6, 7, + 8, 9, 10, 11, 12, 151, 152, 153, 38, 49, + 60, 61, 76, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 105, 106, 107, 108, + 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, + 146, 147, 148, 149, 150, 211, 212, 214, 215, 30, + 55, 56, 180, 18, 30, 30, 183, 166, 166, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 151, 152, 154, 166, 171, 166, 135, 135, 130, 140, + 132, 40, 169, 170, 17, 18, 21, 22, 23, 24, + 25, 26, 62, 105, 107, 113, 114, 115, 137, 146, + 147, 148, 149, 150, 172, 197, 198, 199, 199, 199, + 199, 200, 60, 157, 166, 166, 200, 166, 166, 208, + 200, 200, 200, 200, 200, 166, 166, 166, 200, 200, + 157, 103, 104, 130, 136, 130, 162, 162, 25, 26, + 17, 18, 145, 18, 21, 22, 23, 24, 134, 137, + 139, 142, 172, 198, 162, 162, 168, 168, 168, 40, + 166, 186, 187, 188, 130, 133, 64, 196, 132, 132, + 132, 132, 132, 171, 173, 132, 132, 132, 132, 132, + 130, 130, 164, 130, 159, 130, 159, 199, 134, 130, + 130, 130, 130, 130, 130, 199, 199, 199, 130, 39, + 164, 166, 200, 30, 37, 57, 160, 163, 136, 173, + 173, 140, 173, 30, 136, 138, 184, 185, 130, 133, + 40, 30, 171, 171, 171, 171, 171, 130, 138, 171, + 171, 171, 171, 171, 15, 15, 199, 10, 57, 10, + 130, 213, 199, 134, 200, 166, 200, 200, 200, 130, + 130, 130, 200, 166, 199, 199, 130, 30, 18, 162, + 136, 138, 140, 40, 186, 160, 161, 130, 213, 130, + 130, 130, 130, 171, 130, 130, 130, 130, 39, 199, + 199, 132, 199, 18, 199, 200, 209, 130, 199, 130, + 130, 130, 199, 199, 199, 132, 166, 57, 158, 30, + 133, 171, 171, 171, 171, 171, 171, 171, 171, 166, + 130, 134, 209, 210, 130, 159, 159, 130, 199, 130, + 200, 200, 200, 210, 199, 18, 130, 133, 130, 130, + 133, 133, 133, 133, 133, 15, 136, 153, 206, 133, + 200, 136, 199, 133, 171, 171, 171, 199, 197, 136, + 153, 39, 136, 133, 133, 133, 130, 197, 15, 15, + 130, 199, 199, 15, 204, 199, 15, 199 }; #define yyerrok (yyerrstatus = 0) @@ -2202,27 +2240,27 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 53: -#line 292 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 55: +#line 321 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[-1].String); ;} break; - case 54: -#line 295 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 56: +#line 324 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; - case 62: -#line 302 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 64: +#line 331 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; - case 69: -#line 307 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 71: +#line 336 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2230,28 +2268,28 @@ yyreduce: ;} break; - case 70: -#line 312 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 72: +#line 341 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; - case 71: -#line 317 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { (yyval.String) = new std::string(); ;} - break; - - case 72: -#line 318 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;} - break; - case 73: -#line 321 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 346 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 74: -#line 322 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 347 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;} + break; + + case 75: +#line 350 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = new std::string(); ;} + break; + + case 76: +#line 351 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, ", "); *(yyvsp[-1].String) += " " + *(yyvsp[0].String); @@ -2260,8 +2298,8 @@ yyreduce: ;} break; - case 75: -#line 330 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 77: +#line 359 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2269,18 +2307,18 @@ yyreduce: ;} break; - case 76: -#line 336 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { (yyval.String) = new std::string(); ;} - break; - case 78: -#line 340 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 365 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 79: -#line 341 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 80: +#line 369 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = new std::string(); ;} + break; + + case 81: +#line 370 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, ", "); if (!(yyvsp[0].String)->empty()) @@ -2290,8 +2328,8 @@ yyreduce: ;} break; - case 81: -#line 351 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 83: +#line 380 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2299,24 +2337,31 @@ yyreduce: ;} break; - case 99: -#line 373 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 101: +#line 402 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = OpaqueTy; ;} break; - case 100: -#line 377 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 102: +#line 406 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = UnresolvedTy; ;} break; - case 102: -#line 386 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 103: +#line 410 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.Type) = (yyvsp[0].Type); + ;} + break; + + case 104: +#line 413 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Type UpReference (yyvsp[0].String)->insert(0, "\\"); (yyval.Type).newTy = (yyvsp[0].String); @@ -2324,8 +2369,8 @@ yyreduce: ;} break; - case 103: -#line 391 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 105: +#line 418 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Function derived type? *(yyvsp[-3].Type).newTy += "( " + *(yyvsp[-1].String) + " )"; delete (yyvsp[-1].String); @@ -2334,30 +2379,32 @@ yyreduce: ;} break; - case 104: -#line 397 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 106: +#line 424 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Sized array type? (yyvsp[-3].String)->insert(0,"[ "); *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " ]"; delete (yyvsp[-1].Type).newTy; (yyval.Type).newTy = (yyvsp[-3].String); (yyval.Type).oldTy = ArrayTy; + (yyval.Type).elemTy = (yyvsp[-1].Type).oldTy; ;} break; - case 105: -#line 404 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 107: +#line 432 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Packed array type? (yyvsp[-3].String)->insert(0,"< "); *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " >"; delete (yyvsp[-1].Type).newTy; (yyval.Type).newTy = (yyvsp[-3].String); (yyval.Type).oldTy = PackedTy; + (yyval.Type).elemTy = (yyvsp[-1].Type).oldTy; ;} break; - case 106: -#line 411 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 108: +#line 440 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Structure type? (yyvsp[-1].String)->insert(0, "{ "); *(yyvsp[-1].String) += " }"; @@ -2366,32 +2413,33 @@ yyreduce: ;} break; - case 107: -#line 417 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 109: +#line 446 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Empty structure type? (yyval.Type).newTy = new std::string("{}"); (yyval.Type).oldTy = StructTy; ;} break; - case 108: -#line 421 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 110: +#line 450 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Pointer type? *(yyvsp[-1].Type).newTy += '*'; + (yyval.Type).elemTy = (yyvsp[-1].Type).oldTy; (yyvsp[-1].Type).oldTy = PointerTy; (yyval.Type) = (yyvsp[-1].Type); ;} break; - case 109: -#line 431 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 111: +#line 461 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].Type).newTy; ;} break; - case 110: -#line 434 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 112: +#line 464 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].Type).newTy; delete (yyvsp[0].Type).newTy; @@ -2399,8 +2447,8 @@ yyreduce: ;} break; - case 112: -#line 443 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 114: +#line 473 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", ..."; delete (yyvsp[0].String); @@ -2408,22 +2456,22 @@ yyreduce: ;} break; - case 113: -#line 448 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 115: +#line 478 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; - case 114: -#line 451 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 116: +#line 481 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 115: -#line 461 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 117: +#line 491 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Nonempty unsized arr (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy); @@ -2432,8 +2480,8 @@ yyreduce: ;} break; - case 116: -#line 467 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 118: +#line 497 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy); @@ -2441,8 +2489,8 @@ yyreduce: ;} break; - case 117: -#line 472 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 119: +#line 502 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy); @@ -2451,8 +2499,8 @@ yyreduce: ;} break; - case 118: -#line 478 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 120: +#line 508 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Nonempty unsized arr (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy); @@ -2461,8 +2509,8 @@ yyreduce: ;} break; - case 119: -#line 484 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 121: +#line 514 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy); @@ -2471,8 +2519,8 @@ yyreduce: ;} break; - case 120: -#line 490 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 122: +#line 520 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy); @@ -2480,8 +2528,8 @@ yyreduce: ;} break; - case 121: -#line 495 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 123: +#line 525 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2490,28 +2538,8 @@ yyreduce: ;} break; - case 122: -#line 501 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - (yyval.Const).type = (yyvsp[-1].Type); - (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); - *(yyval.Const).cnst += " " + *(yyvsp[0].String); - delete (yyvsp[0].String); - ;} - break; - - case 123: -#line 507 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - (yyval.Const).type = (yyvsp[-1].Type); - (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); - *(yyval.Const).cnst += " " + *(yyvsp[0].String); - delete (yyvsp[0].String); - ;} - break; - case 124: -#line 513 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 531 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2521,7 +2549,7 @@ yyreduce: break; case 125: -#line 519 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 537 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2531,8 +2559,8 @@ yyreduce: break; case 126: -#line 525 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { // integral constants +#line 543 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); *(yyval.Const).cnst += " " + *(yyvsp[0].String); @@ -2541,8 +2569,8 @@ yyreduce: break; case 127: -#line 531 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { // integral constants +#line 549 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); *(yyval.Const).cnst += " " + *(yyvsp[0].String); @@ -2551,8 +2579,8 @@ yyreduce: break; case 128: -#line 537 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { // Boolean constants +#line 555 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { // integral constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); *(yyval.Const).cnst += " " + *(yyvsp[0].String); @@ -2561,8 +2589,8 @@ yyreduce: break; case 129: -#line 543 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { // Boolean constants +#line 561 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { // integral constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); *(yyval.Const).cnst += " " + *(yyvsp[0].String); @@ -2571,8 +2599,8 @@ yyreduce: break; case 130: -#line 549 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { // Float & Double constants +#line 567 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { // Boolean constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); *(yyval.Const).cnst += " " + *(yyvsp[0].String); @@ -2581,7 +2609,27 @@ yyreduce: break; case 131: -#line 557 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 573 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { // Boolean constants + (yyval.Const).type = (yyvsp[-1].Type); + (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); + *(yyval.Const).cnst += " " + *(yyvsp[0].String); + delete (yyvsp[0].String); + ;} + break; + + case 132: +#line 579 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { // Float & Double constants + (yyval.Const).type = (yyvsp[-1].Type); + (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); + *(yyval.Const).cnst += " " + *(yyvsp[0].String); + delete (yyvsp[0].String); + ;} + break; + + case 133: +#line 587 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string source = *(yyvsp[-3].Const).cnst; TypeInfo DstTy = (yyvsp[-1].Type); @@ -2598,8 +2646,8 @@ yyreduce: ;} break; - case 132: -#line 571 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 134: +#line 601 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-4].String) += "(" + *(yyvsp[-2].Const).cnst; for (unsigned i = 0; i < (yyvsp[-1].ValList)->size(); ++i) { @@ -2614,8 +2662,8 @@ yyreduce: ;} break; - case 133: -#line 583 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 135: +#line 613 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2623,35 +2671,36 @@ yyreduce: ;} break; - case 134: -#line 588 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; - (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); - (yyval.String) = (yyvsp[-5].String); - ;} - break; - - case 135: -#line 593 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; - (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); - (yyval.String) = (yyvsp[-5].String); - ;} - break; - case 136: -#line 598 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 618 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { - *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; - (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); - (yyval.String) = (yyvsp[-5].String); + const char* op = getDivRemOpcode(*(yyvsp[-5].String), (yyvsp[-3].Const).type); + (yyval.String) = new std::string(op); + *(yyval.String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; + delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); ;} break; case 137: -#line 603 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 624 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; + (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); + (yyval.String) = (yyvsp[-5].String); + ;} + break; + + case 138: +#line 629 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; + (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); + (yyval.String) = (yyvsp[-5].String); + ;} + break; + + case 139: +#line 634 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { const char* shiftop = (yyvsp[-5].String)->c_str(); if (*(yyvsp[-5].String) == "shr") @@ -2662,8 +2711,8 @@ yyreduce: ;} break; - case 138: -#line 611 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 140: +#line 642 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2671,26 +2720,26 @@ yyreduce: ;} break; - case 139: -#line 616 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; - (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); - (yyval.String) = (yyvsp[-7].String); - ;} - break; - - case 140: -#line 621 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; - (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); - (yyval.String) = (yyvsp[-7].String); - ;} - break; - case 141: -#line 631 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 647 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; + (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); + (yyval.String) = (yyvsp[-7].String); + ;} + break; + + case 142: +#line 652 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; + (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); + (yyval.String) = (yyvsp[-7].String); + ;} + break; + + case 143: +#line 662 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst; (yyvsp[0].Const).destroy(); @@ -2698,26 +2747,26 @@ yyreduce: ;} break; - case 142: -#line 636 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 144: +#line 667 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(*(yyvsp[0].Const).cnst); (yyvsp[0].Const).destroy(); ;} break; - case 145: -#line 651 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 147: +#line 682 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { ;} break; - case 146: -#line 656 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 148: +#line 687 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 147: -#line 659 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 149: +#line 690 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[0].String) << "\n"; delete (yyvsp[0].String); @@ -2725,34 +2774,40 @@ yyreduce: ;} break; - case 148: -#line 664 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 150: +#line 695 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << "module asm " << " " << *(yyvsp[0].String) << "\n"; (yyval.String) = 0; ;} break; - case 149: -#line 668 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 151: +#line 699 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << "implementation\n"; (yyval.String) = 0; ;} break; - case 150: -#line 672 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 152: +#line 703 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 151: -#line 675 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 154: +#line 705 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "external"; ;} + break; + + case 155: +#line 708 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { EnumeratedTypes.push_back((yyvsp[0].Type)); if (!(yyvsp[-2].String)->empty()) { NamedTypes[*(yyvsp[-2].String)].newTy = new std::string(*(yyvsp[0].Type).newTy); NamedTypes[*(yyvsp[-2].String)].oldTy = (yyvsp[0].Type).oldTy; + NamedTypes[*(yyvsp[-2].String)].elemTy = (yyvsp[0].Type).elemTy; *O << *(yyvsp[-2].String) << " = "; } *O << "type " << *(yyvsp[0].Type).newTy << "\n"; @@ -2761,8 +2816,8 @@ yyreduce: ;} break; - case 152: -#line 686 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 156: +#line 720 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Function prototypes can be in const pool *O << *(yyvsp[0].String) << "\n"; delete (yyvsp[0].String); @@ -2770,8 +2825,8 @@ yyreduce: ;} break; - case 153: -#line 691 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 157: +#line 725 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Asm blocks can be in the const pool *O << *(yyvsp[-2].String) << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n"; delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String); @@ -2779,8 +2834,8 @@ yyreduce: ;} break; - case 154: -#line 696 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 158: +#line 730 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) *O << *(yyvsp[-4].String) << " = "; @@ -2790,8 +2845,8 @@ yyreduce: ;} break; - case 155: -#line 703 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 159: +#line 737 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) *O << *(yyvsp[-4].String) << " = "; @@ -2801,8 +2856,8 @@ yyreduce: ;} break; - case 156: -#line 710 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 160: +#line 744 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) *O << *(yyvsp[-4].String) << " = "; @@ -2812,8 +2867,8 @@ yyreduce: ;} break; - case 157: -#line 717 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 161: +#line 751 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) *O << *(yyvsp[-4].String) << " = "; @@ -2823,8 +2878,8 @@ yyreduce: ;} break; - case 158: -#line 724 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 162: +#line 758 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n"; delete (yyvsp[-1].String); delete (yyvsp[0].String); @@ -2832,8 +2887,8 @@ yyreduce: ;} break; - case 159: -#line 729 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 163: +#line 763 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[-2].String) << " = " << *(yyvsp[0].String) << "\n"; delete (yyvsp[-2].String); delete (yyvsp[0].String); @@ -2841,15 +2896,15 @@ yyreduce: ;} break; - case 160: -#line 734 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 164: +#line 768 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 164: -#line 744 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 168: +#line 778 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2857,8 +2912,8 @@ yyreduce: ;} break; - case 165: -#line 749 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 169: +#line 783 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); if (*(yyvsp[0].String) == "64") @@ -2868,8 +2923,8 @@ yyreduce: ;} break; - case 166: -#line 756 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 170: +#line 790 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2877,8 +2932,8 @@ yyreduce: ;} break; - case 167: -#line 761 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 171: +#line 795 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2886,8 +2941,8 @@ yyreduce: ;} break; - case 168: -#line 768 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 172: +#line 802 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, "[ "); *(yyvsp[-1].String) += " ]"; @@ -2895,8 +2950,8 @@ yyreduce: ;} break; - case 169: -#line 775 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 173: +#line 809 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2904,20 +2959,20 @@ yyreduce: ;} break; - case 171: -#line 781 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 175: +#line 815 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 175: -#line 790 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 179: +#line 824 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 176: -#line 792 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 180: +#line 826 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[-1].Type).newTy; if (!(yyvsp[0].String)->empty()) @@ -2926,30 +2981,30 @@ yyreduce: ;} break; - case 177: -#line 799 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 181: +#line 833 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].String); delete (yyvsp[0].String); ;} break; - case 178: -#line 803 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 182: +#line 837 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; - case 179: -#line 807 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 183: +#line 841 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; - case 180: -#line 810 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 184: +#line 844 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", ..."; (yyval.String) = (yyvsp[-2].String); @@ -2957,20 +3012,20 @@ yyreduce: ;} break; - case 181: -#line 815 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 185: +#line 849 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; - case 182: -#line 818 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 186: +#line 852 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 183: -#line 821 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 187: +#line 855 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-7].String)->empty()) { *(yyvsp[-7].String) += " "; @@ -2991,22 +3046,18 @@ yyreduce: ;} break; - case 184: -#line 840 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - (yyval.String) = new std::string("begin"); - ;} + case 188: +#line 874 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = new std::string("{"); delete (yyvsp[0].String); ;} break; - case 185: -#line 843 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - (yyval.String) = new std::string ("{"); - ;} + case 189: +#line 875 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = new std::string ("{"); ;} break; - case 186: -#line 847 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 190: +#line 877 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-2].String)->empty()) { *O << *(yyvsp[-2].String) << " "; @@ -3017,18 +3068,18 @@ yyreduce: ;} break; - case 187: -#line 856 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { (yyval.String) = new std::string("end"); ;} + case 191: +#line 886 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = new std::string("}"); delete (yyvsp[0].String); ;} break; - case 188: -#line 857 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 192: +#line 887 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string("}"); ;} break; - case 189: -#line 859 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 193: +#line 889 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if ((yyvsp[-1].String)) *O << *(yyvsp[-1].String); @@ -3037,13 +3088,13 @@ yyreduce: ;} break; - case 190: -#line 867 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 194: +#line 897 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 193: -#line 873 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 197: +#line 903 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-1].String)->empty()) *(yyvsp[-2].String) += " " + *(yyvsp[-1].String); @@ -3054,13 +3105,13 @@ yyreduce: ;} break; - case 194: -#line 886 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 198: +#line 916 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 204: -#line 892 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 208: +#line 922 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, "<"); *(yyvsp[-1].String) += ">"; @@ -3068,8 +3119,8 @@ yyreduce: ;} break; - case 206: -#line 898 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 210: +#line 928 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-3].String)->empty()) { *(yyvsp[-4].String) += " " + *(yyvsp[-3].String); @@ -3080,8 +3131,8 @@ yyreduce: ;} break; - case 209: -#line 911 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 213: +#line 941 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value).val = (yyvsp[0].String); (yyval.Value).constant = false; @@ -3090,8 +3141,8 @@ yyreduce: ;} break; - case 210: -#line 917 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 214: +#line 947 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value).val = (yyvsp[0].String); (yyval.Value).constant = true; @@ -3100,8 +3151,8 @@ yyreduce: ;} break; - case 211: -#line 928 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 215: +#line 958 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value) = (yyvsp[0].Value); (yyval.Value).type = (yyvsp[-1].Type); @@ -3109,29 +3160,29 @@ yyreduce: ;} break; - case 212: -#line 934 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 216: +#line 964 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 213: -#line 937 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 217: +#line 967 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Do not allow functions with 0 basic blocks (yyval.String) = 0; ;} break; - case 214: -#line 945 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 218: +#line 975 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 215: -#line 949 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 219: +#line 979 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << "\n"; delete (yyvsp[0].String); @@ -3139,15 +3190,15 @@ yyreduce: ;} break; - case 216: -#line 954 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 220: +#line 984 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 217: -#line 957 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 221: +#line 987 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[0].String) << "\n"; delete (yyvsp[0].String); @@ -3155,8 +3206,13 @@ yyreduce: ;} break; - case 218: -#line 963 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 223: +#line 993 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "unwind"; ;} + break; + + case 224: +#line 995 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Return with a result... *O << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].Value).val << "\n"; delete (yyvsp[-1].String); (yyvsp[0].Value).destroy(); @@ -3164,8 +3220,8 @@ yyreduce: ;} break; - case 219: -#line 968 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 225: +#line 1000 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Return with no result... *O << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].Type).newTy << "\n"; delete (yyvsp[-1].String); (yyvsp[0].Type).destroy(); @@ -3173,8 +3229,8 @@ yyreduce: ;} break; - case 220: -#line 973 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 226: +#line 1005 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Unconditional Branch... *O << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].Value).val << "\n"; delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy(); @@ -3182,8 +3238,8 @@ yyreduce: ;} break; - case 221: -#line 978 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 227: +#line 1010 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[-8].String) << " " << *(yyvsp[-7].Type).newTy << " " << *(yyvsp[-6].Value).val << ", " << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].Value).val << ", " << *(yyvsp[-1].Type).newTy << " " @@ -3194,8 +3250,8 @@ yyreduce: ;} break; - case 222: -#line 986 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 228: +#line 1018 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[-8].String) << " " << *(yyvsp[-7].Type).newTy << " " << *(yyvsp[-6].Value).val << ", " << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].Value).val << " [" << *(yyvsp[-1].String) << " ]\n"; @@ -3205,8 +3261,8 @@ yyreduce: ;} break; - case 223: -#line 993 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 229: +#line 1025 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[-7].String) << " " << *(yyvsp[-6].Type).newTy << " " << *(yyvsp[-5].Value).val << ", " << *(yyvsp[-3].Type).newTy << " " << *(yyvsp[-2].Value).val << "[]\n"; @@ -3215,8 +3271,8 @@ yyreduce: ;} break; - case 224: -#line 1000 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 230: +#line 1032 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " "; if (!(yyvsp[-13].String)->empty()) @@ -3238,8 +3294,8 @@ yyreduce: ;} break; - case 225: -#line 1019 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 231: +#line 1051 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << "\n"; delete (yyvsp[0].String); @@ -3247,8 +3303,8 @@ yyreduce: ;} break; - case 226: -#line 1024 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 232: +#line 1056 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << "\n"; delete (yyvsp[0].String); @@ -3256,8 +3312,8 @@ yyreduce: ;} break; - case 227: -#line 1030 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 233: +#line 1062 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + " " + *(yyvsp[-3].String) + ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val; (yyvsp[-4].Type).destroy(); delete (yyvsp[-3].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy(); @@ -3265,8 +3321,8 @@ yyreduce: ;} break; - case 228: -#line 1035 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 234: +#line 1067 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-3].String)->insert(0, *(yyvsp[-4].Type).newTy + " " ); *(yyvsp[-3].String) += ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val; @@ -3275,8 +3331,8 @@ yyreduce: ;} break; - case 229: -#line 1043 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 235: +#line 1075 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-1].String)->empty()) *(yyvsp[-1].String) += " = "; @@ -3286,8 +3342,8 @@ yyreduce: ;} break; - case 230: -#line 1052 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 236: +#line 1084 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Used for PHI nodes (yyvsp[-3].Value).val->insert(0, *(yyvsp[-5].Type).newTy + "["); *(yyvsp[-3].Value).val += "," + *(yyvsp[-1].Value).val + "]"; @@ -3297,8 +3353,8 @@ yyreduce: ;} break; - case 231: -#line 1059 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 237: +#line 1091 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-6].String) += ", [" + *(yyvsp[-3].Value).val + "," + *(yyvsp[-1].Value).val + "]"; (yyvsp[-3].Value).destroy(); (yyvsp[-1].Value).destroy(); @@ -3306,34 +3362,34 @@ yyreduce: ;} break; - case 232: -#line 1067 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 238: +#line 1099 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); (yyval.ValList)->push_back((yyvsp[0].Value)); ;} break; - case 233: -#line 1071 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 239: +#line 1103 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-2].ValList)->push_back((yyvsp[0].Value)); (yyval.ValList) = (yyvsp[-2].ValList); ;} break; - case 234: -#line 1078 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 240: +#line 1110 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = (yyvsp[0].ValList); ;} break; - case 235: -#line 1079 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 241: +#line 1111 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); ;} break; - case 236: -#line 1083 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 242: +#line 1115 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3341,8 +3397,18 @@ yyreduce: ;} break; - case 238: -#line 1091 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 244: +#line 1123 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + const char* op = getDivRemOpcode(*(yyvsp[-4].String), (yyvsp[-3].Type)); + (yyval.String) = new std::string(op); + *(yyval.String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; + delete (yyvsp[-4].String); (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); + ;} + break; + + case 245: +#line 1129 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3350,8 +3416,8 @@ yyreduce: ;} break; - case 239: -#line 1096 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 246: +#line 1134 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3359,17 +3425,8 @@ yyreduce: ;} break; - case 240: -#line 1101 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; - (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); - (yyval.String) = (yyvsp[-4].String); - ;} - break; - - case 241: -#line 1106 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 247: +#line 1139 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val; (yyvsp[0].Value).destroy(); @@ -3377,8 +3434,8 @@ yyreduce: ;} break; - case 242: -#line 1111 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 248: +#line 1144 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { const char* shiftop = (yyvsp[-3].String)->c_str(); if (*(yyvsp[-3].String) == "shr") @@ -3389,8 +3446,8 @@ yyreduce: ;} break; - case 243: -#line 1119 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 249: +#line 1152 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string source = *(yyvsp[-2].Value).val; TypeInfo SrcTy = (yyvsp[-2].Value).type; @@ -3407,8 +3464,8 @@ yyreduce: ;} break; - case 244: -#line 1133 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 250: +#line 1166 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3416,8 +3473,8 @@ yyreduce: ;} break; - case 245: -#line 1138 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 251: +#line 1171 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Type).newTy; (yyvsp[-2].Value).destroy(); (yyvsp[0].Type).destroy(); @@ -3425,8 +3482,8 @@ yyreduce: ;} break; - case 246: -#line 1143 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 252: +#line 1176 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3434,8 +3491,8 @@ yyreduce: ;} break; - case 247: -#line 1148 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 253: +#line 1181 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3443,8 +3500,8 @@ yyreduce: ;} break; - case 248: -#line 1153 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 254: +#line 1186 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3452,8 +3509,8 @@ yyreduce: ;} break; - case 249: -#line 1158 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 255: +#line 1191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3461,8 +3518,8 @@ yyreduce: ;} break; - case 250: -#line 1163 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 256: +#line 1196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-5].String)->empty()) *(yyvsp[-6].String) += " " + *(yyvsp[-5].String); @@ -3482,23 +3539,23 @@ yyreduce: ;} break; - case 252: -#line 1185 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 258: +#line 1218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = (yyvsp[0].ValList); ;} break; - case 253: -#line 1186 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 259: +#line 1219 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); ;} break; - case 255: -#line 1191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 261: +#line 1224 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 256: -#line 1194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 262: +#line 1227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy; if (!(yyvsp[0].String)->empty()) @@ -3508,8 +3565,8 @@ yyreduce: ;} break; - case 257: -#line 1201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 263: +#line 1234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val; if (!(yyvsp[0].String)->empty()) @@ -3519,8 +3576,8 @@ yyreduce: ;} break; - case 258: -#line 1208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 264: +#line 1241 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy; if (!(yyvsp[0].String)->empty()) @@ -3530,8 +3587,8 @@ yyreduce: ;} break; - case 259: -#line 1215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 265: +#line 1248 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val; if (!(yyvsp[0].String)->empty()) @@ -3541,8 +3598,8 @@ yyreduce: ;} break; - case 260: -#line 1222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 266: +#line 1255 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val; (yyvsp[0].Value).destroy(); @@ -3550,8 +3607,8 @@ yyreduce: ;} break; - case 261: -#line 1227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 267: +#line 1260 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-3].String)->empty()) *(yyvsp[-3].String) += " "; @@ -3561,8 +3618,8 @@ yyreduce: ;} break; - case 262: -#line 1234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 268: +#line 1267 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-5].String)->empty()) *(yyvsp[-5].String) += " "; @@ -3572,8 +3629,8 @@ yyreduce: ;} break; - case 263: -#line 1241 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 269: +#line 1274 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Upgrade the indices for (unsigned i = 0; i < (yyvsp[0].ValList)->size(); ++i) { @@ -3604,7 +3661,7 @@ yyreduce: } /* Line 1126 of yacc.c. */ -#line 3608 "UpgradeParser.tab.c" +#line 3665 "UpgradeParser.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -3872,7 +3929,7 @@ yyreturn: } -#line 1265 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 1298 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" int yyerror(const char *ErrorMsg) { diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs index 2e776cf434d..843dd33c4ef 100644 --- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs +++ b/tools/llvm-upgrade/UpgradeParser.cpp.cvs @@ -119,73 +119,77 @@ LITTLE = 310, BIG = 311, ALIGN = 312, - DEPLIBS = 313, - CALL = 314, - TAIL = 315, - ASM_TOK = 316, - MODULE = 317, - SIDEEFFECT = 318, - CC_TOK = 319, - CCC_TOK = 320, - CSRETCC_TOK = 321, - FASTCC_TOK = 322, - COLDCC_TOK = 323, - X86_STDCALLCC_TOK = 324, - X86_FASTCALLCC_TOK = 325, - DATALAYOUT = 326, - RET = 327, - BR = 328, - SWITCH = 329, - INVOKE = 330, - UNWIND = 331, - UNREACHABLE = 332, - ADD = 333, - SUB = 334, - MUL = 335, - UDIV = 336, - SDIV = 337, - FDIV = 338, - UREM = 339, - SREM = 340, - FREM = 341, - AND = 342, - OR = 343, - XOR = 344, - SETLE = 345, - SETGE = 346, - SETLT = 347, - SETGT = 348, - SETEQ = 349, - SETNE = 350, - MALLOC = 351, - ALLOCA = 352, - FREE = 353, - LOAD = 354, - STORE = 355, - GETELEMENTPTR = 356, - PHI_TOK = 357, - SELECT = 358, - SHL = 359, - SHR = 360, - ASHR = 361, - LSHR = 362, - VAARG = 363, - EXTRACTELEMENT = 364, - INSERTELEMENT = 365, - SHUFFLEVECTOR = 366, - CAST = 367, - TRUNC = 368, - ZEXT = 369, - SEXT = 370, - FPTRUNC = 371, - FPEXT = 372, - FPTOUI = 373, - FPTOSI = 374, - UITOFP = 375, - SITOFP = 376, - PTRTOINT = 377, - INTTOPTR = 378, - BITCAST = 379 + UNINITIALIZED = 313, + DEPLIBS = 314, + CALL = 315, + TAIL = 316, + ASM_TOK = 317, + MODULE = 318, + SIDEEFFECT = 319, + CC_TOK = 320, + CCC_TOK = 321, + CSRETCC_TOK = 322, + FASTCC_TOK = 323, + COLDCC_TOK = 324, + X86_STDCALLCC_TOK = 325, + X86_FASTCALLCC_TOK = 326, + DATALAYOUT = 327, + RET = 328, + BR = 329, + SWITCH = 330, + INVOKE = 331, + EXCEPT = 332, + UNWIND = 333, + UNREACHABLE = 334, + ADD = 335, + SUB = 336, + MUL = 337, + DIV = 338, + UDIV = 339, + SDIV = 340, + FDIV = 341, + REM = 342, + UREM = 343, + SREM = 344, + FREM = 345, + AND = 346, + OR = 347, + XOR = 348, + SETLE = 349, + SETGE = 350, + SETLT = 351, + SETGT = 352, + SETEQ = 353, + SETNE = 354, + MALLOC = 355, + ALLOCA = 356, + FREE = 357, + LOAD = 358, + STORE = 359, + GETELEMENTPTR = 360, + PHI_TOK = 361, + SELECT = 362, + SHL = 363, + SHR = 364, + ASHR = 365, + LSHR = 366, + VAARG = 367, + EXTRACTELEMENT = 368, + INSERTELEMENT = 369, + SHUFFLEVECTOR = 370, + CAST = 371, + TRUNC = 372, + ZEXT = 373, + SEXT = 374, + FPTRUNC = 375, + FPEXT = 376, + FPTOUI = 377, + FPTOSI = 378, + UITOFP = 379, + SITOFP = 380, + PTRTOINT = 381, + INTTOPTR = 382, + BITCAST = 383 }; #endif /* Tokens. */ @@ -244,73 +248,77 @@ #define LITTLE 310 #define BIG 311 #define ALIGN 312 -#define DEPLIBS 313 -#define CALL 314 -#define TAIL 315 -#define ASM_TOK 316 -#define MODULE 317 -#define SIDEEFFECT 318 -#define CC_TOK 319 -#define CCC_TOK 320 -#define CSRETCC_TOK 321 -#define FASTCC_TOK 322 -#define COLDCC_TOK 323 -#define X86_STDCALLCC_TOK 324 -#define X86_FASTCALLCC_TOK 325 -#define DATALAYOUT 326 -#define RET 327 -#define BR 328 -#define SWITCH 329 -#define INVOKE 330 -#define UNWIND 331 -#define UNREACHABLE 332 -#define ADD 333 -#define SUB 334 -#define MUL 335 -#define UDIV 336 -#define SDIV 337 -#define FDIV 338 -#define UREM 339 -#define SREM 340 -#define FREM 341 -#define AND 342 -#define OR 343 -#define XOR 344 -#define SETLE 345 -#define SETGE 346 -#define SETLT 347 -#define SETGT 348 -#define SETEQ 349 -#define SETNE 350 -#define MALLOC 351 -#define ALLOCA 352 -#define FREE 353 -#define LOAD 354 -#define STORE 355 -#define GETELEMENTPTR 356 -#define PHI_TOK 357 -#define SELECT 358 -#define SHL 359 -#define SHR 360 -#define ASHR 361 -#define LSHR 362 -#define VAARG 363 -#define EXTRACTELEMENT 364 -#define INSERTELEMENT 365 -#define SHUFFLEVECTOR 366 -#define CAST 367 -#define TRUNC 368 -#define ZEXT 369 -#define SEXT 370 -#define FPTRUNC 371 -#define FPEXT 372 -#define FPTOUI 373 -#define FPTOSI 374 -#define UITOFP 375 -#define SITOFP 376 -#define PTRTOINT 377 -#define INTTOPTR 378 -#define BITCAST 379 +#define UNINITIALIZED 313 +#define DEPLIBS 314 +#define CALL 315 +#define TAIL 316 +#define ASM_TOK 317 +#define MODULE 318 +#define SIDEEFFECT 319 +#define CC_TOK 320 +#define CCC_TOK 321 +#define CSRETCC_TOK 322 +#define FASTCC_TOK 323 +#define COLDCC_TOK 324 +#define X86_STDCALLCC_TOK 325 +#define X86_FASTCALLCC_TOK 326 +#define DATALAYOUT 327 +#define RET 328 +#define BR 329 +#define SWITCH 330 +#define INVOKE 331 +#define EXCEPT 332 +#define UNWIND 333 +#define UNREACHABLE 334 +#define ADD 335 +#define SUB 336 +#define MUL 337 +#define DIV 338 +#define UDIV 339 +#define SDIV 340 +#define FDIV 341 +#define REM 342 +#define UREM 343 +#define SREM 344 +#define FREM 345 +#define AND 346 +#define OR 347 +#define XOR 348 +#define SETLE 349 +#define SETGE 350 +#define SETLT 351 +#define SETGT 352 +#define SETEQ 353 +#define SETNE 354 +#define MALLOC 355 +#define ALLOCA 356 +#define FREE 357 +#define LOAD 358 +#define STORE 359 +#define GETELEMENTPTR 360 +#define PHI_TOK 361 +#define SELECT 362 +#define SHL 363 +#define SHR 364 +#define ASHR 365 +#define LSHR 366 +#define VAARG 367 +#define EXTRACTELEMENT 368 +#define INSERTELEMENT 369 +#define SHUFFLEVECTOR 370 +#define CAST 371 +#define TRUNC 372 +#define ZEXT 373 +#define SEXT 374 +#define FPTRUNC 375 +#define FPEXT 376 +#define FPTOUI 377 +#define FPTOSI 378 +#define UITOFP 379 +#define SITOFP 380 +#define PTRTOINT 381 +#define INTTOPTR 382 +#define BITCAST 383 @@ -371,9 +379,10 @@ void UpgradeAssembly(const std::string &infile, std::istream& in, static void ResolveType(TypeInfo& Ty) { if (Ty.oldTy == UnresolvedTy) { TypeMap::iterator I = NamedTypes.find(*Ty.newTy); - if (I != NamedTypes.end()) + if (I != NamedTypes.end()) { Ty.oldTy = I->second.oldTy; - else { + Ty.elemTy = I->second.elemTy; + } else { std::string msg("Can't resolve type: "); msg += *Ty.newTy; yyerror(msg.c_str()); @@ -382,6 +391,7 @@ static void ResolveType(TypeInfo& Ty) { unsigned ref = atoi(&((Ty.newTy->c_str())[1])); // Skip the '\\' if (ref < EnumeratedTypes.size()) { Ty.oldTy = EnumeratedTypes[ref].oldTy; + Ty.elemTy = EnumeratedTypes[ref].elemTy; } else { std::string msg("Can't resolve type: "); msg += *Ty.newTy; @@ -510,6 +520,32 @@ static std::string getCastUpgrade( return Result; } +const char* getDivRemOpcode(const std::string& opcode, const TypeInfo& TI) { + const char* op = opcode.c_str(); + TypeInfo Ty = TI; + ResolveType(Ty); + if (Ty.isPacked()) + Ty.oldTy = Ty.getElementType(); + if (opcode == "div") + if (Ty.isFloatingPoint()) + op = "fdiv"; + else if (Ty.isUnsigned()) + op = "udiv"; + else if (Ty.isSigned()) + op = "sdiv"; + else + yyerror("Invalid type for div instruction"); + else if (opcode == "rem") + if (Ty.isFloatingPoint()) + op = "frem"; + else if (Ty.isUnsigned()) + op = "urem"; + else if (Ty.isSigned()) + op = "srem"; + else + yyerror("Invalid type for rem instruction"); + return op; +} /* Enabling traces. */ @@ -531,7 +567,7 @@ static std::string getCastUpgrade( #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 239 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" typedef union YYSTYPE { std::string* String; TypeInfo Type; @@ -540,7 +576,7 @@ typedef union YYSTYPE { ValueList* ValList; } YYSTYPE; /* Line 196 of yacc.c. */ -#line 544 "UpgradeParser.tab.c" +#line 580 "UpgradeParser.tab.c" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -552,7 +588,7 @@ typedef union YYSTYPE { /* Line 219 of yacc.c. */ -#line 556 "UpgradeParser.tab.c" +#line 592 "UpgradeParser.tab.c" #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) # define YYSIZE_T __SIZE_TYPE__ @@ -703,20 +739,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1335 +#define YYLAST 1324 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 139 +#define YYNTOKENS 143 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 71 +#define YYNNTS 73 /* YYNRULES -- Number of rules. */ -#define YYNRULES 263 +#define YYNRULES 269 /* YYNRULES -- Number of states. */ -#define YYNSTATES 522 +#define YYNSTATES 528 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 379 +#define YYMAXUTOK 383 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -728,15 +764,15 @@ static const unsigned char yytranslate[] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 128, 129, 137, 2, 126, 2, 2, 2, 2, 2, + 132, 133, 141, 2, 130, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 133, 125, 134, 2, 2, 2, 2, 2, 2, 2, + 137, 129, 138, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 130, 127, 132, 2, 2, 2, 2, 2, 138, + 2, 134, 131, 136, 2, 2, 2, 2, 2, 142, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 131, 2, 2, 135, 2, 136, 2, 2, 2, 2, + 135, 2, 2, 139, 2, 140, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -761,7 +797,8 @@ static const unsigned char yytranslate[] = 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, - 115, 116, 117, 118, 119, 120, 121, 122, 123, 124 + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128 }; #if YYDEBUG @@ -774,149 +811,150 @@ static const unsigned short int yyprhs[] = 39, 41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 89, 91, 93, 95, 97, - 99, 101, 103, 105, 108, 109, 111, 113, 115, 117, - 119, 121, 123, 124, 126, 128, 130, 132, 134, 136, - 139, 140, 141, 144, 145, 149, 152, 153, 155, 156, - 160, 162, 165, 167, 169, 171, 173, 175, 177, 179, + 99, 101, 103, 105, 107, 109, 112, 113, 115, 117, + 119, 121, 123, 125, 127, 128, 130, 132, 134, 136, + 138, 140, 143, 144, 145, 148, 149, 153, 156, 157, + 159, 160, 164, 166, 169, 171, 173, 175, 177, 179, 181, 183, 185, 187, 189, 191, 193, 195, 197, 199, - 201, 203, 205, 208, 213, 219, 225, 229, 232, 235, - 237, 241, 243, 247, 249, 250, 255, 259, 263, 268, - 273, 277, 280, 283, 286, 289, 292, 295, 298, 301, - 304, 307, 314, 320, 329, 336, 343, 350, 357, 364, - 373, 382, 386, 388, 390, 392, 394, 397, 400, 405, - 408, 410, 415, 418, 423, 430, 437, 444, 451, 455, - 460, 461, 463, 465, 467, 471, 475, 479, 483, 487, - 491, 493, 494, 496, 498, 500, 501, 504, 508, 510, - 512, 516, 518, 519, 528, 530, 532, 536, 538, 540, - 544, 545, 547, 549, 553, 554, 556, 558, 560, 562, - 564, 566, 568, 570, 572, 576, 578, 584, 586, 588, - 590, 592, 595, 598, 600, 603, 606, 607, 609, 612, - 615, 619, 629, 639, 648, 663, 665, 667, 674, 680, - 683, 690, 698, 700, 704, 706, 707, 710, 712, 718, - 724, 730, 733, 738, 743, 750, 755, 760, 767, 774, - 777, 785, 787, 790, 791, 793, 794, 798, 805, 809, - 816, 819, 824, 831 + 201, 203, 205, 207, 209, 212, 217, 223, 229, 233, + 236, 239, 241, 245, 247, 251, 253, 254, 259, 263, + 267, 272, 277, 281, 284, 287, 290, 293, 296, 299, + 302, 305, 308, 311, 318, 324, 333, 340, 347, 354, + 361, 368, 377, 386, 390, 392, 394, 396, 398, 401, + 404, 409, 412, 414, 416, 418, 423, 426, 431, 438, + 445, 452, 459, 463, 468, 469, 471, 473, 475, 479, + 483, 487, 491, 495, 499, 501, 502, 504, 506, 508, + 509, 512, 516, 518, 520, 524, 526, 527, 536, 538, + 540, 544, 546, 548, 552, 553, 555, 557, 561, 562, + 564, 566, 568, 570, 572, 574, 576, 578, 580, 584, + 586, 592, 594, 596, 598, 600, 603, 606, 608, 611, + 614, 615, 617, 619, 621, 624, 627, 631, 641, 651, + 660, 675, 677, 679, 686, 692, 695, 702, 710, 712, + 716, 718, 719, 722, 724, 730, 736, 742, 745, 750, + 755, 762, 767, 772, 779, 786, 789, 797, 799, 802, + 803, 805, 806, 810, 817, 821, 828, 831, 836, 843 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const short int yyrhs[] = { - 171, 0, -1, 19, -1, 20, -1, 17, -1, 18, - -1, 78, -1, 79, -1, 80, -1, 81, -1, 82, - -1, 83, -1, 84, -1, 85, -1, 86, -1, 87, - -1, 88, -1, 89, -1, 90, -1, 91, -1, 92, - -1, 93, -1, 94, -1, 95, -1, 104, -1, 105, - -1, 106, -1, 107, -1, 113, -1, 114, -1, 115, - -1, 116, -1, 117, -1, 118, -1, 119, -1, 120, - -1, 121, -1, 122, -1, 123, -1, 124, -1, 112, - -1, 11, -1, 9, -1, 7, -1, 5, -1, 12, - -1, 10, -1, 8, -1, 6, -1, 147, -1, 148, - -1, 13, -1, 14, -1, 179, 125, -1, -1, 42, - -1, 43, -1, 44, -1, 48, -1, 45, -1, 46, - -1, 47, -1, -1, 65, -1, 66, -1, 67, -1, - 68, -1, 69, -1, 70, -1, 64, 18, -1, -1, - -1, 57, 18, -1, -1, 126, 57, 18, -1, 37, - 30, -1, -1, 156, -1, -1, 126, 159, 158, -1, - 156, -1, 57, 18, -1, 162, -1, 3, -1, 164, - -1, 3, -1, 164, -1, 4, -1, 5, -1, 6, - -1, 7, -1, 8, -1, 9, -1, 10, -1, 11, - -1, 12, -1, 13, -1, 14, -1, 15, -1, 16, - -1, 193, -1, 163, -1, 127, 18, -1, 161, 128, - 166, 129, -1, 130, 18, 131, 164, 132, -1, 133, - 18, 131, 164, 134, -1, 135, 165, 136, -1, 135, - 136, -1, 164, 137, -1, 164, -1, 165, 126, 164, - -1, 165, -1, 165, 126, 40, -1, 40, -1, -1, - 162, 130, 169, 132, -1, 162, 130, 132, -1, 162, - 138, 30, -1, 162, 133, 169, 134, -1, 162, 135, - 169, 136, -1, 162, 135, 136, -1, 162, 22, -1, - 162, 23, -1, 162, 193, -1, 162, 168, -1, 162, - 24, -1, 147, 141, -1, 148, 18, -1, 4, 25, - -1, 4, 26, -1, 150, 21, -1, 146, 128, 167, - 39, 162, 129, -1, 101, 128, 167, 207, 129, -1, - 103, 128, 167, 126, 167, 126, 167, 129, -1, 142, - 128, 167, 126, 167, 129, -1, 143, 128, 167, 126, - 167, 129, -1, 144, 128, 167, 126, 167, 129, -1, - 145, 128, 167, 126, 167, 129, -1, 109, 128, 167, - 126, 167, 129, -1, 110, 128, 167, 126, 167, 126, - 167, 129, -1, 111, 128, 167, 126, 167, 126, 167, - 129, -1, 169, 126, 167, -1, 167, -1, 35, -1, - 36, -1, 172, -1, 172, 188, -1, 172, 190, -1, - 172, 62, 61, 174, -1, 172, 31, -1, 173, -1, - 173, 151, 27, 160, -1, 173, 190, -1, 173, 62, - 61, 174, -1, 173, 151, 152, 170, 167, 158, -1, - 173, 151, 50, 170, 162, 158, -1, 173, 151, 45, - 170, 162, 158, -1, 173, 151, 47, 170, 162, 158, - -1, 173, 51, 176, -1, 173, 58, 125, 177, -1, - -1, 30, -1, 56, -1, 55, -1, 53, 125, 175, - -1, 54, 125, 18, -1, 52, 125, 30, -1, 71, - 125, 30, -1, 130, 178, 132, -1, 178, 126, 30, - -1, 30, -1, -1, 28, -1, 30, -1, 179, -1, - -1, 162, 180, -1, 182, 126, 181, -1, 181, -1, - 182, -1, 182, 126, 40, -1, 40, -1, -1, 153, - 160, 179, 128, 183, 129, 157, 154, -1, 32, -1, - 135, -1, 152, 184, 185, -1, 33, -1, 136, -1, - 186, 196, 187, -1, -1, 45, -1, 47, -1, 34, - 189, 184, -1, -1, 63, -1, 17, -1, 18, -1, - 21, -1, 25, -1, 26, -1, 22, -1, 23, -1, - 24, -1, 133, 169, 134, -1, 168, -1, 61, 191, - 30, 126, 30, -1, 140, -1, 179, -1, 193, -1, - 192, -1, 162, 194, -1, 196, 197, -1, 197, -1, - 198, 199, -1, 198, 201, -1, -1, 29, -1, 72, - 195, -1, 72, 3, -1, 73, 15, 194, -1, 73, - 4, 194, 126, 15, 194, 126, 15, 194, -1, 74, - 149, 194, 126, 15, 194, 130, 200, 132, -1, 74, - 149, 194, 126, 15, 194, 130, 132, -1, 151, 75, - 153, 160, 194, 128, 204, 129, 39, 15, 194, 76, - 15, 194, -1, 76, -1, 77, -1, 200, 149, 192, - 126, 15, 194, -1, 149, 192, 126, 15, 194, -1, - 151, 206, -1, 162, 130, 194, 126, 194, 132, -1, - 202, 126, 130, 194, 126, 194, 132, -1, 195, -1, - 203, 126, 195, -1, 203, -1, -1, 60, 59, -1, - 59, -1, 142, 162, 194, 126, 194, -1, 143, 162, - 194, 126, 194, -1, 144, 162, 194, 126, 194, -1, - 49, 195, -1, 145, 195, 126, 195, -1, 146, 195, - 39, 162, -1, 103, 195, 126, 195, 126, 195, -1, - 108, 195, 126, 162, -1, 109, 195, 126, 195, -1, - 110, 195, 126, 195, 126, 195, -1, 111, 195, 126, - 195, 126, 195, -1, 102, 202, -1, 205, 153, 160, - 194, 128, 204, 129, -1, 209, -1, 126, 203, -1, - -1, 38, -1, -1, 96, 162, 155, -1, 96, 162, - 126, 10, 194, 155, -1, 97, 162, 155, -1, 97, - 162, 126, 10, 194, 155, -1, 98, 195, -1, 208, - 99, 162, 194, -1, 208, 100, 195, 126, 162, 194, - -1, 101, 162, 194, 207, -1 + 175, 0, -1, 19, -1, 20, -1, 17, -1, 18, + -1, 80, -1, 81, -1, 82, -1, 83, -1, 84, + -1, 85, -1, 86, -1, 87, -1, 88, -1, 89, + -1, 90, -1, 91, -1, 92, -1, 93, -1, 94, + -1, 95, -1, 96, -1, 97, -1, 98, -1, 99, + -1, 108, -1, 109, -1, 110, -1, 111, -1, 117, + -1, 118, -1, 119, -1, 120, -1, 121, -1, 122, + -1, 123, -1, 124, -1, 125, -1, 126, -1, 127, + -1, 128, -1, 116, -1, 11, -1, 9, -1, 7, + -1, 5, -1, 12, -1, 10, -1, 8, -1, 6, + -1, 151, -1, 152, -1, 13, -1, 14, -1, 184, + 129, -1, -1, 42, -1, 43, -1, 44, -1, 48, + -1, 45, -1, 46, -1, 47, -1, -1, 66, -1, + 67, -1, 68, -1, 69, -1, 70, -1, 71, -1, + 65, 18, -1, -1, -1, 57, 18, -1, -1, 130, + 57, 18, -1, 37, 30, -1, -1, 160, -1, -1, + 130, 163, 162, -1, 160, -1, 57, 18, -1, 166, + -1, 3, -1, 168, -1, 3, -1, 168, -1, 4, + -1, 5, -1, 6, -1, 7, -1, 8, -1, 9, + -1, 10, -1, 11, -1, 12, -1, 13, -1, 14, + -1, 15, -1, 16, -1, 198, -1, 167, -1, 131, + 18, -1, 165, 132, 170, 133, -1, 134, 18, 135, + 168, 136, -1, 137, 18, 135, 168, 138, -1, 139, + 169, 140, -1, 139, 140, -1, 168, 141, -1, 168, + -1, 169, 130, 168, -1, 169, -1, 169, 130, 40, + -1, 40, -1, -1, 166, 134, 173, 136, -1, 166, + 134, 136, -1, 166, 142, 30, -1, 166, 137, 173, + 138, -1, 166, 139, 173, 140, -1, 166, 139, 140, + -1, 166, 22, -1, 166, 23, -1, 166, 198, -1, + 166, 172, -1, 166, 24, -1, 151, 145, -1, 152, + 18, -1, 4, 25, -1, 4, 26, -1, 154, 21, + -1, 150, 132, 171, 39, 166, 133, -1, 105, 132, + 171, 213, 133, -1, 107, 132, 171, 130, 171, 130, + 171, 133, -1, 146, 132, 171, 130, 171, 133, -1, + 147, 132, 171, 130, 171, 133, -1, 148, 132, 171, + 130, 171, 133, -1, 149, 132, 171, 130, 171, 133, + -1, 113, 132, 171, 130, 171, 133, -1, 114, 132, + 171, 130, 171, 130, 171, 133, -1, 115, 132, 171, + 130, 171, 130, 171, 133, -1, 173, 130, 171, -1, + 171, -1, 35, -1, 36, -1, 176, -1, 176, 193, + -1, 176, 195, -1, 176, 63, 62, 179, -1, 176, + 31, -1, 178, -1, 50, -1, 58, -1, 178, 155, + 27, 164, -1, 178, 195, -1, 178, 63, 62, 179, + -1, 178, 155, 156, 174, 171, 162, -1, 178, 155, + 177, 174, 166, 162, -1, 178, 155, 45, 174, 166, + 162, -1, 178, 155, 47, 174, 166, 162, -1, 178, + 51, 181, -1, 178, 59, 129, 182, -1, -1, 30, + -1, 56, -1, 55, -1, 53, 129, 180, -1, 54, + 129, 18, -1, 52, 129, 30, -1, 72, 129, 30, + -1, 134, 183, 136, -1, 183, 130, 30, -1, 30, + -1, -1, 28, -1, 30, -1, 184, -1, -1, 166, + 185, -1, 187, 130, 186, -1, 186, -1, 187, -1, + 187, 130, 40, -1, 40, -1, -1, 157, 164, 184, + 132, 188, 133, 161, 158, -1, 32, -1, 139, -1, + 156, 189, 190, -1, 33, -1, 140, -1, 191, 201, + 192, -1, -1, 45, -1, 47, -1, 34, 194, 189, + -1, -1, 64, -1, 17, -1, 18, -1, 21, -1, + 25, -1, 26, -1, 22, -1, 23, -1, 24, -1, + 137, 173, 138, -1, 172, -1, 62, 196, 30, 130, + 30, -1, 144, -1, 184, -1, 198, -1, 197, -1, + 166, 199, -1, 201, 202, -1, 202, -1, 203, 205, + -1, 203, 207, -1, -1, 29, -1, 78, -1, 77, + -1, 73, 200, -1, 73, 3, -1, 74, 15, 199, + -1, 74, 4, 199, 130, 15, 199, 130, 15, 199, + -1, 75, 153, 199, 130, 15, 199, 134, 206, 136, + -1, 75, 153, 199, 130, 15, 199, 134, 136, -1, + 155, 76, 157, 164, 199, 132, 210, 133, 39, 15, + 199, 204, 15, 199, -1, 204, -1, 79, -1, 206, + 153, 197, 130, 15, 199, -1, 153, 197, 130, 15, + 199, -1, 155, 212, -1, 166, 134, 199, 130, 199, + 136, -1, 208, 130, 134, 199, 130, 199, 136, -1, + 200, -1, 209, 130, 200, -1, 209, -1, -1, 61, + 60, -1, 60, -1, 146, 166, 199, 130, 199, -1, + 147, 166, 199, 130, 199, -1, 148, 166, 199, 130, + 199, -1, 49, 200, -1, 149, 200, 130, 200, -1, + 150, 200, 39, 166, -1, 107, 200, 130, 200, 130, + 200, -1, 112, 200, 130, 166, -1, 113, 200, 130, + 200, -1, 114, 200, 130, 200, 130, 200, -1, 115, + 200, 130, 200, 130, 200, -1, 106, 208, -1, 211, + 157, 164, 199, 132, 210, 133, -1, 215, -1, 130, + 209, -1, -1, 38, -1, -1, 100, 166, 159, -1, + 100, 166, 130, 10, 199, 159, -1, 101, 166, 159, + -1, 101, 166, 130, 10, 199, 159, -1, 102, 200, + -1, 214, 103, 166, 199, -1, 214, 104, 200, 130, + 166, 199, -1, 105, 166, 199, 213, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const unsigned short int yyrline[] = { - 0, 271, 271, 271, 272, 272, 276, 276, 276, 276, - 276, 276, 276, 276, 276, 277, 277, 277, 278, 278, - 278, 278, 278, 278, 279, 279, 279, 279, 280, 280, - 280, 280, 280, 280, 280, 281, 281, 281, 281, 281, - 281, 286, 286, 286, 286, 287, 287, 287, 287, 288, - 288, 289, 289, 292, 295, 300, 300, 300, 300, 300, - 300, 301, 302, 305, 305, 305, 305, 305, 306, 307, - 312, 317, 318, 321, 322, 330, 336, 337, 340, 341, - 350, 351, 364, 364, 365, 365, 366, 370, 370, 370, - 370, 370, 370, 370, 371, 371, 371, 371, 371, 373, - 377, 381, 386, 391, 397, 404, 411, 417, 421, 431, - 434, 442, 443, 448, 451, 461, 467, 472, 478, 484, - 490, 495, 501, 507, 513, 519, 525, 531, 537, 543, - 549, 557, 571, 583, 588, 593, 598, 603, 611, 616, - 621, 631, 636, 641, 641, 651, 656, 659, 664, 668, - 672, 675, 686, 691, 696, 703, 710, 717, 724, 729, - 734, 739, 741, 741, 744, 749, 756, 761, 768, 775, - 780, 781, 789, 789, 790, 790, 792, 799, 803, 807, - 810, 815, 818, 820, 840, 843, 847, 856, 857, 859, - 867, 868, 869, 873, 886, 887, 890, 890, 890, 890, - 890, 890, 890, 891, 892, 897, 898, 907, 907, 911, - 917, 928, 934, 937, 945, 949, 954, 957, 963, 968, - 973, 978, 986, 993, 999, 1019, 1024, 1030, 1035, 1043, - 1052, 1059, 1067, 1071, 1078, 1079, 1083, 1088, 1091, 1096, - 1101, 1106, 1111, 1119, 1133, 1138, 1143, 1148, 1153, 1158, - 1163, 1180, 1185, 1186, 1190, 1191, 1194, 1201, 1208, 1215, - 1222, 1227, 1234, 1241 + 0, 299, 299, 299, 300, 300, 304, 304, 304, 304, + 304, 304, 304, 305, 305, 305, 305, 306, 306, 306, + 307, 307, 307, 307, 307, 307, 308, 308, 308, 308, + 309, 309, 309, 309, 309, 309, 309, 310, 310, 310, + 310, 310, 310, 315, 315, 315, 315, 316, 316, 316, + 316, 317, 317, 318, 318, 321, 324, 329, 329, 329, + 329, 329, 329, 330, 331, 334, 334, 334, 334, 334, + 335, 336, 341, 346, 347, 350, 351, 359, 365, 366, + 369, 370, 379, 380, 393, 393, 394, 394, 395, 399, + 399, 399, 399, 399, 399, 399, 400, 400, 400, 400, + 400, 402, 406, 410, 413, 418, 424, 432, 440, 446, + 450, 461, 464, 472, 473, 478, 481, 491, 497, 502, + 508, 514, 520, 525, 531, 537, 543, 549, 555, 561, + 567, 573, 579, 587, 601, 613, 618, 624, 629, 634, + 642, 647, 652, 662, 667, 672, 672, 682, 687, 690, + 695, 699, 703, 705, 705, 708, 720, 725, 730, 737, + 744, 751, 758, 763, 768, 773, 775, 775, 778, 783, + 790, 795, 802, 809, 814, 815, 823, 823, 824, 824, + 826, 833, 837, 841, 844, 849, 852, 854, 874, 875, + 877, 886, 887, 889, 897, 898, 899, 903, 916, 917, + 920, 920, 920, 920, 920, 920, 920, 921, 922, 927, + 928, 937, 937, 941, 947, 958, 964, 967, 975, 979, + 984, 987, 993, 993, 995, 1000, 1005, 1010, 1018, 1025, + 1031, 1051, 1056, 1062, 1067, 1075, 1084, 1091, 1099, 1103, + 1110, 1111, 1115, 1120, 1123, 1129, 1134, 1139, 1144, 1152, + 1166, 1171, 1176, 1181, 1186, 1191, 1196, 1213, 1218, 1219, + 1223, 1224, 1227, 1234, 1241, 1248, 1255, 1260, 1267, 1274 }; #endif @@ -934,30 +972,31 @@ static const char *const yytname[] = "VOLATILE", "TO", "DOTDOTDOT", "CONST", "INTERNAL", "LINKONCE", "WEAK", "DLLIMPORT", "DLLEXPORT", "EXTERN_WEAK", "APPENDING", "NOT", "EXTERNAL", "TARGET", "TRIPLE", "ENDIAN", "POINTERSIZE", "LITTLE", "BIG", "ALIGN", - "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", "SIDEEFFECT", "CC_TOK", - "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK", "COLDCC_TOK", - "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT", "RET", "BR", - "SWITCH", "INVOKE", "UNWIND", "UNREACHABLE", "ADD", "SUB", "MUL", "UDIV", - "SDIV", "FDIV", "UREM", "SREM", "FREM", "AND", "OR", "XOR", "SETLE", - "SETGE", "SETLT", "SETGT", "SETEQ", "SETNE", "MALLOC", "ALLOCA", "FREE", - "LOAD", "STORE", "GETELEMENTPTR", "PHI_TOK", "SELECT", "SHL", "SHR", - "ASHR", "LSHR", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", - "SHUFFLEVECTOR", "CAST", "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", - "FPTOUI", "FPTOSI", "UITOFP", "SITOFP", "PTRTOINT", "INTTOPTR", - "BITCAST", "'='", "','", "'\\\\'", "'('", "')'", "'['", "'x'", "']'", - "'<'", "'>'", "'{'", "'}'", "'*'", "'c'", "$accept", "IntVal", - "EInt64Val", "ArithmeticOps", "LogicalOps", "SetCondOps", "ShiftOps", - "CastOps", "SIntType", "UIntType", "IntType", "FPType", "OptAssign", - "OptLinkage", "OptCallingConv", "OptAlign", "OptCAlign", "SectionString", - "OptSection", "GlobalVarAttributes", "GlobalVarAttribute", "TypesV", - "UpRTypesV", "Types", "PrimType", "UpRTypes", "TypeListI", - "ArgTypeListI", "ConstVal", "ConstExpr", "ConstVector", "GlobalType", - "Module", "DefinitionList", "ConstPool", "AsmBlock", "BigOrLittle", - "TargetDefinition", "LibrariesDefinition", "LibList", "Name", "OptName", - "ArgVal", "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", - "FunctionHeader", "END", "Function", "FnDeclareLinkage", "FunctionProto", - "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef", - "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList", + "UNINITIALIZED", "DEPLIBS", "CALL", "TAIL", "ASM_TOK", "MODULE", + "SIDEEFFECT", "CC_TOK", "CCC_TOK", "CSRETCC_TOK", "FASTCC_TOK", + "COLDCC_TOK", "X86_STDCALLCC_TOK", "X86_FASTCALLCC_TOK", "DATALAYOUT", + "RET", "BR", "SWITCH", "INVOKE", "EXCEPT", "UNWIND", "UNREACHABLE", + "ADD", "SUB", "MUL", "DIV", "UDIV", "SDIV", "FDIV", "REM", "UREM", + "SREM", "FREM", "AND", "OR", "XOR", "SETLE", "SETGE", "SETLT", "SETGT", + "SETEQ", "SETNE", "MALLOC", "ALLOCA", "FREE", "LOAD", "STORE", + "GETELEMENTPTR", "PHI_TOK", "SELECT", "SHL", "SHR", "ASHR", "LSHR", + "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR", "CAST", + "TRUNC", "ZEXT", "SEXT", "FPTRUNC", "FPEXT", "FPTOUI", "FPTOSI", + "UITOFP", "SITOFP", "PTRTOINT", "INTTOPTR", "BITCAST", "'='", "','", + "'\\\\'", "'('", "')'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'", + "'*'", "'c'", "$accept", "IntVal", "EInt64Val", "ArithmeticOps", + "LogicalOps", "SetCondOps", "ShiftOps", "CastOps", "SIntType", + "UIntType", "IntType", "FPType", "OptAssign", "OptLinkage", + "OptCallingConv", "OptAlign", "OptCAlign", "SectionString", "OptSection", + "GlobalVarAttributes", "GlobalVarAttribute", "TypesV", "UpRTypesV", + "Types", "PrimType", "UpRTypes", "TypeListI", "ArgTypeListI", "ConstVal", + "ConstExpr", "ConstVector", "GlobalType", "Module", "DefinitionList", + "External", "ConstPool", "AsmBlock", "BigOrLittle", "TargetDefinition", + "LibrariesDefinition", "LibList", "Name", "OptName", "ArgVal", + "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader", + "END", "Function", "FnDeclareLinkage", "FunctionProto", "OptSideEffect", + "ConstValueRef", "SymbolicValueRef", "ValueRef", "ResolvedVal", + "BasicBlockList", "BasicBlock", "InstructionList", "Unwind", "BBTerminatorInst", "JumpTable", "Inst", "PHIList", "ValueRefList", "ValueRefListE", "OptTailCall", "InstVal", "IndexList", "OptVolatile", "MemoryInst", 0 @@ -981,41 +1020,42 @@ static const unsigned short int yytoknum[] = 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, - 375, 376, 377, 378, 379, 61, 44, 92, 40, 41, - 91, 120, 93, 60, 62, 123, 125, 42, 99 + 375, 376, 377, 378, 379, 380, 381, 382, 383, 61, + 44, 92, 40, 41, 91, 120, 93, 60, 62, 123, + 125, 42, 99 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const unsigned char yyr1[] = { - 0, 139, 140, 140, 141, 141, 142, 142, 142, 142, - 142, 142, 142, 142, 142, 143, 143, 143, 144, 144, - 144, 144, 144, 144, 145, 145, 145, 145, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 146, 147, 147, 147, 147, 148, 148, 148, 148, 149, - 149, 150, 150, 151, 151, 152, 152, 152, 152, 152, - 152, 152, 152, 153, 153, 153, 153, 153, 153, 153, - 153, 154, 154, 155, 155, 156, 157, 157, 158, 158, - 159, 159, 160, 160, 161, 161, 162, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 164, - 164, 164, 164, 164, 164, 164, 164, 164, 164, 165, - 165, 166, 166, 166, 166, 167, 167, 167, 167, 167, + 0, 143, 144, 144, 145, 145, 146, 146, 146, 146, + 146, 146, 146, 146, 146, 146, 146, 147, 147, 147, + 148, 148, 148, 148, 148, 148, 149, 149, 149, 149, + 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, + 150, 150, 150, 151, 151, 151, 151, 152, 152, 152, + 152, 153, 153, 154, 154, 155, 155, 156, 156, 156, + 156, 156, 156, 156, 156, 157, 157, 157, 157, 157, + 157, 157, 157, 158, 158, 159, 159, 160, 161, 161, + 162, 162, 163, 163, 164, 164, 165, 165, 166, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, 168, 168, 168, 168, 168, 168, 168, 168, 168, - 168, 169, 169, 170, 170, 171, 172, 172, 172, 172, - 172, 173, 173, 173, 173, 173, 173, 173, 173, 173, - 173, 174, 175, 175, 176, 176, 176, 176, 177, 178, - 178, 178, 179, 179, 180, 180, 181, 182, 182, 183, - 183, 183, 183, 184, 185, 185, 186, 187, 187, 188, - 189, 189, 189, 190, 191, 191, 192, 192, 192, 192, - 192, 192, 192, 192, 192, 192, 192, 193, 193, 194, - 194, 195, 196, 196, 197, 198, 198, 198, 199, 199, - 199, 199, 199, 199, 199, 199, 199, 200, 200, 201, - 202, 202, 203, 203, 204, 204, 205, 205, 206, 206, - 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, - 206, 206, 207, 207, 208, 208, 209, 209, 209, 209, - 209, 209, 209, 209 + 168, 169, 169, 170, 170, 170, 170, 171, 171, 171, + 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, + 171, 171, 171, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 173, 173, 174, 174, 175, 176, 176, + 176, 176, 176, 177, 177, 178, 178, 178, 178, 178, + 178, 178, 178, 178, 178, 179, 180, 180, 181, 181, + 181, 181, 182, 183, 183, 183, 184, 184, 185, 185, + 186, 187, 187, 188, 188, 188, 188, 189, 190, 190, + 191, 192, 192, 193, 194, 194, 194, 195, 196, 196, + 197, 197, 197, 197, 197, 197, 197, 197, 197, 197, + 197, 198, 198, 199, 199, 200, 201, 201, 202, 203, + 203, 203, 204, 204, 205, 205, 205, 205, 205, 205, + 205, 205, 205, 206, 206, 207, 208, 208, 209, 209, + 210, 210, 211, 211, 212, 212, 212, 212, 212, 212, + 212, 212, 212, 212, 212, 212, 212, 212, 213, 213, + 214, 214, 215, 215, 215, 215, 215, 215, 215, 215 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1026,28 +1066,28 @@ static const unsigned char yyr2[] = 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, 2, 0, 1, 1, 1, 1, 1, - 1, 1, 0, 1, 1, 1, 1, 1, 1, 2, - 0, 0, 2, 0, 3, 2, 0, 1, 0, 3, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, + 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, + 1, 2, 0, 0, 2, 0, 3, 2, 0, 1, + 0, 3, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 2, 4, 5, 5, 3, 2, 2, 1, - 3, 1, 3, 1, 0, 4, 3, 3, 4, 4, - 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 6, 5, 8, 6, 6, 6, 6, 6, 8, - 8, 3, 1, 1, 1, 1, 2, 2, 4, 2, - 1, 4, 2, 4, 6, 6, 6, 6, 3, 4, - 0, 1, 1, 1, 3, 3, 3, 3, 3, 3, - 1, 0, 1, 1, 1, 0, 2, 3, 1, 1, - 3, 1, 0, 8, 1, 1, 3, 1, 1, 3, - 0, 1, 1, 3, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 3, 1, 5, 1, 1, 1, - 1, 2, 2, 1, 2, 2, 0, 1, 2, 2, - 3, 9, 9, 8, 14, 1, 1, 6, 5, 2, - 6, 7, 1, 3, 1, 0, 2, 1, 5, 5, - 5, 2, 4, 4, 6, 4, 4, 6, 6, 2, - 7, 1, 2, 0, 1, 0, 3, 6, 3, 6, - 2, 4, 6, 4 + 1, 1, 1, 1, 2, 4, 5, 5, 3, 2, + 2, 1, 3, 1, 3, 1, 0, 4, 3, 3, + 4, 4, 3, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 6, 5, 8, 6, 6, 6, 6, + 6, 8, 8, 3, 1, 1, 1, 1, 2, 2, + 4, 2, 1, 1, 1, 4, 2, 4, 6, 6, + 6, 6, 3, 4, 0, 1, 1, 1, 3, 3, + 3, 3, 3, 3, 1, 0, 1, 1, 1, 0, + 2, 3, 1, 1, 3, 1, 0, 8, 1, 1, + 3, 1, 1, 3, 0, 1, 1, 3, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, + 5, 1, 1, 1, 1, 2, 2, 1, 2, 2, + 0, 1, 1, 1, 2, 2, 3, 9, 9, 8, + 14, 1, 1, 6, 5, 2, 6, 7, 1, 3, + 1, 0, 2, 1, 5, 5, 5, 2, 4, 4, + 6, 4, 4, 6, 6, 2, 7, 1, 2, 0, + 1, 0, 3, 6, 3, 6, 2, 4, 6, 4 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -1055,485 +1095,483 @@ static const unsigned char yyr2[] = means the default is an error. */ static const unsigned short int yydefact[] = { - 160, 0, 62, 150, 1, 149, 190, 55, 56, 57, - 59, 60, 61, 58, 0, 70, 216, 146, 147, 172, - 173, 0, 0, 0, 62, 0, 152, 191, 192, 70, - 0, 0, 63, 64, 65, 66, 67, 68, 0, 0, - 217, 216, 213, 54, 0, 0, 0, 0, 158, 0, - 0, 0, 0, 0, 0, 0, 53, 193, 161, 148, - 69, 83, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 2, 3, 0, 0, 0, - 0, 207, 0, 0, 82, 101, 86, 208, 100, 184, - 185, 186, 187, 188, 189, 212, 0, 0, 0, 225, - 226, 255, 214, 215, 0, 0, 0, 0, 171, 159, - 153, 151, 143, 144, 0, 0, 0, 0, 102, 0, - 0, 85, 107, 109, 0, 0, 114, 108, 219, 0, - 218, 0, 0, 44, 48, 43, 47, 42, 46, 41, - 45, 49, 50, 0, 254, 0, 237, 0, 70, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 0, 0, 0, - 0, 0, 0, 24, 25, 26, 27, 0, 0, 0, - 0, 40, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 0, 0, 0, 0, 0, 70, - 229, 0, 251, 166, 163, 162, 164, 165, 167, 170, - 0, 78, 78, 78, 87, 88, 89, 90, 91, 92, - 93, 94, 95, 96, 97, 0, 0, 0, 0, 78, - 0, 0, 0, 106, 182, 113, 111, 0, 196, 197, - 198, 201, 202, 203, 199, 200, 194, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 205, 210, - 209, 211, 0, 220, 0, 241, 236, 0, 73, 73, - 260, 0, 0, 249, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 168, 0, - 156, 157, 155, 128, 129, 4, 5, 126, 127, 130, - 121, 122, 125, 0, 0, 0, 0, 124, 123, 154, - 84, 84, 110, 181, 175, 178, 179, 0, 0, 103, - 195, 0, 0, 0, 0, 0, 0, 142, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 256, 0, - 258, 253, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 169, 0, 0, - 80, 78, 116, 0, 0, 120, 0, 117, 104, 105, - 174, 176, 0, 76, 112, 0, 253, 0, 0, 0, - 0, 0, 204, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 263, 0, 0, 0, 245, - 246, 0, 0, 0, 0, 0, 242, 243, 0, 261, - 0, 75, 81, 79, 115, 118, 119, 180, 177, 77, - 71, 0, 0, 0, 0, 0, 0, 141, 0, 0, - 0, 0, 0, 0, 0, 235, 73, 74, 73, 232, - 252, 0, 0, 0, 0, 0, 238, 239, 240, 235, - 0, 0, 183, 206, 132, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 234, 0, 0, 257, - 259, 0, 0, 0, 244, 247, 248, 0, 262, 72, - 0, 138, 0, 0, 134, 135, 136, 137, 131, 0, - 223, 0, 0, 0, 233, 230, 0, 250, 0, 0, - 0, 221, 0, 222, 0, 0, 231, 133, 139, 140, - 0, 0, 0, 0, 0, 0, 228, 0, 0, 227, - 0, 224 + 164, 0, 64, 152, 1, 151, 194, 57, 58, 59, + 61, 62, 63, 60, 0, 72, 220, 148, 149, 176, + 177, 0, 0, 0, 64, 0, 156, 195, 196, 72, + 0, 0, 65, 66, 67, 68, 69, 70, 0, 0, + 221, 220, 217, 56, 0, 0, 0, 0, 162, 0, + 0, 0, 0, 0, 153, 154, 0, 0, 55, 197, + 165, 150, 71, 85, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 2, 3, 0, + 0, 0, 0, 211, 0, 0, 84, 103, 88, 212, + 102, 188, 189, 190, 191, 192, 193, 216, 0, 0, + 0, 223, 222, 232, 261, 231, 218, 219, 0, 0, + 0, 0, 175, 163, 157, 155, 145, 146, 0, 0, + 0, 0, 104, 0, 0, 87, 109, 111, 0, 0, + 116, 110, 225, 0, 224, 0, 0, 46, 50, 45, + 49, 44, 48, 43, 47, 51, 52, 0, 260, 0, + 243, 0, 72, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, + 23, 24, 25, 0, 0, 0, 0, 0, 0, 26, + 27, 28, 29, 0, 0, 0, 0, 42, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 0, 0, 0, 0, 0, 72, 235, 0, 257, 170, + 167, 166, 168, 169, 171, 174, 0, 80, 80, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 0, 0, 0, 0, 80, 80, 0, 0, 0, 108, + 186, 115, 113, 0, 200, 201, 202, 205, 206, 207, + 203, 204, 198, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 209, 214, 213, 215, 0, 226, + 0, 247, 242, 0, 75, 75, 266, 0, 0, 255, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 172, 0, 160, 161, 130, 131, + 4, 5, 128, 129, 132, 123, 124, 127, 0, 0, + 0, 0, 126, 125, 158, 159, 86, 86, 112, 185, + 179, 182, 183, 0, 0, 105, 199, 0, 0, 0, + 0, 0, 0, 144, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 262, 0, 264, 259, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 173, 0, 0, 82, 80, 118, 0, + 0, 122, 0, 119, 106, 107, 178, 180, 0, 78, + 114, 0, 259, 0, 0, 0, 0, 0, 208, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 269, 0, 0, 0, 251, 252, 0, 0, 0, + 0, 0, 248, 249, 0, 267, 0, 77, 83, 81, + 117, 120, 121, 184, 181, 79, 73, 0, 0, 0, + 0, 0, 0, 143, 0, 0, 0, 0, 0, 0, + 0, 241, 75, 76, 75, 238, 258, 0, 0, 0, + 0, 0, 244, 245, 246, 241, 0, 0, 187, 210, + 134, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 240, 0, 0, 263, 265, 0, 0, 0, + 250, 253, 254, 0, 268, 74, 0, 140, 0, 0, + 136, 137, 138, 139, 133, 0, 229, 0, 0, 0, + 239, 236, 0, 256, 0, 0, 0, 227, 0, 228, + 0, 0, 237, 135, 141, 142, 0, 0, 0, 0, + 0, 0, 234, 0, 0, 233, 0, 230 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short int yydefgoto[] = { - -1, 81, 297, 253, 254, 255, 256, 257, 225, 226, - 143, 227, 24, 15, 38, 452, 338, 360, 420, 290, - 361, 82, 83, 228, 85, 86, 124, 237, 327, 258, - 328, 114, 1, 2, 3, 59, 206, 48, 109, 210, - 87, 371, 315, 316, 317, 39, 91, 16, 94, 17, - 29, 18, 321, 259, 88, 261, 439, 41, 42, 43, - 102, 492, 103, 273, 466, 467, 199, 200, 395, 201, - 202 + -1, 83, 302, 259, 260, 261, 262, 263, 230, 231, + 147, 232, 24, 15, 38, 458, 344, 366, 426, 296, + 367, 84, 85, 233, 87, 88, 128, 243, 333, 264, + 334, 118, 1, 2, 57, 3, 61, 212, 48, 113, + 216, 89, 377, 321, 322, 323, 39, 93, 16, 96, + 17, 29, 18, 327, 265, 90, 267, 445, 41, 42, + 43, 105, 106, 498, 107, 279, 472, 473, 205, 206, + 401, 207, 208 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -472 +#define YYPACT_NINF -477 static const short int yypact[] = { - -472, 38, 138, 1015, -472, -472, 59, -472, -472, -472, - -472, -472, -472, -472, -2, 80, 35, -472, -472, -472, - -472, -29, -50, 18, 174, -37, -472, -472, -472, 80, - 73, 93, -472, -472, -472, -472, -472, -472, 744, -22, - -472, -21, -472, 9, 3, 12, 54, 64, -472, 37, - 73, 744, 84, 84, 84, 84, -472, -472, -472, -472, - -472, 62, -472, -472, -472, -472, -472, -472, -472, -472, - -472, -472, -472, -472, -472, -472, -472, 173, 176, 177, - 431, -472, 86, 69, -472, -472, -106, -472, -472, -472, - -472, -472, -472, -472, -472, -472, 772, 28, 343, -472, - -472, 1211, -472, -472, 162, 66, 180, 169, 172, -472, - -472, -472, -472, -472, 802, 802, 802, 831, -472, 72, - 74, -472, -472, -106, -46, 76, 504, -472, 62, 1011, - -472, 1011, 1011, -472, -472, -472, -472, -472, -472, -472, - -472, -472, -472, 1011, -472, 802, -472, 148, 80, -472, - -472, -472, -472, -472, -472, -472, -472, -472, -472, -472, - -472, -472, -472, -472, -472, -472, -472, 802, 802, 802, - 802, 802, 802, -472, -472, -472, -472, 802, 802, 802, - 802, -472, -472, -472, -472, -472, -472, -472, -472, -472, - -472, -472, -472, -472, 802, 802, 802, 802, 802, 80, - -472, 24, -472, -472, -472, -472, -472, -472, -472, -472, - -70, 83, 83, 83, 101, 118, 192, 137, 193, 147, - 194, 153, 195, 204, 207, 170, 197, 209, 889, 83, - 802, 802, 802, -472, 565, -472, 105, 103, -472, -472, - -472, -472, -472, -472, -472, -472, 171, 107, 108, 109, - 110, 113, 831, 114, 115, 116, 117, 122, -472, -472, - -472, -472, 127, -472, 128, -472, -472, 744, 129, 130, - -472, 1011, 132, 131, 133, 144, 145, 152, 154, 1011, - 1011, 1011, 155, 219, 744, 802, 802, 243, -472, -16, - -472, -472, -472, -472, -472, -472, -472, -472, -472, -472, - -472, -472, -472, 610, 831, 476, 244, -472, -472, -472, - -102, -32, -106, -472, 86, -472, 156, 150, 638, -472, - -472, 253, 831, 831, 831, 831, 831, -472, -90, 831, - 831, 831, 831, 831, 269, 272, 1011, 4, -472, 17, - -472, 163, 1011, 161, 802, 802, 802, 802, 802, 166, - 167, 178, 802, 802, 1011, 1011, 179, -472, 265, 278, - -472, 83, -472, -39, -71, -472, -35, -472, -472, -472, - -472, -472, 698, 260, -472, 185, 163, 186, 203, 205, - 206, 831, -472, 210, 211, 213, 214, 259, 1011, 1011, - 175, 1011, 281, 1011, 802, -472, 215, 1011, 216, -472, - -472, 217, 218, 1011, 1011, 1011, -472, -472, 202, -472, - 802, -472, -472, -472, -472, -472, -472, -472, -472, -472, - 266, 303, 228, 831, 831, 831, 831, -472, 831, 831, - 831, 831, 802, 220, 229, 802, 232, -472, 232, -472, - 234, 1011, 236, 802, 802, 802, -472, -472, -472, 802, - 1011, 317, -472, -472, -472, 240, 238, 245, 247, 246, - 248, 249, 250, 251, 359, 42, 234, 252, 325, -472, - -472, 802, 255, 1011, -472, -472, -472, 254, -472, -472, - 831, -472, 831, 831, -472, -472, -472, -472, -472, 1011, - -472, 1124, 61, 349, -472, -472, 258, -472, 264, 270, - 271, -472, 275, -472, 1124, 383, -472, -472, -472, -472, - 387, 277, 1011, 1011, 389, 332, -472, 1011, 397, -472, - 1011, -472 + -477, 20, 54, 872, -477, -477, 86, -477, -477, -477, + -477, -477, -477, -477, 24, 110, 65, -477, -477, -477, + -477, 37, -105, 51, 3, -8, -477, -477, -477, 110, + 111, 126, -477, -477, -477, -477, -477, -477, 703, -23, + -477, -18, -477, -1, 23, 43, 64, 74, -477, 70, + 111, 703, 71, 71, -477, -477, 71, 71, -477, -477, + -477, -477, -477, 73, -477, -477, -477, -477, -477, -477, + -477, -477, -477, -477, -477, -477, -477, -477, -477, 188, + 189, 190, 457, -477, 104, 77, -477, -477, -29, -477, + -477, -477, -477, -477, -477, -477, -477, -477, 736, 80, + 118, -477, -477, -477, 1196, -477, -477, -477, 181, 87, + 192, 182, 183, -477, -477, -477, -477, -477, 764, 764, + 802, 764, -477, 81, 82, -477, -477, -29, -114, 83, + 513, -477, 73, 988, -477, 988, 988, -477, -477, -477, + -477, -477, -477, -477, -477, -477, -477, 988, -477, 764, + -477, 158, 110, -477, -477, -477, -477, -477, -477, -477, + -477, -477, -477, -477, -477, -477, -477, -477, -477, -477, + -477, -477, -477, 764, 764, 764, 764, 764, 764, -477, + -477, -477, -477, 764, 764, 764, 764, -477, -477, -477, + -477, -477, -477, -477, -477, -477, -477, -477, -477, -477, + 764, 764, 764, 764, 764, 110, -477, 57, -477, -477, + -477, -477, -477, -477, -477, -477, -26, 89, 89, 160, + 170, 203, 172, 204, 174, 205, 178, 207, 206, 208, + 180, 210, 209, 862, 89, 89, 764, 764, 764, -477, + 552, -477, 96, 98, -477, -477, -477, -477, -477, -477, + -477, -477, 173, 102, 106, 108, 112, 114, 802, 115, + 116, 117, 119, 127, -477, -477, -477, -477, 113, -477, + 125, -477, -477, 703, 130, 131, -477, 988, 128, 133, + 134, 135, 138, 140, 142, 988, 988, 988, 143, 197, + 703, 764, 764, 212, -477, -2, -477, -477, -477, -477, + -477, -477, -477, -477, -477, -477, -477, -477, 598, 802, + 485, 244, -477, -477, -477, -477, 15, -82, -29, -477, + 104, -477, 147, 145, 626, -477, -477, 250, 802, 802, + 802, 802, 802, -477, -113, 802, 802, 802, 802, 802, + 273, 274, 988, 0, -477, 18, -477, 163, 988, 156, + 764, 764, 764, 764, 764, 165, 167, 168, 764, 764, + 988, 988, 169, -477, 271, 284, -477, 89, -477, -22, + -51, -477, -48, -477, -477, -477, -477, -477, 665, 266, + -477, 179, 163, 187, 211, 213, 215, 802, -477, 216, + 217, 218, 219, 272, 988, 988, 186, 988, 292, 988, + 764, -477, 220, 988, 222, -477, -477, 224, 225, 988, + 988, 988, -477, -477, 226, -477, 764, -477, -477, -477, + -477, -477, -477, -477, -477, -477, 265, 305, 223, 802, + 802, 802, 802, -477, 802, 802, 802, 802, 764, 227, + 202, 764, 229, -477, 229, -477, 230, 988, 231, 764, + 764, 764, -477, -477, -477, 764, 988, 319, -477, -477, + -477, 233, 232, 234, 236, 235, 237, 238, 240, 242, + 323, 31, 230, 246, 282, -477, -477, 764, 241, 988, + -477, -477, -477, 247, -477, -477, 802, -477, 802, 802, + -477, -477, -477, -477, -477, 988, -477, 1105, 58, 303, + -477, -477, 245, -477, 251, 252, 253, -477, 239, -477, + 1105, 368, -477, -477, -477, -477, 372, 258, 988, 988, + 374, 123, -477, 988, 379, -477, 988, -477 }; /* YYPGOTO[NTERM-NUM]. */ static const short int yypgoto[] = { - -472, -472, -472, 312, 314, 315, 321, 326, -97, -96, - -446, -472, 385, 405, -139, -472, -263, 57, -472, -195, - -472, -44, -472, -38, -472, -69, 305, -472, -5, 221, - -209, 55, -472, -472, -472, 382, -472, -472, -472, -472, - 2, -472, 81, -472, -472, 419, -472, -472, -472, -472, - -472, 449, -472, -471, -103, -128, -80, -472, 413, -472, - -472, -472, -472, -472, 63, 6, -472, -472, 82, -472, - -472 + -477, -477, -477, 293, 298, 300, 301, 302, -99, -97, + -440, -477, 353, 383, -134, -477, -271, 29, -477, -212, + -477, -49, -477, -38, -477, -68, 279, -477, -5, 177, + -190, 97, -477, -477, -477, -477, 364, -477, -477, -477, + -477, 9, -477, 40, -477, -477, 390, -477, -477, -477, + -477, -477, 418, -477, -476, -128, -103, 101, -477, 381, + -477, -93, -477, -477, -477, -477, 33, -21, -477, -477, + 53, -477, -477 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -146 +#define YYTABLE_NINF -148 static const short int yytable[] = { - 84, 141, 142, 262, 263, 25, 340, 111, 40, 267, - 89, 123, 92, 84, 391, 264, 130, 291, 292, 491, - 502, 358, -84, 44, 45, 46, 260, 393, 260, 260, - 368, 127, 131, 511, 309, 127, 381, 19, 4, 20, - 260, 359, 47, 132, 382, 25, 504, 133, 134, 135, - 136, 137, 138, 139, 140, 381, 287, 123, 129, 30, - 284, 392, 288, 415, 40, 265, 133, 134, 135, 136, - 137, 138, 139, 140, 392, 49, 211, 212, 213, 50, - 232, 96, 97, 98, 125, 99, 100, 381, 56, 270, - 233, 381, 274, 414, 363, 364, 366, 275, 276, 277, - 278, 416, 369, 58, 27, 127, 28, 129, 115, 116, - 117, 60, 229, 90, 19, 93, 20, 282, 283, 112, - 113, 204, 205, 285, 286, 308, 293, 294, 104, 268, - 269, 129, 271, 272, 129, -44, -44, 105, -145, 129, - 129, 129, 129, 341, 31, 32, 33, 34, 35, 36, - 37, 349, 350, 351, -43, -43, 279, 280, 281, 129, - 129, 310, 311, 312, -42, -42, 413, 108, 260, 5, - -41, -41, 6, 469, 490, 470, 260, 260, 260, 106, - 7, 8, 9, 10, 11, 12, 13, 295, 296, 107, - -85, 118, 203, 503, 119, 120, 314, 126, 207, 208, - 14, 51, 209, 230, 234, 231, 356, 266, 390, 289, - -48, -47, -46, -45, 396, 298, 7, 8, 9, 52, - 11, 53, 13, 336, 54, -51, 408, 409, -52, 84, - 299, 318, 319, 260, 320, 322, 323, 324, 325, 260, - 354, 326, 329, 330, 331, 332, 84, 355, 129, 312, - 333, 260, 260, 334, 335, 337, 339, 343, 353, 344, - 433, 434, 342, 436, 398, 438, 400, 401, 402, 442, - 345, 346, 406, 357, 367, 446, 447, 448, 347, 373, - 348, 352, 372, 375, 388, 260, 260, 389, 260, 394, - 260, 397, 403, 404, 260, 411, 412, 358, 432, 437, - 260, 260, 260, 435, 405, 410, 129, 399, 129, 129, - 129, 421, 423, 472, 129, 407, 370, 376, 377, 378, - 379, 380, 478, 451, 383, 384, 385, 386, 387, 424, - 449, 425, 426, 453, 314, 479, 428, 429, 260, 430, - 431, 441, 443, 444, 445, 496, 464, 260, 133, 134, - 135, 136, 137, 138, 139, 140, 129, 454, 468, 465, - 471, 501, 473, 474, 475, 476, 480, 481, 141, 142, - 260, 482, 450, 483, 489, 484, 427, 485, 486, 487, - 488, 493, 392, 497, 515, 516, 260, 495, 505, 519, - 506, 494, 521, 507, 463, 141, 142, 129, 512, 508, - 509, 510, 513, 514, 517, 129, 129, 129, 518, 260, - 260, 129, 520, 194, 260, 195, 196, 260, 455, 456, - 457, 458, 197, 459, 460, 461, 462, 198, 101, 55, - 419, 236, 110, 129, 121, 62, 63, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 57, 307, - 75, 76, 26, 418, 95, 477, 0, 440, 422, 19, - 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 498, 0, 499, 500, 121, - 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, - 224, 73, 74, 0, 0, 75, 76, 0, 0, 0, - 0, 0, 0, 0, 19, 0, 20, 121, 62, 63, + 86, 145, 115, 146, 346, 266, 297, 266, 266, 91, + 397, 40, 25, 86, 127, 94, 238, 387, 273, 266, + 4, 508, 314, 315, 49, 388, 239, 19, 399, 20, + 51, 497, 268, 269, 517, 364, 137, 138, 139, 140, + 141, 142, 143, 144, 270, 7, 8, 9, 52, 11, + 53, 13, 25, 54, -147, 365, 375, 398, 510, 131, + 133, 55, 127, 137, 138, 139, 140, 141, 142, 143, + 144, 290, 98, 99, 100, 398, 101, 102, 103, 387, + 217, 218, 387, 235, 135, 5, 30, 421, 6, 44, + 45, 46, 422, 129, 40, 136, 7, 8, 9, 10, + 11, 12, 13, -86, 293, 313, 116, 117, 387, 47, + 294, 133, 131, 50, 420, 234, 92, 14, 369, 370, + 372, 58, 95, 137, 138, 139, 140, 141, 142, 143, + 144, 27, 19, 28, 20, 274, 275, 133, 277, 278, + 133, 60, 210, 211, 62, 133, 133, 133, 133, 266, + 119, 374, 108, 120, 121, 419, 131, 266, 266, 266, + 291, 292, 285, 286, 287, 133, 133, 496, 316, 317, + 318, 475, 109, 476, 347, 31, 32, 33, 34, 35, + 36, 37, 355, 356, 357, 298, 299, -46, -46, -45, + -45, -44, -44, 110, 509, -43, -43, 300, 301, 134, + 101, 102, 320, 111, 112, -87, 122, 123, 124, 130, + 213, 209, 214, 215, 266, 240, 236, 237, 272, 295, + 266, -50, -49, -48, 342, -47, 324, -53, 303, -54, + 304, 325, 266, 266, 328, 86, 359, 326, 329, 396, + 330, 360, 363, 340, 331, 402, 332, 335, 336, 337, + 271, 338, 86, 361, 133, 341, 318, 414, 415, 339, + 343, 345, 348, 349, 350, 351, 266, 266, 352, 266, + 353, 266, 354, 358, 373, 266, 276, 378, 379, 280, + 381, 266, 266, 266, 281, 282, 283, 284, 394, 395, + 403, 439, 440, 400, 442, 409, 444, 410, 411, 416, + 448, 417, 418, 364, 288, 289, 452, 453, 454, 427, + 443, 438, 133, 405, 133, 133, 133, 429, 441, 266, + 133, 413, 457, 382, 383, 384, 385, 386, 266, 376, + 389, 390, 391, 392, 393, 459, 471, 485, 495, 398, + 320, 430, 511, 431, 478, 432, 434, 435, 436, 437, + 447, 266, 449, 484, 450, 451, 460, 470, 455, 474, + 477, 479, 133, 486, 488, 487, 489, 266, 490, 516, + 491, 492, 145, 493, 146, 494, 502, 501, 456, 499, + 503, 512, 433, 518, 513, 514, 515, 519, 520, 523, + 266, 266, 507, 362, 526, 266, 104, 200, 266, 145, + 469, 146, 201, 133, 202, 203, 204, 56, 425, 242, + 312, 133, 133, 133, 114, 521, 522, 133, 424, 59, + 525, 26, 97, 527, 461, 462, 463, 464, 524, 465, + 466, 467, 468, 446, 483, 428, 0, 0, 0, 133, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 404, 0, 406, 407, 408, 0, 0, 0, 412, + 125, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 0, 0, 77, 78, 0, 0, + 0, 504, 0, 505, 506, 19, 0, 20, 125, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, + 75, 76, 0, 0, 77, 78, 0, 0, 0, 0, + 0, 0, 0, 19, 0, 20, 125, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 0, 0, 77, 78, 0, 0, 0, 0, 0, 0, + 0, 19, 0, 20, 0, 0, 0, 0, 0, 0, + 480, 481, 482, 241, 0, 125, 64, 65, 66, 67, + 68, 69, 70, 71, 72, 73, 74, 75, 76, 0, + 0, 77, 78, 0, 0, 0, 0, 0, 500, 0, + 19, 0, 20, 0, 0, 0, 0, 0, 79, 0, + 0, 80, 319, 0, 81, 0, 82, 126, 0, 0, + 0, 125, 219, 220, 221, 222, 223, 224, 225, 226, + 227, 228, 229, 75, 76, 0, 79, 77, 78, 80, + 0, 0, 81, 0, 82, 371, 19, 0, 20, 125, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 0, 0, 75, 76, 0, 0, 0, 0, 0, - 0, 0, 19, 0, 20, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 235, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 77, 0, - 0, 78, 0, 0, 79, 0, 80, 122, 121, 62, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 0, 0, 75, 76, 0, 0, 0, 0, - 0, 0, 0, 19, 0, 20, 0, 0, 0, 0, - 0, 0, 0, 77, 0, 313, 78, 0, 0, 79, - 0, 80, 365, 121, 214, 215, 216, 217, 218, 219, - 220, 221, 222, 223, 224, 73, 74, 0, 0, 75, - 76, 77, 0, 0, 78, 0, 0, 79, 19, 80, - 20, 121, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 0, 0, 75, 76, 0, - 0, 0, 0, 0, 0, 0, 19, 0, 20, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 374, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 77, 0, 0, 78, 0, 0, 79, 0, - 80, 121, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 0, 0, 75, 76, 0, - 0, 0, 0, 0, 0, 0, 19, 0, 20, 0, - 0, 0, 0, 0, 0, 0, 0, 77, 417, 0, - 78, 0, 362, 79, 0, 80, 0, 61, 62, 63, + 74, 75, 76, 0, 79, 77, 78, 80, 0, 0, + 81, 0, 82, 0, 19, 0, 20, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 380, 0, 125, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, 0, 79, 77, 78, 80, 0, 0, 81, + 0, 82, 0, 19, 0, 20, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 423, 63, 64, 65, 66, + 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, + 0, 0, 77, 78, 0, 0, 0, 0, 0, 79, + 0, 19, 80, 20, 368, 81, 0, 82, 0, 132, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 0, 0, 75, 76, 77, 0, 0, 78, 0, - 0, 79, 19, 80, 20, 128, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 0, - 0, 75, 76, 0, 0, 0, 0, 0, 0, 0, - 19, 0, 20, 0, 0, 121, 62, 63, 64, 65, - 66, 67, 68, 69, 70, 71, 72, 73, 74, 0, - 0, 75, 76, 0, 0, 77, 0, 0, 78, 0, - 19, 79, 20, 80, 121, 214, 215, 216, 217, 218, - 219, 220, 221, 222, 223, 224, 73, 74, 0, 0, - 75, 76, 0, 0, 0, 0, 0, 0, 0, 19, - 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 77, 0, 0, 78, 0, 0, 79, 0, 80, + 74, 75, 76, 0, 0, 77, 78, 79, 0, 0, + 80, 0, 0, 81, 19, 82, 20, 125, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 0, 0, 77, 78, 0, 0, 0, 0, 0, + 0, 0, 19, 0, 20, 0, 79, 0, 0, 80, + 0, 0, 81, 0, 82, 125, 219, 220, 221, 222, + 223, 224, 225, 226, 227, 228, 229, 75, 76, 0, + 0, 77, 78, 0, 0, 0, 0, 0, 0, 0, + 19, 0, 20, 0, 79, 0, 0, 80, 0, 0, + 81, 0, 82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, - 0, 0, 78, 0, 0, 79, 0, 80, 75, 76, - 0, 300, 301, 302, 0, 0, 0, 19, 0, 20, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, - 0, 0, 78, 0, 0, 79, 0, 80, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 77, 0, - 0, 78, 0, 0, 79, 0, 80, 149, 150, 151, - 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, - 162, 163, 164, 165, 166, 0, 0, 0, 0, 0, - 247, 0, 248, 173, 174, 175, 176, 0, 249, 250, - 251, 181, 182, 183, 184, 185, 186, 187, 188, 189, - 190, 191, 192, 193, 0, 0, 0, 0, 0, 303, - 0, 0, 304, 0, 305, 0, 0, 306, 238, 239, - 75, 76, 240, 241, 242, 243, 244, 245, 0, 19, - 0, 20, -54, 19, 0, 20, 0, 0, 0, 6, - -54, -54, 0, 0, 0, 0, 0, -54, -54, -54, - -54, -54, -54, -54, 0, -54, 21, 0, 0, 0, - 0, 0, 246, 22, 0, 0, 0, 23, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 149, - 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 0, 0, 0, - 0, 0, 247, 0, 248, 173, 174, 175, 176, 0, - 249, 250, 251, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 191, 192, 193, 0, 0, 0, 0, - 0, 238, 239, 0, 252, 240, 241, 242, 243, 244, - 245, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 79, 0, 0, + 80, 0, 0, 81, 0, 82, 0, 0, 0, 0, + 0, 77, 78, 0, 305, 306, 307, 0, 0, 0, + 19, 0, 20, 0, 0, 79, 0, 0, 80, -56, + 19, 81, 20, 82, 0, 0, 6, -56, -56, 0, + 0, 0, 0, 0, -56, -56, -56, -56, -56, -56, + -56, 0, -56, 21, 0, 0, 0, 0, 0, 0, + -56, 22, 0, 79, 0, 23, 80, 0, 0, 81, + 0, 82, 153, 154, 155, 156, 157, 158, 159, 160, + 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, + 171, 172, 0, 0, 0, 0, 0, 253, 0, 254, + 179, 180, 181, 182, 0, 255, 256, 257, 187, 188, + 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, + 199, 0, 0, 0, 0, 0, 308, 0, 0, 309, + 0, 310, 0, 0, 311, 244, 245, 77, 78, 246, + 247, 248, 249, 250, 251, 0, 19, 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 246, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 149, 150, 151, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 0, 0, 0, 0, 0, 247, 0, 248, 173, 174, - 175, 176, 0, 249, 250, 251, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 192, 193, 144, + 252, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 153, 154, + 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, + 165, 166, 167, 168, 169, 170, 171, 172, 0, 0, + 0, 0, 0, 253, 0, 254, 179, 180, 181, 182, + 0, 255, 256, 257, 187, 188, 189, 190, 191, 192, + 193, 194, 195, 196, 197, 198, 199, 0, 0, 0, + 0, 0, 244, 245, 0, 258, 246, 247, 248, 249, + 250, 251, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252, 0, 0, - 145, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 146, 147, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 148, 0, 0, 149, - 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 0, 0, 170, 171, 172, 173, 174, 175, 176, 177, - 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, - 188, 189, 190, 191, 192, 193 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 153, 154, 155, 156, 157, + 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, + 168, 169, 170, 171, 172, 0, 0, 0, 0, 0, + 253, 0, 254, 179, 180, 181, 182, 0, 255, 256, + 257, 187, 188, 189, 190, 191, 192, 193, 194, 195, + 196, 197, 198, 199, 148, 0, 0, 0, 0, 0, + 0, 0, 258, 0, 0, 149, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 150, 151, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 152, 0, 0, 0, 153, 154, 155, 156, + 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, + 167, 168, 169, 170, 171, 172, 173, 174, 175, 0, + 0, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, + 195, 196, 197, 198, 199 }; static const short int yycheck[] = { - 38, 98, 98, 131, 132, 3, 269, 51, 29, 148, - 32, 80, 33, 51, 10, 143, 96, 212, 213, 465, - 491, 37, 128, 52, 53, 54, 129, 10, 131, 132, - 132, 137, 4, 504, 229, 137, 126, 28, 0, 30, - 143, 57, 71, 15, 134, 43, 492, 5, 6, 7, - 8, 9, 10, 11, 12, 126, 126, 126, 96, 61, - 199, 57, 132, 134, 29, 145, 5, 6, 7, 8, - 9, 10, 11, 12, 57, 125, 114, 115, 116, 61, - 126, 72, 73, 74, 82, 76, 77, 126, 125, 169, - 136, 126, 172, 132, 303, 304, 305, 177, 178, 179, - 180, 136, 134, 30, 45, 137, 47, 145, 53, 54, - 55, 18, 117, 135, 28, 136, 30, 197, 198, 35, - 36, 55, 56, 99, 100, 228, 25, 26, 125, 167, - 168, 169, 170, 171, 172, 17, 18, 125, 0, 177, - 178, 179, 180, 271, 64, 65, 66, 67, 68, 69, - 70, 279, 280, 281, 17, 18, 194, 195, 196, 197, - 198, 230, 231, 232, 17, 18, 361, 130, 271, 31, - 17, 18, 34, 436, 132, 438, 279, 280, 281, 125, - 42, 43, 44, 45, 46, 47, 48, 17, 18, 125, - 128, 18, 30, 132, 18, 18, 234, 128, 18, 30, - 62, 27, 30, 131, 128, 131, 286, 59, 336, 126, - 18, 18, 18, 18, 342, 18, 42, 43, 44, 45, - 46, 47, 48, 267, 50, 21, 354, 355, 21, 267, - 21, 126, 129, 336, 63, 128, 128, 128, 128, 342, - 284, 128, 128, 128, 128, 128, 284, 285, 286, 318, - 128, 354, 355, 126, 126, 126, 126, 126, 39, 126, - 388, 389, 130, 391, 344, 393, 346, 347, 348, 397, - 126, 126, 352, 30, 30, 403, 404, 405, 126, 129, - 126, 126, 126, 30, 15, 388, 389, 15, 391, 126, - 393, 130, 126, 126, 397, 30, 18, 37, 39, 18, - 403, 404, 405, 128, 126, 126, 344, 345, 346, 347, - 348, 126, 126, 441, 352, 353, 314, 322, 323, 324, - 325, 326, 450, 57, 329, 330, 331, 332, 333, 126, - 128, 126, 126, 30, 372, 18, 126, 126, 441, 126, - 126, 126, 126, 126, 126, 473, 126, 450, 5, 6, - 7, 8, 9, 10, 11, 12, 394, 129, 126, 130, - 126, 489, 126, 443, 444, 445, 126, 129, 465, 465, - 473, 126, 410, 126, 15, 129, 381, 129, 129, 129, - 129, 129, 57, 129, 512, 513, 489, 132, 39, 517, - 132, 471, 520, 129, 432, 492, 492, 435, 15, 129, - 129, 126, 15, 126, 15, 443, 444, 445, 76, 512, - 513, 449, 15, 101, 517, 101, 101, 520, 423, 424, - 425, 426, 101, 428, 429, 430, 431, 101, 43, 24, - 373, 126, 50, 471, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 29, 228, - 19, 20, 3, 372, 41, 449, -1, 394, 376, 28, - -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 480, -1, 482, 483, 3, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, -1, -1, 19, 20, -1, -1, -1, - -1, -1, -1, -1, 28, -1, 30, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, - -1, -1, 28, -1, 30, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 127, -1, - -1, 130, -1, -1, 133, -1, 135, 136, 3, 4, + 38, 100, 51, 100, 275, 133, 218, 135, 136, 32, + 10, 29, 3, 51, 82, 33, 130, 130, 152, 147, + 0, 497, 234, 235, 129, 138, 140, 28, 10, 30, + 27, 471, 135, 136, 510, 37, 5, 6, 7, 8, + 9, 10, 11, 12, 147, 42, 43, 44, 45, 46, + 47, 48, 43, 50, 0, 57, 138, 57, 498, 141, + 98, 58, 130, 5, 6, 7, 8, 9, 10, 11, + 12, 205, 73, 74, 75, 57, 77, 78, 79, 130, + 118, 119, 130, 121, 4, 31, 62, 138, 34, 52, + 53, 54, 140, 84, 29, 15, 42, 43, 44, 45, + 46, 47, 48, 132, 130, 233, 35, 36, 130, 72, + 136, 149, 141, 62, 136, 120, 139, 63, 308, 309, + 310, 129, 140, 5, 6, 7, 8, 9, 10, 11, + 12, 45, 28, 47, 30, 173, 174, 175, 176, 177, + 178, 30, 55, 56, 18, 183, 184, 185, 186, 277, + 53, 136, 129, 56, 57, 367, 141, 285, 286, 287, + 103, 104, 200, 201, 202, 203, 204, 136, 236, 237, + 238, 442, 129, 444, 277, 65, 66, 67, 68, 69, + 70, 71, 285, 286, 287, 25, 26, 17, 18, 17, + 18, 17, 18, 129, 136, 17, 18, 17, 18, 98, + 77, 78, 240, 129, 134, 132, 18, 18, 18, 132, + 18, 30, 30, 30, 342, 132, 135, 135, 60, 130, + 348, 18, 18, 18, 273, 18, 130, 21, 18, 21, + 21, 133, 360, 361, 132, 273, 39, 64, 132, 342, + 132, 290, 30, 130, 132, 348, 132, 132, 132, 132, + 149, 132, 290, 291, 292, 130, 324, 360, 361, 132, + 130, 130, 134, 130, 130, 130, 394, 395, 130, 397, + 130, 399, 130, 130, 30, 403, 175, 130, 133, 178, + 30, 409, 410, 411, 183, 184, 185, 186, 15, 15, + 134, 394, 395, 130, 397, 130, 399, 130, 130, 130, + 403, 30, 18, 37, 203, 204, 409, 410, 411, 130, + 18, 39, 350, 351, 352, 353, 354, 130, 132, 447, + 358, 359, 57, 328, 329, 330, 331, 332, 456, 320, + 335, 336, 337, 338, 339, 30, 134, 18, 15, 57, + 378, 130, 39, 130, 447, 130, 130, 130, 130, 130, + 130, 479, 130, 456, 130, 130, 133, 130, 132, 130, + 130, 130, 400, 130, 130, 133, 130, 495, 133, 130, + 133, 133, 471, 133, 471, 133, 479, 136, 416, 133, + 133, 136, 387, 15, 133, 133, 133, 15, 130, 15, + 518, 519, 495, 292, 15, 523, 43, 104, 526, 498, + 438, 498, 104, 441, 104, 104, 104, 24, 379, 130, + 233, 449, 450, 451, 50, 518, 519, 455, 378, 29, + 523, 3, 41, 526, 429, 430, 431, 432, 521, 434, + 435, 436, 437, 400, 455, 382, -1, -1, -1, 477, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 350, -1, 352, 353, 354, -1, -1, -1, 358, + 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, + -1, 486, -1, 488, 489, 28, -1, 30, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, -1, -1, - -1, -1, -1, 28, -1, 30, -1, -1, -1, -1, - -1, -1, -1, 127, -1, 40, 130, -1, -1, 133, - -1, 135, 136, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, -1, -1, 19, - 20, 127, -1, -1, 130, -1, -1, 133, 28, 135, - 30, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, - -1, -1, -1, -1, -1, -1, 28, -1, 30, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 40, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 127, -1, -1, 130, -1, -1, 133, -1, - 135, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, - -1, -1, -1, -1, -1, -1, 28, -1, 30, -1, - -1, -1, -1, -1, -1, -1, -1, 127, 40, -1, - 130, -1, 132, 133, -1, 135, -1, 3, 4, 5, + -1, -1, -1, 28, -1, 30, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, 19, 20, -1, -1, -1, -1, -1, -1, + -1, 28, -1, 30, -1, -1, -1, -1, -1, -1, + 449, 450, 451, 40, -1, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, 19, 20, -1, -1, -1, -1, -1, 477, -1, + 28, -1, 30, -1, -1, -1, -1, -1, 131, -1, + -1, 134, 40, -1, 137, -1, 139, 140, -1, -1, + -1, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, -1, 131, 19, 20, 134, + -1, -1, 137, -1, 139, 140, 28, -1, 30, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, -1, 131, 19, 20, 134, -1, -1, + 137, -1, 139, -1, 28, -1, 30, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 40, -1, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, -1, 131, 19, 20, 134, -1, -1, 137, + -1, 139, -1, 28, -1, 30, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 40, 3, 4, 5, 6, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + -1, -1, 19, 20, -1, -1, -1, -1, -1, 131, + -1, 28, 134, 30, 136, 137, -1, 139, -1, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, -1, -1, 19, 20, 131, -1, -1, + 134, -1, -1, 137, 28, 139, 30, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, 127, -1, -1, 130, -1, - -1, 133, 28, 135, 30, 3, 4, 5, 6, 7, + 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, + -1, -1, 28, -1, 30, -1, 131, -1, -1, 134, + -1, -1, 137, -1, 139, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, -1, -1, - 28, -1, 30, -1, -1, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, - -1, 19, 20, -1, -1, 127, -1, -1, 130, -1, - 28, 133, 30, 135, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, - 19, 20, -1, -1, -1, -1, -1, -1, -1, 28, - -1, 30, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 127, -1, -1, 130, -1, -1, 133, -1, 135, + 28, -1, 30, -1, 131, -1, -1, 134, -1, -1, + 137, -1, 139, -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, 127, - -1, -1, 130, -1, -1, 133, -1, 135, 19, 20, - -1, 22, 23, 24, -1, -1, -1, 28, -1, 30, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 127, - -1, -1, 130, -1, -1, 133, -1, 135, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 127, -1, - -1, 130, -1, -1, 133, -1, 135, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 91, 92, 93, 94, 95, -1, -1, -1, -1, -1, - 101, -1, 103, 104, 105, 106, 107, -1, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, -1, -1, -1, -1, -1, 130, - -1, -1, 133, -1, 135, -1, -1, 138, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, -1, 28, - -1, 30, 27, 28, -1, 30, -1, -1, -1, 34, - 35, 36, -1, -1, -1, -1, -1, 42, 43, 44, - 45, 46, 47, 48, -1, 50, 51, -1, -1, -1, - -1, -1, 61, 58, -1, -1, -1, 62, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 93, 94, 95, -1, -1, -1, - -1, -1, 101, -1, 103, 104, 105, 106, 107, -1, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124, -1, -1, -1, -1, - -1, 17, 18, -1, 133, 21, 22, 23, 24, 25, - 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 131, -1, -1, + 134, -1, -1, 137, -1, 139, -1, -1, -1, -1, + -1, 19, 20, -1, 22, 23, 24, -1, -1, -1, + 28, -1, 30, -1, -1, 131, -1, -1, 134, 27, + 28, 137, 30, 139, -1, -1, 34, 35, 36, -1, + -1, -1, -1, -1, 42, 43, 44, 45, 46, 47, + 48, -1, 50, 51, -1, -1, -1, -1, -1, -1, + 58, 59, -1, 131, -1, 63, 134, -1, -1, 137, + -1, 139, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, + 98, 99, -1, -1, -1, -1, -1, 105, -1, 107, + 108, 109, 110, 111, -1, 113, 114, 115, 116, 117, + 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, + 128, -1, -1, -1, -1, -1, 134, -1, -1, 137, + -1, 139, -1, -1, 142, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, -1, 28, -1, 30, -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, 61, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - -1, -1, -1, -1, -1, 101, -1, 103, 104, 105, - 106, 107, -1, 109, 110, 111, 112, 113, 114, 115, - 116, 117, 118, 119, 120, 121, 122, 123, 124, 38, - -1, -1, -1, -1, -1, -1, -1, 133, -1, -1, - 49, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 59, 60, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 75, -1, -1, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - -1, -1, 101, 102, 103, 104, 105, 106, 107, 108, - 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, - 119, 120, 121, 122, 123, 124 + 62, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 80, 81, + 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, + 92, 93, 94, 95, 96, 97, 98, 99, -1, -1, + -1, -1, -1, 105, -1, 107, 108, 109, 110, 111, + -1, 113, 114, 115, 116, 117, 118, 119, 120, 121, + 122, 123, 124, 125, 126, 127, 128, -1, -1, -1, + -1, -1, 17, 18, -1, 137, 21, 22, 23, 24, + 25, 26, -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, 62, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 80, 81, 82, 83, 84, + 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, + 95, 96, 97, 98, 99, -1, -1, -1, -1, -1, + 105, -1, 107, 108, 109, 110, 111, -1, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 38, -1, -1, -1, -1, -1, + -1, -1, 137, -1, -1, 49, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 60, 61, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 76, -1, -1, -1, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, -1, + -1, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 171, 172, 173, 0, 31, 34, 42, 43, 44, - 45, 46, 47, 48, 62, 152, 186, 188, 190, 28, - 30, 51, 58, 62, 151, 179, 190, 45, 47, 189, - 61, 64, 65, 66, 67, 68, 69, 70, 153, 184, - 29, 196, 197, 198, 52, 53, 54, 71, 176, 125, - 61, 27, 45, 47, 50, 152, 125, 184, 30, 174, - 18, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 19, 20, 127, 130, 133, - 135, 140, 160, 161, 162, 163, 164, 179, 193, 32, - 135, 185, 33, 136, 187, 197, 72, 73, 74, 76, - 77, 151, 199, 201, 125, 125, 125, 125, 130, 177, - 174, 160, 35, 36, 170, 170, 170, 170, 18, 18, - 18, 3, 136, 164, 165, 179, 128, 137, 3, 162, - 195, 4, 15, 5, 6, 7, 8, 9, 10, 11, - 12, 147, 148, 149, 38, 49, 59, 60, 75, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, - 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, - 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, - 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, - 121, 122, 123, 124, 142, 143, 144, 145, 146, 205, - 206, 208, 209, 30, 55, 56, 175, 18, 30, 30, - 178, 162, 162, 162, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 147, 148, 150, 162, 167, - 131, 131, 126, 136, 128, 40, 165, 166, 17, 18, - 21, 22, 23, 24, 25, 26, 61, 101, 103, 109, - 110, 111, 133, 142, 143, 144, 145, 146, 168, 192, - 193, 194, 194, 194, 194, 195, 59, 153, 162, 162, - 195, 162, 162, 202, 195, 195, 195, 195, 195, 162, - 162, 162, 195, 195, 153, 99, 100, 126, 132, 126, - 158, 158, 158, 25, 26, 17, 18, 141, 18, 21, - 22, 23, 24, 130, 133, 135, 138, 168, 193, 158, - 164, 164, 164, 40, 162, 181, 182, 183, 126, 129, - 63, 191, 128, 128, 128, 128, 128, 167, 169, 128, - 128, 128, 128, 128, 126, 126, 160, 126, 155, 126, - 155, 194, 130, 126, 126, 126, 126, 126, 126, 194, - 194, 194, 126, 39, 160, 162, 195, 30, 37, 57, - 156, 159, 132, 169, 169, 136, 169, 30, 132, 134, - 179, 180, 126, 129, 40, 30, 167, 167, 167, 167, - 167, 126, 134, 167, 167, 167, 167, 167, 15, 15, - 194, 10, 57, 10, 126, 207, 194, 130, 195, 162, - 195, 195, 195, 126, 126, 126, 195, 162, 194, 194, - 126, 30, 18, 158, 132, 134, 136, 40, 181, 156, - 157, 126, 207, 126, 126, 126, 126, 167, 126, 126, - 126, 126, 39, 194, 194, 128, 194, 18, 194, 195, - 203, 126, 194, 126, 126, 126, 194, 194, 194, 128, - 162, 57, 154, 30, 129, 167, 167, 167, 167, 167, - 167, 167, 167, 162, 126, 130, 203, 204, 126, 155, - 155, 126, 194, 126, 195, 195, 195, 204, 194, 18, - 126, 129, 126, 126, 129, 129, 129, 129, 129, 15, - 132, 149, 200, 129, 195, 132, 194, 129, 167, 167, - 167, 194, 192, 132, 149, 39, 132, 129, 129, 129, - 126, 192, 15, 15, 126, 194, 194, 15, 76, 194, - 15, 194 + 0, 175, 176, 178, 0, 31, 34, 42, 43, 44, + 45, 46, 47, 48, 63, 156, 191, 193, 195, 28, + 30, 51, 59, 63, 155, 184, 195, 45, 47, 194, + 62, 65, 66, 67, 68, 69, 70, 71, 157, 189, + 29, 201, 202, 203, 52, 53, 54, 72, 181, 129, + 62, 27, 45, 47, 50, 58, 156, 177, 129, 189, + 30, 179, 18, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 19, 20, 131, + 134, 137, 139, 144, 164, 165, 166, 167, 168, 184, + 198, 32, 139, 190, 33, 140, 192, 202, 73, 74, + 75, 77, 78, 79, 155, 204, 205, 207, 129, 129, + 129, 129, 134, 182, 179, 164, 35, 36, 174, 174, + 174, 174, 18, 18, 18, 3, 140, 168, 169, 184, + 132, 141, 3, 166, 200, 4, 15, 5, 6, 7, + 8, 9, 10, 11, 12, 151, 152, 153, 38, 49, + 60, 61, 76, 80, 81, 82, 83, 84, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, + 97, 98, 99, 100, 101, 102, 105, 106, 107, 108, + 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, + 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, + 146, 147, 148, 149, 150, 211, 212, 214, 215, 30, + 55, 56, 180, 18, 30, 30, 183, 166, 166, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 151, 152, 154, 166, 171, 166, 135, 135, 130, 140, + 132, 40, 169, 170, 17, 18, 21, 22, 23, 24, + 25, 26, 62, 105, 107, 113, 114, 115, 137, 146, + 147, 148, 149, 150, 172, 197, 198, 199, 199, 199, + 199, 200, 60, 157, 166, 166, 200, 166, 166, 208, + 200, 200, 200, 200, 200, 166, 166, 166, 200, 200, + 157, 103, 104, 130, 136, 130, 162, 162, 25, 26, + 17, 18, 145, 18, 21, 22, 23, 24, 134, 137, + 139, 142, 172, 198, 162, 162, 168, 168, 168, 40, + 166, 186, 187, 188, 130, 133, 64, 196, 132, 132, + 132, 132, 132, 171, 173, 132, 132, 132, 132, 132, + 130, 130, 164, 130, 159, 130, 159, 199, 134, 130, + 130, 130, 130, 130, 130, 199, 199, 199, 130, 39, + 164, 166, 200, 30, 37, 57, 160, 163, 136, 173, + 173, 140, 173, 30, 136, 138, 184, 185, 130, 133, + 40, 30, 171, 171, 171, 171, 171, 130, 138, 171, + 171, 171, 171, 171, 15, 15, 199, 10, 57, 10, + 130, 213, 199, 134, 200, 166, 200, 200, 200, 130, + 130, 130, 200, 166, 199, 199, 130, 30, 18, 162, + 136, 138, 140, 40, 186, 160, 161, 130, 213, 130, + 130, 130, 130, 171, 130, 130, 130, 130, 39, 199, + 199, 132, 199, 18, 199, 200, 209, 130, 199, 130, + 130, 130, 199, 199, 199, 132, 166, 57, 158, 30, + 133, 171, 171, 171, 171, 171, 171, 171, 171, 166, + 130, 134, 209, 210, 130, 159, 159, 130, 199, 130, + 200, 200, 200, 210, 199, 18, 130, 133, 130, 130, + 133, 133, 133, 133, 133, 15, 136, 153, 206, 133, + 200, 136, 199, 133, 171, 171, 171, 199, 197, 136, + 153, 39, 136, 133, 133, 133, 130, 197, 15, 15, + 130, 199, 199, 15, 204, 199, 15, 199 }; #define yyerrok (yyerrstatus = 0) @@ -2202,27 +2240,27 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 53: -#line 292 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 55: +#line 321 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[-1].String); ;} break; - case 54: -#line 295 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 56: +#line 324 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; - case 62: -#line 302 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 64: +#line 331 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; - case 69: -#line 307 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 71: +#line 336 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2230,28 +2268,28 @@ yyreduce: ;} break; - case 70: -#line 312 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 72: +#line 341 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; - case 71: -#line 317 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { (yyval.String) = new std::string(); ;} - break; - - case 72: -#line 318 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;} - break; - case 73: -#line 321 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 346 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 74: -#line 322 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 347 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); (yyval.String) = (yyvsp[-1].String); ;} + break; + + case 75: +#line 350 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = new std::string(); ;} + break; + + case 76: +#line 351 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, ", "); *(yyvsp[-1].String) += " " + *(yyvsp[0].String); @@ -2260,8 +2298,8 @@ yyreduce: ;} break; - case 75: -#line 330 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 77: +#line 359 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2269,18 +2307,18 @@ yyreduce: ;} break; - case 76: -#line 336 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { (yyval.String) = new std::string(); ;} - break; - case 78: -#line 340 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 365 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 79: -#line 341 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 80: +#line 369 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = new std::string(); ;} + break; + + case 81: +#line 370 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, ", "); if (!(yyvsp[0].String)->empty()) @@ -2290,8 +2328,8 @@ yyreduce: ;} break; - case 81: -#line 351 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 83: +#line 380 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2299,24 +2337,31 @@ yyreduce: ;} break; - case 99: -#line 373 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 101: +#line 402 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = OpaqueTy; ;} break; - case 100: -#line 377 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 102: +#line 406 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type).newTy = (yyvsp[0].String); (yyval.Type).oldTy = UnresolvedTy; ;} break; - case 102: -#line 386 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 103: +#line 410 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + (yyval.Type) = (yyvsp[0].Type); + ;} + break; + + case 104: +#line 413 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Type UpReference (yyvsp[0].String)->insert(0, "\\"); (yyval.Type).newTy = (yyvsp[0].String); @@ -2324,8 +2369,8 @@ yyreduce: ;} break; - case 103: -#line 391 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 105: +#line 418 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Function derived type? *(yyvsp[-3].Type).newTy += "( " + *(yyvsp[-1].String) + " )"; delete (yyvsp[-1].String); @@ -2334,30 +2379,32 @@ yyreduce: ;} break; - case 104: -#line 397 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 106: +#line 424 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Sized array type? (yyvsp[-3].String)->insert(0,"[ "); *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " ]"; delete (yyvsp[-1].Type).newTy; (yyval.Type).newTy = (yyvsp[-3].String); (yyval.Type).oldTy = ArrayTy; + (yyval.Type).elemTy = (yyvsp[-1].Type).oldTy; ;} break; - case 105: -#line 404 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 107: +#line 432 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Packed array type? (yyvsp[-3].String)->insert(0,"< "); *(yyvsp[-3].String) += " x " + *(yyvsp[-1].Type).newTy + " >"; delete (yyvsp[-1].Type).newTy; (yyval.Type).newTy = (yyvsp[-3].String); (yyval.Type).oldTy = PackedTy; + (yyval.Type).elemTy = (yyvsp[-1].Type).oldTy; ;} break; - case 106: -#line 411 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 108: +#line 440 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Structure type? (yyvsp[-1].String)->insert(0, "{ "); *(yyvsp[-1].String) += " }"; @@ -2366,32 +2413,33 @@ yyreduce: ;} break; - case 107: -#line 417 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 109: +#line 446 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Empty structure type? (yyval.Type).newTy = new std::string("{}"); (yyval.Type).oldTy = StructTy; ;} break; - case 108: -#line 421 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 110: +#line 450 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Pointer type? *(yyvsp[-1].Type).newTy += '*'; + (yyval.Type).elemTy = (yyvsp[-1].Type).oldTy; (yyvsp[-1].Type).oldTy = PointerTy; (yyval.Type) = (yyvsp[-1].Type); ;} break; - case 109: -#line 431 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 111: +#line 461 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].Type).newTy; ;} break; - case 110: -#line 434 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 112: +#line 464 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].Type).newTy; delete (yyvsp[0].Type).newTy; @@ -2399,8 +2447,8 @@ yyreduce: ;} break; - case 112: -#line 443 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 114: +#line 473 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", ..."; delete (yyvsp[0].String); @@ -2408,22 +2456,22 @@ yyreduce: ;} break; - case 113: -#line 448 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 115: +#line 478 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; - case 114: -#line 451 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 116: +#line 481 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 115: -#line 461 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 117: +#line 491 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Nonempty unsized arr (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy); @@ -2432,8 +2480,8 @@ yyreduce: ;} break; - case 116: -#line 467 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 118: +#line 497 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy); @@ -2441,8 +2489,8 @@ yyreduce: ;} break; - case 117: -#line 472 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 119: +#line 502 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy); @@ -2451,8 +2499,8 @@ yyreduce: ;} break; - case 118: -#line 478 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 120: +#line 508 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Nonempty unsized arr (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy); @@ -2461,8 +2509,8 @@ yyreduce: ;} break; - case 119: -#line 484 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 121: +#line 514 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-3].Type).newTy); @@ -2471,8 +2519,8 @@ yyreduce: ;} break; - case 120: -#line 490 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 122: +#line 520 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy); @@ -2480,8 +2528,8 @@ yyreduce: ;} break; - case 121: -#line 495 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 123: +#line 525 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2490,28 +2538,8 @@ yyreduce: ;} break; - case 122: -#line 501 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - (yyval.Const).type = (yyvsp[-1].Type); - (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); - *(yyval.Const).cnst += " " + *(yyvsp[0].String); - delete (yyvsp[0].String); - ;} - break; - - case 123: -#line 507 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - (yyval.Const).type = (yyvsp[-1].Type); - (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); - *(yyval.Const).cnst += " " + *(yyvsp[0].String); - delete (yyvsp[0].String); - ;} - break; - case 124: -#line 513 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 531 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2521,7 +2549,7 @@ yyreduce: break; case 125: -#line 519 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 537 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); @@ -2531,8 +2559,8 @@ yyreduce: break; case 126: -#line 525 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { // integral constants +#line 543 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); *(yyval.Const).cnst += " " + *(yyvsp[0].String); @@ -2541,8 +2569,8 @@ yyreduce: break; case 127: -#line 531 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { // integral constants +#line 549 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); *(yyval.Const).cnst += " " + *(yyvsp[0].String); @@ -2551,8 +2579,8 @@ yyreduce: break; case 128: -#line 537 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { // Boolean constants +#line 555 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { // integral constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); *(yyval.Const).cnst += " " + *(yyvsp[0].String); @@ -2561,8 +2589,8 @@ yyreduce: break; case 129: -#line 543 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { // Boolean constants +#line 561 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { // integral constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); *(yyval.Const).cnst += " " + *(yyvsp[0].String); @@ -2571,8 +2599,8 @@ yyreduce: break; case 130: -#line 549 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { // Float & Double constants +#line 567 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { // Boolean constants (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); *(yyval.Const).cnst += " " + *(yyvsp[0].String); @@ -2581,7 +2609,27 @@ yyreduce: break; case 131: -#line 557 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 573 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { // Boolean constants + (yyval.Const).type = (yyvsp[-1].Type); + (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); + *(yyval.Const).cnst += " " + *(yyvsp[0].String); + delete (yyvsp[0].String); + ;} + break; + + case 132: +#line 579 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { // Float & Double constants + (yyval.Const).type = (yyvsp[-1].Type); + (yyval.Const).cnst = new std::string(*(yyvsp[-1].Type).newTy); + *(yyval.Const).cnst += " " + *(yyvsp[0].String); + delete (yyvsp[0].String); + ;} + break; + + case 133: +#line 587 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string source = *(yyvsp[-3].Const).cnst; TypeInfo DstTy = (yyvsp[-1].Type); @@ -2598,8 +2646,8 @@ yyreduce: ;} break; - case 132: -#line 571 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 134: +#line 601 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-4].String) += "(" + *(yyvsp[-2].Const).cnst; for (unsigned i = 0; i < (yyvsp[-1].ValList)->size(); ++i) { @@ -2614,8 +2662,8 @@ yyreduce: ;} break; - case 133: -#line 583 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 135: +#line 613 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2623,35 +2671,36 @@ yyreduce: ;} break; - case 134: -#line 588 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; - (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); - (yyval.String) = (yyvsp[-5].String); - ;} - break; - - case 135: -#line 593 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; - (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); - (yyval.String) = (yyvsp[-5].String); - ;} - break; - case 136: -#line 598 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 618 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { - *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; - (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); - (yyval.String) = (yyvsp[-5].String); + const char* op = getDivRemOpcode(*(yyvsp[-5].String), (yyvsp[-3].Const).type); + (yyval.String) = new std::string(op); + *(yyval.String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; + delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); ;} break; case 137: -#line 603 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 624 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; + (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); + (yyval.String) = (yyvsp[-5].String); + ;} + break; + + case 138: +#line 629 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; + (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); + (yyval.String) = (yyvsp[-5].String); + ;} + break; + + case 139: +#line 634 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { const char* shiftop = (yyvsp[-5].String)->c_str(); if (*(yyvsp[-5].String) == "shr") @@ -2662,8 +2711,8 @@ yyreduce: ;} break; - case 138: -#line 611 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 140: +#line 642 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -2671,26 +2720,26 @@ yyreduce: ;} break; - case 139: -#line 616 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; - (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); - (yyval.String) = (yyvsp[-7].String); - ;} - break; - - case 140: -#line 621 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; - (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); - (yyval.String) = (yyvsp[-7].String); - ;} - break; - case 141: -#line 631 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 647 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; + (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); + (yyval.String) = (yyvsp[-7].String); + ;} + break; + + case 142: +#line 652 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-7].String) += "(" + *(yyvsp[-5].Const).cnst + "," + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; + (yyvsp[-5].Const).destroy(); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); + (yyval.String) = (yyvsp[-7].String); + ;} + break; + + case 143: +#line 662 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst; (yyvsp[0].Const).destroy(); @@ -2698,26 +2747,26 @@ yyreduce: ;} break; - case 142: -#line 636 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 144: +#line 667 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(*(yyvsp[0].Const).cnst); (yyvsp[0].Const).destroy(); ;} break; - case 145: -#line 651 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 147: +#line 682 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { ;} break; - case 146: -#line 656 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 148: +#line 687 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 147: -#line 659 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 149: +#line 690 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[0].String) << "\n"; delete (yyvsp[0].String); @@ -2725,34 +2774,40 @@ yyreduce: ;} break; - case 148: -#line 664 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 150: +#line 695 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << "module asm " << " " << *(yyvsp[0].String) << "\n"; (yyval.String) = 0; ;} break; - case 149: -#line 668 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 151: +#line 699 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << "implementation\n"; (yyval.String) = 0; ;} break; - case 150: -#line 672 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 152: +#line 703 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 151: -#line 675 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 154: +#line 705 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "external"; ;} + break; + + case 155: +#line 708 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { EnumeratedTypes.push_back((yyvsp[0].Type)); if (!(yyvsp[-2].String)->empty()) { NamedTypes[*(yyvsp[-2].String)].newTy = new std::string(*(yyvsp[0].Type).newTy); NamedTypes[*(yyvsp[-2].String)].oldTy = (yyvsp[0].Type).oldTy; + NamedTypes[*(yyvsp[-2].String)].elemTy = (yyvsp[0].Type).elemTy; *O << *(yyvsp[-2].String) << " = "; } *O << "type " << *(yyvsp[0].Type).newTy << "\n"; @@ -2761,8 +2816,8 @@ yyreduce: ;} break; - case 152: -#line 686 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 156: +#line 720 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Function prototypes can be in const pool *O << *(yyvsp[0].String) << "\n"; delete (yyvsp[0].String); @@ -2770,8 +2825,8 @@ yyreduce: ;} break; - case 153: -#line 691 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 157: +#line 725 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Asm blocks can be in the const pool *O << *(yyvsp[-2].String) << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n"; delete (yyvsp[-2].String); delete (yyvsp[-1].String); delete (yyvsp[0].String); @@ -2779,8 +2834,8 @@ yyreduce: ;} break; - case 154: -#line 696 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 158: +#line 730 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) *O << *(yyvsp[-4].String) << " = "; @@ -2790,8 +2845,8 @@ yyreduce: ;} break; - case 155: -#line 703 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 159: +#line 737 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) *O << *(yyvsp[-4].String) << " = "; @@ -2801,8 +2856,8 @@ yyreduce: ;} break; - case 156: -#line 710 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 160: +#line 744 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) *O << *(yyvsp[-4].String) << " = "; @@ -2812,8 +2867,8 @@ yyreduce: ;} break; - case 157: -#line 717 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 161: +#line 751 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) *O << *(yyvsp[-4].String) << " = "; @@ -2823,8 +2878,8 @@ yyreduce: ;} break; - case 158: -#line 724 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 162: +#line 758 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[-1].String) << " " << *(yyvsp[0].String) << "\n"; delete (yyvsp[-1].String); delete (yyvsp[0].String); @@ -2832,8 +2887,8 @@ yyreduce: ;} break; - case 159: -#line 729 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 163: +#line 763 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[-2].String) << " = " << *(yyvsp[0].String) << "\n"; delete (yyvsp[-2].String); delete (yyvsp[0].String); @@ -2841,15 +2896,15 @@ yyreduce: ;} break; - case 160: -#line 734 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 164: +#line 768 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 164: -#line 744 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 168: +#line 778 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2857,8 +2912,8 @@ yyreduce: ;} break; - case 165: -#line 749 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 169: +#line 783 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); if (*(yyvsp[0].String) == "64") @@ -2868,8 +2923,8 @@ yyreduce: ;} break; - case 166: -#line 756 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 170: +#line 790 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2877,8 +2932,8 @@ yyreduce: ;} break; - case 167: -#line 761 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 171: +#line 795 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2886,8 +2941,8 @@ yyreduce: ;} break; - case 168: -#line 768 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 172: +#line 802 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, "[ "); *(yyvsp[-1].String) += " ]"; @@ -2895,8 +2950,8 @@ yyreduce: ;} break; - case 169: -#line 775 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 173: +#line 809 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2904,20 +2959,20 @@ yyreduce: ;} break; - case 171: -#line 781 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 175: +#line 815 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 175: -#line 790 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 179: +#line 824 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 176: -#line 792 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 180: +#line 826 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[-1].Type).newTy; if (!(yyvsp[0].String)->empty()) @@ -2926,30 +2981,30 @@ yyreduce: ;} break; - case 177: -#line 799 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 181: +#line 833 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].String); delete (yyvsp[0].String); ;} break; - case 178: -#line 803 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 182: +#line 837 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; - case 179: -#line 807 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 183: +#line 841 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; - case 180: -#line 810 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 184: +#line 844 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", ..."; (yyval.String) = (yyvsp[-2].String); @@ -2957,20 +3012,20 @@ yyreduce: ;} break; - case 181: -#line 815 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 185: +#line 849 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; - case 182: -#line 818 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 186: +#line 852 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 183: -#line 821 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 187: +#line 855 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-7].String)->empty()) { *(yyvsp[-7].String) += " "; @@ -2991,22 +3046,18 @@ yyreduce: ;} break; - case 184: -#line 840 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - (yyval.String) = new std::string("begin"); - ;} + case 188: +#line 874 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = new std::string("{"); delete (yyvsp[0].String); ;} break; - case 185: -#line 843 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - (yyval.String) = new std::string ("{"); - ;} + case 189: +#line 875 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = new std::string ("{"); ;} break; - case 186: -#line 847 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 190: +#line 877 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-2].String)->empty()) { *O << *(yyvsp[-2].String) << " "; @@ -3017,18 +3068,18 @@ yyreduce: ;} break; - case 187: -#line 856 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { (yyval.String) = new std::string("end"); ;} + case 191: +#line 886 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = new std::string("}"); delete (yyvsp[0].String); ;} break; - case 188: -#line 857 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 192: +#line 887 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string("}"); ;} break; - case 189: -#line 859 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 193: +#line 889 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if ((yyvsp[-1].String)) *O << *(yyvsp[-1].String); @@ -3037,13 +3088,13 @@ yyreduce: ;} break; - case 190: -#line 867 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 194: +#line 897 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 193: -#line 873 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 197: +#line 903 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-1].String)->empty()) *(yyvsp[-2].String) += " " + *(yyvsp[-1].String); @@ -3054,13 +3105,13 @@ yyreduce: ;} break; - case 194: -#line 886 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 198: +#line 916 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 204: -#line 892 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 208: +#line 922 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, "<"); *(yyvsp[-1].String) += ">"; @@ -3068,8 +3119,8 @@ yyreduce: ;} break; - case 206: -#line 898 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 210: +#line 928 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-3].String)->empty()) { *(yyvsp[-4].String) += " " + *(yyvsp[-3].String); @@ -3080,8 +3131,8 @@ yyreduce: ;} break; - case 209: -#line 911 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 213: +#line 941 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value).val = (yyvsp[0].String); (yyval.Value).constant = false; @@ -3090,8 +3141,8 @@ yyreduce: ;} break; - case 210: -#line 917 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 214: +#line 947 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value).val = (yyvsp[0].String); (yyval.Value).constant = true; @@ -3100,8 +3151,8 @@ yyreduce: ;} break; - case 211: -#line 928 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 215: +#line 958 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value) = (yyvsp[0].Value); (yyval.Value).type = (yyvsp[-1].Type); @@ -3109,29 +3160,29 @@ yyreduce: ;} break; - case 212: -#line 934 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 216: +#line 964 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 213: -#line 937 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 217: +#line 967 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Do not allow functions with 0 basic blocks (yyval.String) = 0; ;} break; - case 214: -#line 945 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 218: +#line 975 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 215: -#line 949 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 219: +#line 979 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << "\n"; delete (yyvsp[0].String); @@ -3139,15 +3190,15 @@ yyreduce: ;} break; - case 216: -#line 954 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 220: +#line 984 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; - case 217: -#line 957 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 221: +#line 987 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[0].String) << "\n"; delete (yyvsp[0].String); @@ -3155,8 +3206,13 @@ yyreduce: ;} break; - case 218: -#line 963 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 223: +#line 993 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "unwind"; ;} + break; + + case 224: +#line 995 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Return with a result... *O << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].Value).val << "\n"; delete (yyvsp[-1].String); (yyvsp[0].Value).destroy(); @@ -3164,8 +3220,8 @@ yyreduce: ;} break; - case 219: -#line 968 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 225: +#line 1000 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Return with no result... *O << " " << *(yyvsp[-1].String) << " " << *(yyvsp[0].Type).newTy << "\n"; delete (yyvsp[-1].String); (yyvsp[0].Type).destroy(); @@ -3173,8 +3229,8 @@ yyreduce: ;} break; - case 220: -#line 973 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 226: +#line 1005 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Unconditional Branch... *O << " " << *(yyvsp[-2].String) << " " << *(yyvsp[-1].Type).newTy << " " << *(yyvsp[0].Value).val << "\n"; delete (yyvsp[-2].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy(); @@ -3182,8 +3238,8 @@ yyreduce: ;} break; - case 221: -#line 978 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 227: +#line 1010 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[-8].String) << " " << *(yyvsp[-7].Type).newTy << " " << *(yyvsp[-6].Value).val << ", " << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].Value).val << ", " << *(yyvsp[-1].Type).newTy << " " @@ -3194,8 +3250,8 @@ yyreduce: ;} break; - case 222: -#line 986 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 228: +#line 1018 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[-8].String) << " " << *(yyvsp[-7].Type).newTy << " " << *(yyvsp[-6].Value).val << ", " << *(yyvsp[-4].Type).newTy << " " << *(yyvsp[-3].Value).val << " [" << *(yyvsp[-1].String) << " ]\n"; @@ -3205,8 +3261,8 @@ yyreduce: ;} break; - case 223: -#line 993 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 229: +#line 1025 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[-7].String) << " " << *(yyvsp[-6].Type).newTy << " " << *(yyvsp[-5].Value).val << ", " << *(yyvsp[-3].Type).newTy << " " << *(yyvsp[-2].Value).val << "[]\n"; @@ -3215,8 +3271,8 @@ yyreduce: ;} break; - case 224: -#line 1000 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 230: +#line 1032 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " "; if (!(yyvsp[-13].String)->empty()) @@ -3238,8 +3294,8 @@ yyreduce: ;} break; - case 225: -#line 1019 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 231: +#line 1051 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << "\n"; delete (yyvsp[0].String); @@ -3247,8 +3303,8 @@ yyreduce: ;} break; - case 226: -#line 1024 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 232: +#line 1056 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << "\n"; delete (yyvsp[0].String); @@ -3256,8 +3312,8 @@ yyreduce: ;} break; - case 227: -#line 1030 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 233: +#line 1062 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + " " + *(yyvsp[-3].String) + ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val; (yyvsp[-4].Type).destroy(); delete (yyvsp[-3].String); (yyvsp[-1].Type).destroy(); (yyvsp[0].Value).destroy(); @@ -3265,8 +3321,8 @@ yyreduce: ;} break; - case 228: -#line 1035 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 234: +#line 1067 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-3].String)->insert(0, *(yyvsp[-4].Type).newTy + " " ); *(yyvsp[-3].String) += ", " + *(yyvsp[-1].Type).newTy + " " + *(yyvsp[0].Value).val; @@ -3275,8 +3331,8 @@ yyreduce: ;} break; - case 229: -#line 1043 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 235: +#line 1075 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-1].String)->empty()) *(yyvsp[-1].String) += " = "; @@ -3286,8 +3342,8 @@ yyreduce: ;} break; - case 230: -#line 1052 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 236: +#line 1084 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Used for PHI nodes (yyvsp[-3].Value).val->insert(0, *(yyvsp[-5].Type).newTy + "["); *(yyvsp[-3].Value).val += "," + *(yyvsp[-1].Value).val + "]"; @@ -3297,8 +3353,8 @@ yyreduce: ;} break; - case 231: -#line 1059 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 237: +#line 1091 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-6].String) += ", [" + *(yyvsp[-3].Value).val + "," + *(yyvsp[-1].Value).val + "]"; (yyvsp[-3].Value).destroy(); (yyvsp[-1].Value).destroy(); @@ -3306,34 +3362,34 @@ yyreduce: ;} break; - case 232: -#line 1067 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 238: +#line 1099 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); (yyval.ValList)->push_back((yyvsp[0].Value)); ;} break; - case 233: -#line 1071 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 239: +#line 1103 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-2].ValList)->push_back((yyvsp[0].Value)); (yyval.ValList) = (yyvsp[-2].ValList); ;} break; - case 234: -#line 1078 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 240: +#line 1110 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = (yyvsp[0].ValList); ;} break; - case 235: -#line 1079 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 241: +#line 1111 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); ;} break; - case 236: -#line 1083 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 242: +#line 1115 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3341,8 +3397,18 @@ yyreduce: ;} break; - case 238: -#line 1091 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 244: +#line 1123 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + const char* op = getDivRemOpcode(*(yyvsp[-4].String), (yyvsp[-3].Type)); + (yyval.String) = new std::string(op); + *(yyval.String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; + delete (yyvsp[-4].String); (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); + ;} + break; + + case 245: +#line 1129 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3350,8 +3416,8 @@ yyreduce: ;} break; - case 239: -#line 1096 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 246: +#line 1134 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3359,17 +3425,8 @@ yyreduce: ;} break; - case 240: -#line 1101 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-4].String) += " " + *(yyvsp[-3].Type).newTy + " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; - (yyvsp[-3].Type).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); - (yyval.String) = (yyvsp[-4].String); - ;} - break; - - case 241: -#line 1106 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 247: +#line 1139 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val; (yyvsp[0].Value).destroy(); @@ -3377,8 +3434,8 @@ yyreduce: ;} break; - case 242: -#line 1111 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 248: +#line 1144 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { const char* shiftop = (yyvsp[-3].String)->c_str(); if (*(yyvsp[-3].String) == "shr") @@ -3389,8 +3446,8 @@ yyreduce: ;} break; - case 243: -#line 1119 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 249: +#line 1152 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string source = *(yyvsp[-2].Value).val; TypeInfo SrcTy = (yyvsp[-2].Value).type; @@ -3407,8 +3464,8 @@ yyreduce: ;} break; - case 244: -#line 1133 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 250: +#line 1166 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3416,8 +3473,8 @@ yyreduce: ;} break; - case 245: -#line 1138 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 251: +#line 1171 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Type).newTy; (yyvsp[-2].Value).destroy(); (yyvsp[0].Type).destroy(); @@ -3425,8 +3482,8 @@ yyreduce: ;} break; - case 246: -#line 1143 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 252: +#line 1176 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3434,8 +3491,8 @@ yyreduce: ;} break; - case 247: -#line 1148 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 253: +#line 1181 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3443,8 +3500,8 @@ yyreduce: ;} break; - case 248: -#line 1153 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 254: +#line 1186 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); @@ -3452,8 +3509,8 @@ yyreduce: ;} break; - case 249: -#line 1158 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 255: +#line 1191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3461,8 +3518,8 @@ yyreduce: ;} break; - case 250: -#line 1163 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 256: +#line 1196 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-5].String)->empty()) *(yyvsp[-6].String) += " " + *(yyvsp[-5].String); @@ -3482,23 +3539,23 @@ yyreduce: ;} break; - case 252: -#line 1185 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 258: +#line 1218 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = (yyvsp[0].ValList); ;} break; - case 253: -#line 1186 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 259: +#line 1219 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); ;} break; - case 255: -#line 1191 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 261: +#line 1224 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 256: -#line 1194 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 262: +#line 1227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy; if (!(yyvsp[0].String)->empty()) @@ -3508,8 +3565,8 @@ yyreduce: ;} break; - case 257: -#line 1201 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 263: +#line 1234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val; if (!(yyvsp[0].String)->empty()) @@ -3519,8 +3576,8 @@ yyreduce: ;} break; - case 258: -#line 1208 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 264: +#line 1241 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " " + *(yyvsp[-1].Type).newTy; if (!(yyvsp[0].String)->empty()) @@ -3530,8 +3587,8 @@ yyreduce: ;} break; - case 259: -#line 1215 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 265: +#line 1248 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Type).newTy + ", " + *(yyvsp[-2].Type).newTy + " " + *(yyvsp[-1].Value).val; if (!(yyvsp[0].String)->empty()) @@ -3541,8 +3598,8 @@ yyreduce: ;} break; - case 260: -#line 1222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 266: +#line 1255 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val; (yyvsp[0].Value).destroy(); @@ -3550,8 +3607,8 @@ yyreduce: ;} break; - case 261: -#line 1227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 267: +#line 1260 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-3].String)->empty()) *(yyvsp[-3].String) += " "; @@ -3561,8 +3618,8 @@ yyreduce: ;} break; - case 262: -#line 1234 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 268: +#line 1267 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-5].String)->empty()) *(yyvsp[-5].String) += " "; @@ -3572,8 +3629,8 @@ yyreduce: ;} break; - case 263: -#line 1241 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + case 269: +#line 1274 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Upgrade the indices for (unsigned i = 0; i < (yyvsp[0].ValList)->size(); ++i) { @@ -3604,7 +3661,7 @@ yyreduce: } /* Line 1126 of yacc.c. */ -#line 3608 "UpgradeParser.tab.c" +#line 3665 "UpgradeParser.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -3872,7 +3929,7 @@ yyreturn: } -#line 1265 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 1298 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" int yyerror(const char *ErrorMsg) { diff --git a/tools/llvm-upgrade/UpgradeParser.h.cvs b/tools/llvm-upgrade/UpgradeParser.h.cvs index 5526a71f394..fa719dd364c 100644 --- a/tools/llvm-upgrade/UpgradeParser.h.cvs +++ b/tools/llvm-upgrade/UpgradeParser.h.cvs @@ -84,73 +84,77 @@ LITTLE = 310, BIG = 311, ALIGN = 312, - DEPLIBS = 313, - CALL = 314, - TAIL = 315, - ASM_TOK = 316, - MODULE = 317, - SIDEEFFECT = 318, - CC_TOK = 319, - CCC_TOK = 320, - CSRETCC_TOK = 321, - FASTCC_TOK = 322, - COLDCC_TOK = 323, - X86_STDCALLCC_TOK = 324, - X86_FASTCALLCC_TOK = 325, - DATALAYOUT = 326, - RET = 327, - BR = 328, - SWITCH = 329, - INVOKE = 330, - UNWIND = 331, - UNREACHABLE = 332, - ADD = 333, - SUB = 334, - MUL = 335, - UDIV = 336, - SDIV = 337, - FDIV = 338, - UREM = 339, - SREM = 340, - FREM = 341, - AND = 342, - OR = 343, - XOR = 344, - SETLE = 345, - SETGE = 346, - SETLT = 347, - SETGT = 348, - SETEQ = 349, - SETNE = 350, - MALLOC = 351, - ALLOCA = 352, - FREE = 353, - LOAD = 354, - STORE = 355, - GETELEMENTPTR = 356, - PHI_TOK = 357, - SELECT = 358, - SHL = 359, - SHR = 360, - ASHR = 361, - LSHR = 362, - VAARG = 363, - EXTRACTELEMENT = 364, - INSERTELEMENT = 365, - SHUFFLEVECTOR = 366, - CAST = 367, - TRUNC = 368, - ZEXT = 369, - SEXT = 370, - FPTRUNC = 371, - FPEXT = 372, - FPTOUI = 373, - FPTOSI = 374, - UITOFP = 375, - SITOFP = 376, - PTRTOINT = 377, - INTTOPTR = 378, - BITCAST = 379 + UNINITIALIZED = 313, + DEPLIBS = 314, + CALL = 315, + TAIL = 316, + ASM_TOK = 317, + MODULE = 318, + SIDEEFFECT = 319, + CC_TOK = 320, + CCC_TOK = 321, + CSRETCC_TOK = 322, + FASTCC_TOK = 323, + COLDCC_TOK = 324, + X86_STDCALLCC_TOK = 325, + X86_FASTCALLCC_TOK = 326, + DATALAYOUT = 327, + RET = 328, + BR = 329, + SWITCH = 330, + INVOKE = 331, + EXCEPT = 332, + UNWIND = 333, + UNREACHABLE = 334, + ADD = 335, + SUB = 336, + MUL = 337, + DIV = 338, + UDIV = 339, + SDIV = 340, + FDIV = 341, + REM = 342, + UREM = 343, + SREM = 344, + FREM = 345, + AND = 346, + OR = 347, + XOR = 348, + SETLE = 349, + SETGE = 350, + SETLT = 351, + SETGT = 352, + SETEQ = 353, + SETNE = 354, + MALLOC = 355, + ALLOCA = 356, + FREE = 357, + LOAD = 358, + STORE = 359, + GETELEMENTPTR = 360, + PHI_TOK = 361, + SELECT = 362, + SHL = 363, + SHR = 364, + ASHR = 365, + LSHR = 366, + VAARG = 367, + EXTRACTELEMENT = 368, + INSERTELEMENT = 369, + SHUFFLEVECTOR = 370, + CAST = 371, + TRUNC = 372, + ZEXT = 373, + SEXT = 374, + FPTRUNC = 375, + FPEXT = 376, + FPTOUI = 377, + FPTOSI = 378, + UITOFP = 379, + SITOFP = 380, + PTRTOINT = 381, + INTTOPTR = 382, + BITCAST = 383 }; #endif /* Tokens. */ @@ -209,79 +213,83 @@ #define LITTLE 310 #define BIG 311 #define ALIGN 312 -#define DEPLIBS 313 -#define CALL 314 -#define TAIL 315 -#define ASM_TOK 316 -#define MODULE 317 -#define SIDEEFFECT 318 -#define CC_TOK 319 -#define CCC_TOK 320 -#define CSRETCC_TOK 321 -#define FASTCC_TOK 322 -#define COLDCC_TOK 323 -#define X86_STDCALLCC_TOK 324 -#define X86_FASTCALLCC_TOK 325 -#define DATALAYOUT 326 -#define RET 327 -#define BR 328 -#define SWITCH 329 -#define INVOKE 330 -#define UNWIND 331 -#define UNREACHABLE 332 -#define ADD 333 -#define SUB 334 -#define MUL 335 -#define UDIV 336 -#define SDIV 337 -#define FDIV 338 -#define UREM 339 -#define SREM 340 -#define FREM 341 -#define AND 342 -#define OR 343 -#define XOR 344 -#define SETLE 345 -#define SETGE 346 -#define SETLT 347 -#define SETGT 348 -#define SETEQ 349 -#define SETNE 350 -#define MALLOC 351 -#define ALLOCA 352 -#define FREE 353 -#define LOAD 354 -#define STORE 355 -#define GETELEMENTPTR 356 -#define PHI_TOK 357 -#define SELECT 358 -#define SHL 359 -#define SHR 360 -#define ASHR 361 -#define LSHR 362 -#define VAARG 363 -#define EXTRACTELEMENT 364 -#define INSERTELEMENT 365 -#define SHUFFLEVECTOR 366 -#define CAST 367 -#define TRUNC 368 -#define ZEXT 369 -#define SEXT 370 -#define FPTRUNC 371 -#define FPEXT 372 -#define FPTOUI 373 -#define FPTOSI 374 -#define UITOFP 375 -#define SITOFP 376 -#define PTRTOINT 377 -#define INTTOPTR 378 -#define BITCAST 379 +#define UNINITIALIZED 313 +#define DEPLIBS 314 +#define CALL 315 +#define TAIL 316 +#define ASM_TOK 317 +#define MODULE 318 +#define SIDEEFFECT 319 +#define CC_TOK 320 +#define CCC_TOK 321 +#define CSRETCC_TOK 322 +#define FASTCC_TOK 323 +#define COLDCC_TOK 324 +#define X86_STDCALLCC_TOK 325 +#define X86_FASTCALLCC_TOK 326 +#define DATALAYOUT 327 +#define RET 328 +#define BR 329 +#define SWITCH 330 +#define INVOKE 331 +#define EXCEPT 332 +#define UNWIND 333 +#define UNREACHABLE 334 +#define ADD 335 +#define SUB 336 +#define MUL 337 +#define DIV 338 +#define UDIV 339 +#define SDIV 340 +#define FDIV 341 +#define REM 342 +#define UREM 343 +#define SREM 344 +#define FREM 345 +#define AND 346 +#define OR 347 +#define XOR 348 +#define SETLE 349 +#define SETGE 350 +#define SETLT 351 +#define SETGT 352 +#define SETEQ 353 +#define SETNE 354 +#define MALLOC 355 +#define ALLOCA 356 +#define FREE 357 +#define LOAD 358 +#define STORE 359 +#define GETELEMENTPTR 360 +#define PHI_TOK 361 +#define SELECT 362 +#define SHL 363 +#define SHR 364 +#define ASHR 365 +#define LSHR 366 +#define VAARG 367 +#define EXTRACTELEMENT 368 +#define INSERTELEMENT 369 +#define SHUFFLEVECTOR 370 +#define CAST 371 +#define TRUNC 372 +#define ZEXT 373 +#define SEXT 374 +#define FPTRUNC 375 +#define FPEXT 376 +#define FPTOUI 377 +#define FPTOSI 378 +#define UITOFP 379 +#define SITOFP 380 +#define PTRTOINT 381 +#define INTTOPTR 382 +#define BITCAST 383 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 211 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" +#line 239 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" typedef union YYSTYPE { std::string* String; TypeInfo Type; @@ -290,7 +298,7 @@ typedef union YYSTYPE { ValueList* ValList; } YYSTYPE; /* Line 1447 of yacc.c. */ -#line 294 "UpgradeParser.tab.h" +#line 302 "UpgradeParser.tab.h" # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 diff --git a/tools/llvm-upgrade/UpgradeParser.y.cvs b/tools/llvm-upgrade/UpgradeParser.y.cvs index af6bb3d5812..7815892cb87 100644 --- a/tools/llvm-upgrade/UpgradeParser.y.cvs +++ b/tools/llvm-upgrade/UpgradeParser.y.cvs @@ -65,9 +65,10 @@ void UpgradeAssembly(const std::string &infile, std::istream& in, static void ResolveType(TypeInfo& Ty) { if (Ty.oldTy == UnresolvedTy) { TypeMap::iterator I = NamedTypes.find(*Ty.newTy); - if (I != NamedTypes.end()) + if (I != NamedTypes.end()) { Ty.oldTy = I->second.oldTy; - else { + Ty.elemTy = I->second.elemTy; + } else { std::string msg("Can't resolve type: "); msg += *Ty.newTy; yyerror(msg.c_str()); @@ -76,6 +77,7 @@ static void ResolveType(TypeInfo& Ty) { unsigned ref = atoi(&((Ty.newTy->c_str())[1])); // Skip the '\\' if (ref < EnumeratedTypes.size()) { Ty.oldTy = EnumeratedTypes[ref].oldTy; + Ty.elemTy = EnumeratedTypes[ref].elemTy; } else { std::string msg("Can't resolve type: "); msg += *Ty.newTy; @@ -204,6 +206,32 @@ static std::string getCastUpgrade( return Result; } +const char* getDivRemOpcode(const std::string& opcode, const TypeInfo& TI) { + const char* op = opcode.c_str(); + TypeInfo Ty = TI; + ResolveType(Ty); + if (Ty.isPacked()) + Ty.oldTy = Ty.getElementType(); + if (opcode == "div") + if (Ty.isFloatingPoint()) + op = "fdiv"; + else if (Ty.isUnsigned()) + op = "udiv"; + else if (Ty.isSigned()) + op = "sdiv"; + else + yyerror("Invalid type for div instruction"); + else if (opcode == "rem") + if (Ty.isFloatingPoint()) + op = "frem"; + else if (Ty.isUnsigned()) + op = "urem"; + else if (Ty.isSigned()) + op = "srem"; + else + yyerror("Invalid type for rem instruction"); + return op; +} %} %file-prefix="UpgradeParser" @@ -226,13 +254,13 @@ static std::string getCastUpgrade( %token TO DOTDOTDOT CONST INTERNAL LINKONCE WEAK %token DLLIMPORT DLLEXPORT EXTERN_WEAK APPENDING %token NOT EXTERNAL TARGET TRIPLE ENDIAN POINTERSIZE LITTLE BIG -%token ALIGN +%token ALIGN UNINITIALIZED %token DEPLIBS CALL TAIL ASM_TOK MODULE SIDEEFFECT %token CC_TOK CCC_TOK CSRETCC_TOK FASTCC_TOK COLDCC_TOK %token X86_STDCALLCC_TOK X86_FASTCALLCC_TOK %token DATALAYOUT -%token RET BR SWITCH INVOKE UNWIND UNREACHABLE -%token ADD SUB MUL UDIV SDIV FDIV UREM SREM FREM AND OR XOR +%token RET BR SWITCH INVOKE EXCEPT UNWIND UNREACHABLE +%token ADD SUB MUL DIV UDIV SDIV FDIV REM UREM SREM FREM AND OR XOR %token SETLE SETGE SETLT SETGT SETEQ SETNE // Binary Comparators %token MALLOC ALLOCA FREE LOAD STORE GETELEMENTPTR %token PHI_TOK SELECT SHL SHR ASHR LSHR VAARG @@ -247,10 +275,10 @@ static std::string getCastUpgrade( %type ArgVal ArgListH ArgList FunctionHeaderH BEGIN FunctionHeader END %type Function FunctionProto BasicBlock TypeListI %type InstructionList BBTerminatorInst JumpTable Inst PHIList -%type OptTailCall InstVal OptVolatile +%type OptTailCall InstVal OptVolatile Unwind %type MemoryInst SymbolicValueRef OptSideEffect GlobalType %type FnDeclareLinkage BasicBlockList BigOrLittle AsmBlock -%type Name ConstValueRef ConstVector +%type Name ConstValueRef ConstVector External %type ShiftOps SetCondOps LogicalOps ArithmeticOps CastOps %type ValueRefList ValueRefListE IndexList @@ -273,7 +301,8 @@ EInt64Val : ESINT64VAL | EUINT64VAL; // Operations that are notably excluded from this list include: // RET, BR, & SWITCH because they end basic blocks and are treated specially. -ArithmeticOps: ADD | SUB | MUL | UDIV | SDIV | FDIV | UREM | SREM | FREM; +ArithmeticOps: ADD | SUB | MUL | DIV | UDIV | SDIV | FDIV + | REM | UREM | SREM | FREM; LogicalOps : AND | OR | XOR; SetCondOps : SETLE | SETGE | SETLT | SETGT | SETEQ | SETNE; ShiftOps : SHL | SHR | ASHR | LSHR; @@ -378,12 +407,10 @@ UpRTypes $$.newTy = $1; $$.oldTy = UnresolvedTy; } - | PrimType - ; - -// Include derived types in the Types production. -// -UpRTypes : '\\' EUINT64VAL { // Type UpReference + | PrimType { + $$ = $1; + } + | '\\' EUINT64VAL { // Type UpReference $2->insert(0, "\\"); $$.newTy = $2; $$.oldTy = NumericTy; @@ -400,6 +427,7 @@ UpRTypes : '\\' EUINT64VAL { // Type UpReference delete $4.newTy; $$.newTy = $2; $$.oldTy = ArrayTy; + $$.elemTy = $4.oldTy; } | '<' EUINT64VAL 'x' UpRTypes '>' { // Packed array type? $2->insert(0,"< "); @@ -407,6 +435,7 @@ UpRTypes : '\\' EUINT64VAL { // Type UpReference delete $4.newTy; $$.newTy = $2; $$.oldTy = PackedTy; + $$.elemTy = $4.oldTy; } | '{' TypeListI '}' { // Structure type? $2->insert(0, "{ "); @@ -420,6 +449,7 @@ UpRTypes : '\\' EUINT64VAL { // Type UpReference } | UpRTypes '*' { // Pointer type? *$1.newTy += '*'; + $$.elemTy = $1.oldTy; $1.oldTy = PointerTy; $$ = $1; }; @@ -586,9 +616,10 @@ ConstExpr: CastOps '(' ConstVal TO Types ')' { $$ = $1; } | ArithmeticOps '(' ConstVal ',' ConstVal ')' { - *$1 += "(" + *$3.cnst + "," + *$5.cnst + ")"; - $3.destroy(); $5.destroy(); - $$ = $1; + const char* op = getDivRemOpcode(*$1, $3.type); + $$ = new std::string(op); + *$$ += "(" + *$3.cnst + "," + *$5.cnst + ")"; + delete $1; $3.destroy(); $5.destroy(); } | LogicalOps '(' ConstVal ',' ConstVal ')' { *$1 += "(" + *$3.cnst + "," + *$5.cnst + ")"; @@ -671,12 +702,15 @@ DefinitionList : DefinitionList Function { } | ConstPool { $$ = 0; } +External : EXTERNAL | UNINITIALIZED { $$ = $1; *$$ = "external"; } + // ConstPool - Constants with optional names assigned to them. ConstPool : ConstPool OptAssign TYPE TypesV { EnumeratedTypes.push_back($4); if (!$2->empty()) { NamedTypes[*$2].newTy = new std::string(*$4.newTy); NamedTypes[*$2].oldTy = $4.oldTy; + NamedTypes[*$2].elemTy = $4.elemTy; *O << *$2 << " = "; } *O << "type " << *$4.newTy << "\n"; @@ -700,7 +734,7 @@ ConstPool : ConstPool OptAssign TYPE TypesV { delete $2; delete $3; delete $4; $5.destroy(); delete $6; $$ = 0; } - | ConstPool OptAssign EXTERNAL GlobalType Types GlobalVarAttributes { + | ConstPool OptAssign External GlobalType Types GlobalVarAttributes { if (!$2->empty()) *O << *$2 << " = "; *O << *$3 << " " << *$4 << " " << *$5.newTy << " " << *$6 << "\n"; @@ -837,12 +871,8 @@ FunctionHeaderH : OptCallingConv TypesV Name '(' ArgList ')' $$ = $1; }; -BEGIN : BEGINTOK { - $$ = new std::string("begin"); - } - | '{' { - $$ = new std::string ("{"); - } +BEGIN : BEGINTOK { $$ = new std::string("{"); delete $1; } + | '{' { $$ = new std::string ("{"); } FunctionHeader : OptLinkage FunctionHeaderH BEGIN { if (!$1->empty()) { @@ -853,7 +883,7 @@ FunctionHeader : OptLinkage FunctionHeaderH BEGIN { $$ = 0; }; -END : ENDTOK { $$ = new std::string("end"); } +END : ENDTOK { $$ = new std::string("}"); delete $1; } | '}' { $$ = new std::string("}"); }; Function : FunctionHeader BasicBlockList END { @@ -960,6 +990,8 @@ InstructionList : InstructionList Inst { $$ = 0; }; +Unwind : UNWIND | EXCEPT { $$ = $1; *$$ = "unwind"; } + BBTerminatorInst : RET ResolvedVal { // Return with a result... *O << " " << *$1 << " " << *$2.val << "\n"; delete $1; $2.destroy(); @@ -997,7 +1029,7 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... $$ = 0; } | OptAssign INVOKE OptCallingConv TypesV ValueRef '(' ValueRefListE ')' - TO LABEL ValueRef UNWIND LABEL ValueRef { + TO LABEL ValueRef Unwind LABEL ValueRef { *O << " "; if (!$1->empty()) *O << *$1 << " = "; @@ -1016,7 +1048,7 @@ BBTerminatorInst : RET ResolvedVal { // Return with a result... $14.destroy(); $$ = 0; } - | UNWIND { + | Unwind { *O << " " << *$1 << "\n"; delete $1; $$ = 0; @@ -1089,9 +1121,10 @@ OptTailCall ; InstVal : ArithmeticOps Types ValueRef ',' ValueRef { - *$1 += " " + *$2.newTy + " " + *$3.val + ", " + *$5.val; - $2.destroy(); $3.destroy(); $5.destroy(); - $$ = $1; + const char* op = getDivRemOpcode(*$1, $2); + $$ = new std::string(op); + *$$ += " " + *$2.newTy + " " + *$3.val + ", " + *$5.val; + delete $1; $2.destroy(); $3.destroy(); $5.destroy(); } | LogicalOps Types ValueRef ',' ValueRef { *$1 += " " + *$2.newTy + " " + *$3.val + ", " + *$5.val;