diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs index ac0044ba8af..da69f6f9bcc 100644 --- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs +++ b/tools/llvm-upgrade/UpgradeParser.cpp.cvs @@ -368,7 +368,7 @@ /* Copy the first part of user declarations. */ -#line 14 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 14 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" #include "UpgradeInternals.h" #include @@ -1174,7 +1174,7 @@ std::string getGlobalName(const std::string* Name, const std::string Linkage, #endif #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 802 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 802 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" typedef union YYSTYPE { std::string* String; const TypeInfo* Type; @@ -1347,16 +1347,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1486 +#define YYLAST 1463 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 165 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 75 /* YYNRULES -- Number of rules. */ -#define YYNRULES 301 +#define YYNRULES 300 /* YYNRULES -- Number of states. */ -#define YYNSTATES 586 +#define YYNSTATES 584 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -1444,9 +1444,9 @@ static const unsigned short int yyprhs[] = 693, 694, 696, 698, 700, 703, 706, 710, 720, 730, 739, 754, 756, 758, 765, 771, 774, 781, 789, 791, 795, 797, 798, 801, 803, 809, 815, 821, 828, 835, - 838, 843, 848, 855, 860, 865, 872, 879, 882, 890, - 892, 895, 896, 898, 899, 903, 910, 914, 921, 924, - 929, 936 + 840, 845, 852, 857, 862, 869, 876, 879, 887, 889, + 892, 893, 895, 896, 900, 907, 911, 918, 921, 926, + 933 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -1535,18 +1535,17 @@ static const short int yyrhs[] = -1, 60, -1, 168, 190, 223, 152, 223, -1, 169, 190, 223, 152, 223, -1, 170, 190, 223, 152, 223, -1, 100, 171, 190, 223, 152, 223, -1, 101, 172, - 190, 223, 152, 223, -1, 49, 224, -1, 173, 224, - 152, 224, -1, 174, 224, 39, 190, -1, 129, 224, - 152, 224, 152, 224, -1, 134, 224, 152, 190, -1, - 135, 224, 152, 224, -1, 136, 224, 152, 224, 152, - 224, -1, 137, 224, 152, 224, 152, 224, -1, 128, - 232, -1, 235, 181, 188, 223, 154, 234, 155, -1, - 239, -1, 152, 233, -1, -1, 38, -1, -1, 122, - 190, 183, -1, 122, 190, 152, 10, 223, 183, -1, - 123, 190, 183, -1, 123, 190, 152, 10, 223, 183, - -1, 124, 224, -1, 238, 125, 190, 223, -1, 238, - 126, 224, 152, 190, 223, -1, 127, 190, 223, 237, - -1 + 190, 223, 152, 223, -1, 173, 224, 152, 224, -1, + 174, 224, 39, 190, -1, 129, 224, 152, 224, 152, + 224, -1, 134, 224, 152, 190, -1, 135, 224, 152, + 224, -1, 136, 224, 152, 224, 152, 224, -1, 137, + 224, 152, 224, 152, 224, -1, 128, 232, -1, 235, + 181, 188, 223, 154, 234, 155, -1, 239, -1, 152, + 233, -1, -1, 38, -1, -1, 122, 190, 183, -1, + 122, 190, 152, 10, 223, 183, -1, 123, 190, 183, + -1, 123, 190, 152, 10, 223, 183, -1, 124, 224, + -1, 238, 125, 190, 223, -1, 238, 126, 224, 152, + 190, 223, -1, 127, 190, 223, 237, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -1580,9 +1579,9 @@ static const unsigned short int yyrline[] = 1598, 1601, 1607, 1607, 1609, 1614, 1619, 1624, 1632, 1640, 1647, 1669, 1674, 1680, 1686, 1694, 1712, 1720, 1729, 1733, 1740, 1741, 1745, 1750, 1753, 1762, 1770, 1779, 1787, 1795, - 1800, 1809, 1837, 1843, 1849, 1856, 1862, 1868, 1874, 1902, - 1907, 1908, 1912, 1913, 1916, 1924, 1933, 1941, 1950, 1956, - 1965, 1974 + 1804, 1832, 1838, 1844, 1851, 1857, 1863, 1869, 1897, 1902, + 1903, 1907, 1908, 1911, 1919, 1928, 1936, 1945, 1951, 1960, + 1969 }; #endif @@ -1689,9 +1688,9 @@ static const unsigned char yyr1[] = 227, 227, 228, 228, 229, 229, 229, 229, 229, 229, 229, 229, 229, 230, 230, 231, 232, 232, 233, 233, 234, 234, 235, 235, 236, 236, 236, 236, 236, 236, - 236, 236, 236, 236, 236, 236, 236, 236, 236, 236, - 237, 237, 238, 238, 239, 239, 239, 239, 239, 239, - 239, 239 + 236, 236, 236, 236, 236, 236, 236, 236, 236, 237, + 237, 238, 238, 239, 239, 239, 239, 239, 239, 239, + 239 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1724,10 +1723,10 @@ static const unsigned char yyr2[] = 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, 6, 6, 2, - 4, 4, 6, 4, 4, 6, 6, 2, 7, 1, - 2, 0, 1, 0, 3, 6, 3, 6, 2, 4, - 6, 4 + 1, 0, 2, 1, 5, 5, 5, 6, 6, 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 @@ -1745,147 +1744,147 @@ static const unsigned short int yydefact[] = 121, 122, 123, 124, 125, 126, 127, 2, 3, 0, 0, 0, 0, 241, 0, 0, 110, 129, 114, 242, 128, 218, 219, 220, 221, 222, 223, 246, 0, 0, - 0, 253, 252, 262, 293, 261, 248, 249, 0, 0, + 0, 253, 252, 262, 292, 261, 248, 249, 0, 0, 0, 0, 205, 193, 187, 185, 175, 176, 0, 0, 0, 0, 130, 0, 0, 0, 113, 135, 139, 0, 0, 144, 138, 255, 0, 254, 0, 0, 72, 76, - 71, 75, 70, 74, 69, 73, 77, 78, 0, 292, - 0, 273, 0, 98, 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, - 0, 0, 52, 53, 54, 55, 0, 0, 0, 0, - 68, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 0, 0, 0, 0, 0, 98, 265, - 0, 289, 200, 197, 196, 198, 199, 201, 204, 0, - 106, 106, 115, 116, 117, 118, 119, 120, 121, 122, - 123, 124, 125, 0, 0, 0, 0, 106, 106, 0, - 0, 0, 0, 0, 134, 216, 143, 141, 0, 230, - 231, 232, 235, 236, 237, 233, 234, 228, 0, 0, + 71, 75, 70, 74, 69, 73, 77, 78, 0, 291, + 273, 0, 98, 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, 0, + 0, 52, 53, 54, 55, 0, 0, 0, 0, 68, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, 0, 0, 0, 0, 0, 98, 265, 0, + 288, 200, 197, 196, 198, 199, 201, 204, 0, 106, + 106, 115, 116, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 0, 0, 0, 0, 106, 106, 0, 0, + 0, 0, 0, 134, 216, 143, 141, 0, 230, 231, + 232, 235, 236, 237, 233, 234, 228, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 239, 244, 243, 245, 0, 256, 0, 279, 272, - 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 0, 50, 51, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 0, 101, - 101, 298, 0, 0, 287, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 202, - 0, 190, 191, 158, 159, 4, 5, 156, 157, 160, - 151, 152, 155, 0, 0, 0, 0, 154, 153, 188, - 189, 112, 112, 137, 0, 140, 215, 209, 212, 213, - 0, 0, 131, 229, 0, 0, 0, 0, 0, 0, - 0, 0, 174, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 294, 0, 296, 291, 0, + 239, 244, 243, 245, 0, 256, 0, 272, 0, 26, + 27, 28, 29, 30, 31, 32, 33, 34, 35, 0, + 50, 51, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 0, 101, 101, 297, + 0, 0, 286, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 202, 0, 190, + 191, 158, 159, 4, 5, 156, 157, 160, 151, 152, + 155, 0, 0, 0, 0, 154, 153, 188, 189, 112, + 112, 137, 0, 140, 215, 209, 212, 213, 0, 0, + 131, 229, 0, 0, 0, 0, 0, 0, 0, 0, + 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 293, 0, 295, 290, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 203, 0, 0, 108, 106, 146, - 0, 0, 150, 0, 147, 132, 133, 136, 208, 210, - 0, 104, 142, 0, 0, 0, 291, 0, 0, 0, - 0, 0, 238, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 301, 0, 0, - 0, 283, 284, 0, 0, 0, 0, 0, 280, 281, - 0, 299, 0, 103, 109, 107, 145, 148, 149, 214, - 211, 105, 99, 0, 0, 0, 0, 0, 0, 0, - 0, 173, 0, 0, 0, 0, 0, 0, 0, 271, - 0, 0, 101, 102, 101, 268, 290, 0, 0, 0, - 0, 0, 274, 275, 276, 271, 0, 0, 217, 240, - 0, 0, 162, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 270, 0, 277, 278, 0, 295, - 297, 0, 0, 0, 282, 285, 286, 0, 300, 100, - 0, 0, 0, 170, 0, 0, 164, 165, 166, 169, - 161, 0, 259, 0, 0, 0, 269, 266, 0, 288, - 167, 168, 0, 0, 0, 257, 0, 258, 0, 0, - 267, 163, 171, 172, 0, 0, 0, 0, 0, 0, - 264, 0, 0, 263, 0, 260 + 0, 0, 203, 0, 0, 108, 106, 146, 0, 0, + 150, 0, 147, 132, 133, 136, 208, 210, 0, 104, + 142, 0, 0, 0, 290, 0, 0, 0, 0, 0, + 238, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 300, 0, 0, 0, 282, + 283, 0, 0, 0, 0, 0, 279, 280, 0, 298, + 0, 103, 109, 107, 145, 148, 149, 214, 211, 105, + 99, 0, 0, 0, 0, 0, 0, 0, 0, 173, + 0, 0, 0, 0, 0, 0, 0, 271, 0, 0, + 101, 102, 101, 268, 289, 0, 0, 0, 0, 0, + 274, 275, 276, 271, 0, 0, 217, 240, 0, 0, + 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 270, 0, 277, 278, 0, 294, 296, 0, + 0, 0, 281, 284, 285, 0, 299, 100, 0, 0, + 0, 170, 0, 0, 164, 165, 166, 169, 161, 0, + 259, 0, 0, 0, 269, 266, 0, 287, 167, 168, + 0, 0, 0, 257, 0, 258, 0, 0, 267, 163, + 171, 172, 0, 0, 0, 0, 0, 0, 264, 0, + 0, 263, 0, 260 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short int yydefgoto[] = { - -1, 83, 337, 266, 267, 268, 291, 308, 269, 270, - 233, 234, 148, 235, 24, 15, 38, 508, 385, 407, - 472, 331, 408, 84, 85, 236, 87, 88, 129, 248, - 372, 271, 373, 118, 1, 2, 57, 3, 61, 215, - 48, 113, 219, 89, 419, 358, 359, 360, 39, 93, - 16, 96, 17, 29, 18, 364, 272, 90, 274, 495, - 41, 42, 43, 105, 106, 554, 107, 314, 524, 525, - 208, 209, 447, 210, 211 + -1, 83, 335, 265, 266, 267, 289, 306, 268, 269, + 232, 233, 148, 234, 24, 15, 38, 506, 383, 405, + 470, 329, 406, 84, 85, 235, 87, 88, 129, 247, + 370, 270, 371, 118, 1, 2, 57, 3, 61, 214, + 48, 113, 218, 89, 417, 356, 357, 358, 39, 93, + 16, 96, 17, 29, 18, 362, 271, 90, 273, 493, + 41, 42, 43, 105, 106, 552, 107, 312, 522, 523, + 207, 208, 445, 209, 210 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -513 +#define YYPACT_NINF -509 static const short int yypact[] = { - -513, 46, 217, 541, -513, -513, 82, -513, -513, -513, - -513, -513, -513, -513, 16, 111, 25, -513, -513, -513, - -513, 34, -55, 61, 26, -23, -513, -513, -513, 111, - 132, 146, -513, -513, -513, -513, -513, -513, 873, -26, - -513, -18, -513, 47, 19, 23, 39, 67, -513, 77, - 132, 873, 81, 81, -513, -513, 81, 81, -513, -513, - -513, -513, -513, 89, -513, -513, -513, -513, -513, -513, - -513, -513, -513, -513, -513, -513, -513, -513, -513, 227, - 229, -9, 506, -513, 133, 95, -513, -513, -111, -513, - -513, -513, -513, -513, -513, -513, -513, -513, 901, 36, - 148, -513, -513, -513, 1336, -513, -513, -513, 222, 76, - 250, 239, 241, -513, -513, -513, -513, -513, 933, 933, - 963, 933, -513, 115, 116, 614, -513, -513, -111, -104, - 120, 216, -513, 89, 1134, -513, 1134, 1134, -513, -513, - -513, -513, -513, -513, -513, -513, -513, -513, 1134, -513, - 933, -513, 218, 111, -513, -513, -513, -513, -513, -513, - -513, -513, -513, -513, -513, -513, -513, -513, -513, -513, - -513, -513, -513, -513, 195, 84, 933, 933, 933, 933, - 933, 933, -513, -513, -513, -513, 933, 933, 933, 933, - -513, -513, -513, -513, -513, -513, -513, -513, -513, -513, - -513, -513, -513, 933, 933, 933, 933, 933, 111, -513, - 11, -513, -513, -513, -513, -513, -513, -513, -513, -93, - 129, 129, 121, 166, 169, 191, 193, 220, 223, 237, - 240, 261, 263, 249, 249, 264, 1045, 129, 129, 933, - 933, 126, -73, 933, -513, 701, -513, 138, 136, -513, - -513, -513, -513, -513, -513, -513, -513, 228, 195, 84, - 140, 150, 154, 156, 158, 963, 167, 168, 170, 171, - 172, -513, -513, -513, -513, 175, -513, 176, -513, -513, - 873, -513, -513, -513, -513, -513, -513, -513, -513, -513, - -513, 933, -513, -513, -513, -513, -513, -513, -513, -513, - -513, -513, -513, -513, -513, -513, -513, -513, 933, 177, - 178, -513, 1134, 164, 179, 182, 183, 184, 186, 188, - 1134, 1134, 1134, 189, 284, 873, 933, 933, 312, -513, - -8, -513, -513, -513, -513, -513, -513, -513, -513, -513, - -513, -513, -513, 741, 963, 673, 314, -513, -513, -513, - -513, -113, -99, -513, 185, -111, -513, 133, -513, 194, - 192, 774, -513, -513, 318, 198, 205, 963, 963, 963, - 963, 963, -513, -58, 963, 963, 963, 963, 963, 345, - 348, 1134, 1134, 1134, -2, -513, 9, -513, 212, 1134, - 209, 933, 933, 933, 933, 933, 214, 215, 219, 933, - 933, 1134, 1134, 221, -513, 338, 352, -513, 129, -513, - -61, -57, -513, -70, -513, -513, -513, -513, -513, -513, - 833, 337, -513, 224, 963, 963, 212, 231, 235, 236, - 238, 963, -513, 242, 243, 244, 245, 342, 1134, 1134, - 247, 251, 252, 1134, 371, 1134, 933, -513, 253, 1134, - 254, -513, -513, 255, 257, 1134, 1134, 1134, -513, -513, - 248, -513, 933, -513, -513, -513, -513, -513, -513, -513, - -513, -513, 335, 363, 258, 262, 260, 963, 963, 963, - 963, -513, 963, 963, 963, 963, 933, 265, 266, 933, - 1134, 1134, 267, -513, 267, -513, 268, 1134, 269, 933, - 933, 933, -513, -513, -513, 933, 1134, 398, -513, -513, - 963, 963, -513, 271, 273, 277, 278, 276, 279, 282, - 283, 286, 403, 15, 268, 289, -513, -513, 375, -513, - -513, 933, 275, 1134, -513, -513, -513, 292, -513, -513, - 294, 295, 963, -513, 963, 963, -513, -513, -513, -513, - -513, 1134, -513, 1223, 27, 400, -513, -513, 297, -513, - -513, -513, 303, 304, 305, -513, 313, -513, 1223, 449, - -513, -513, -513, -513, 451, 316, 1134, 1134, 454, 135, - -513, 1134, 457, -513, 1134, -513 + -509, 53, 152, 539, -509, -509, 46, -509, -509, -509, + -509, -509, -509, -509, 5, 56, 55, -509, -509, -509, + -509, -4, -81, 26, 134, -16, -509, -509, -509, 56, + 113, 128, -509, -509, -509, -509, -509, -509, 830, -25, + -509, -18, -509, -1, 11, 40, 42, 54, -509, 33, + 113, 830, 96, 96, -509, -509, 96, 96, -509, -509, + -509, -509, -509, 62, -509, -509, -509, -509, -509, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, 223, + 225, -10, 100, -509, 145, 77, -509, -509, -108, -509, + -509, -509, -509, -509, -509, -509, -509, -509, 869, 41, + 148, -509, -509, -509, 1313, -509, -509, -509, 219, 153, + 234, 237, 250, -509, -509, -509, -509, -509, 898, 898, + 936, 898, -509, 98, 103, 504, -509, -509, -108, -100, + 122, 214, -509, 62, 1128, -509, 1128, 1128, -509, -509, + -509, -509, -509, -509, -509, -509, -509, -509, 1128, -509, + -509, 224, 56, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -509, 193, 535, 898, 898, 898, 898, 898, + 898, -509, -509, -509, -509, 898, 898, 898, 898, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, -509, 898, 898, 898, 898, 898, 56, -509, 110, + -509, -509, -509, -509, -509, -509, -509, -509, -57, 138, + 138, 213, 228, 230, 240, 246, 248, 252, 254, 261, + 271, 281, 265, 265, 285, 980, 138, 138, 898, 898, + 150, -87, 898, -509, 671, -509, 156, 163, -509, -509, + -509, -509, -509, -509, -509, -509, 255, 193, 535, 166, + 167, 168, 169, 170, 936, 171, 172, 173, 174, 175, + -509, -509, -509, -509, 180, -509, 181, -509, 830, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, 898, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, -509, -509, -509, -509, -509, 898, 182, 184, -509, + 1128, 183, 186, 188, 190, 191, 192, 194, 1128, 1128, + 1128, 198, 306, 830, 898, 898, 327, -509, 4, -509, + -509, -509, -509, -509, -509, -509, -509, -509, -509, -509, + -509, 709, 936, 612, 328, -509, -509, -509, -509, -92, + -109, -509, 201, -108, -509, 145, -509, 210, 208, 739, + -509, -509, 334, 212, 215, 936, 936, 936, 936, 936, + -509, -70, 936, 936, 936, 936, 936, 350, 353, 1128, + 1128, 1128, 2, -509, 30, -509, 220, 1128, 218, 898, + 898, 898, 898, 898, 227, 229, 233, 898, 898, 1128, + 1128, 235, -509, 341, 368, -509, 138, -509, -56, -66, + -509, -83, -509, -509, -509, -509, -509, -509, 777, 351, + -509, 238, 936, 936, 220, 239, 241, 242, 243, 936, + -509, 247, 249, 251, 253, 361, 1128, 1128, 258, 256, + 262, 1128, 374, 1128, 898, -509, 263, 1128, 264, -509, + -509, 266, 267, 1128, 1128, 1128, -509, -509, 259, -509, + 898, -509, -509, -509, -509, -509, -509, -509, -509, -509, + 345, 377, 268, 269, 272, 936, 936, 936, 936, -509, + 936, 936, 936, 936, 898, 274, 273, 898, 1128, 1128, + 276, -509, 276, -509, 278, 1128, 279, 898, 898, 898, + -509, -509, -509, 898, 1128, 386, -509, -509, 936, 936, + -509, 280, 282, 283, 284, 287, 290, 292, 293, 298, + 402, 14, 278, 301, -509, -509, 382, -509, -509, 898, + 299, 1128, -509, -509, -509, 303, -509, -509, 307, 308, + 936, -509, 936, 936, -509, -509, -509, -509, -509, 1128, + -509, 1217, 27, 425, -509, -509, 309, -509, -509, -509, + 311, 315, 316, -509, 320, -509, 1217, 459, -509, -509, + -509, -509, 460, 325, 1128, 1128, 463, 211, -509, 1128, + 464, -509, 1128, -509 }; /* YYPGOTO[NTERM-NUM]. */ static const short int yypgoto[] = { - -513, -513, 246, 369, 370, 372, 225, 226, 373, 377, - -98, -97, -507, -513, 436, 458, -141, -513, -303, 63, - -513, -220, -513, -46, -513, -38, -513, -68, -20, -513, - 130, 256, -230, 51, -513, -513, -513, -513, 439, -513, - -513, -513, -513, 1, -513, 66, -513, -513, 461, -513, - -513, -513, -513, -513, 488, -513, -512, -106, -3, -88, - -513, 455, -513, -84, -513, -513, -513, -513, 56, 18, - -513, -513, 98, -513, -513 + -509, -509, 257, 376, 378, 379, 231, 226, 383, 385, + -98, -97, -505, -509, 438, 469, -143, -509, -302, 75, + -509, -219, -509, -46, -509, -38, -509, -68, 38, -509, + 130, 286, -140, 154, -509, -509, -509, -509, 450, -509, + -509, -509, -509, 1, -509, 104, -509, -509, 496, -509, + -509, -509, -509, -509, 523, -509, -508, -106, -3, -88, + -509, 486, -509, -48, -509, -509, -509, -509, 86, 28, + -509, -509, 109, -509, -509 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1895,308 +1894,304 @@ static const short int yypgoto[] = #define YYTABLE_NINF -178 static const short int yytable[] = { - 86, 332, 146, 147, 25, 115, 91, 387, 443, 124, - 135, 40, 280, 86, 128, 94, 553, 349, 350, 445, - 138, 139, 140, 141, 142, 143, 144, 145, 273, 405, - 273, 273, 138, 139, 140, 141, 142, 143, 144, 145, - 136, 566, 273, -112, 25, 415, 4, 568, 243, 406, - 132, 137, 132, 51, 40, 444, 575, 128, 244, 328, - 134, 416, 278, 128, 132, 329, 444, 325, 7, 8, - 9, 52, 11, 53, 13, 19, 54, 20, 30, 243, - 220, 221, 431, 238, 55, 130, 44, 45, 46, 354, - 311, 431, 468, 315, 431, 431, 49, 466, 316, 317, - 318, 319, 432, 467, 119, 242, 47, 120, 121, 292, - 293, 247, 134, 410, 411, 413, 116, 117, 323, 324, - 98, 99, 100, 50, 101, 102, 103, 27, 58, 28, - 348, 213, 214, 275, 276, 92, 326, 327, 309, 310, - 134, 312, 313, 134, 95, 277, 333, 334, 134, 134, - 134, 134, 125, 138, 139, 140, 141, 142, 143, 144, - 145, 19, 60, 20, 62, 320, 321, 322, 134, 134, - 108, 351, 352, 552, 109, 355, 31, 32, 33, 34, - 35, 36, 37, -72, -72, 567, -76, -76, 465, 529, - 110, 530, 294, 295, 296, 297, 298, 299, 300, 301, - 302, 303, 304, 305, 306, 307, 273, 357, -71, -71, - -75, -75, 101, 102, 273, 273, 273, -177, 111, 126, - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 112, 381, 77, 78, -70, -70, 403, - -74, -74, 86, -113, 19, 122, 20, 123, 5, 131, - 237, 6, 212, 382, -69, -69, 246, -73, -73, 7, - 8, 9, 10, 11, 12, 13, 335, 336, 216, 217, - 383, 218, 239, 240, 245, 273, 273, 273, 279, 401, - 14, 330, -79, 273, -80, 339, 353, 86, 402, 134, - 361, 362, 363, 355, 367, 273, 273, 281, 282, 283, - 284, 285, 286, 450, 368, 452, 453, 454, 369, 388, - 370, 458, 371, 287, 288, 289, 290, 396, 397, 398, - 389, 374, 375, 400, 376, 377, 378, 379, 380, 384, - 386, 390, 273, 273, 391, 392, 393, 273, 394, 273, - 395, 399, 404, 273, 414, 417, 420, 421, 423, 273, - 273, 273, 424, 134, 451, 134, 134, 134, 418, 425, - 438, 134, 459, 439, 446, 449, 455, 456, 463, 79, - 464, 457, 80, 462, 405, 81, 473, 82, 440, 441, - 442, 486, 357, 477, 273, 273, 448, 478, 479, 493, - 480, 273, 507, 509, 482, 483, 484, 485, 460, 461, - 273, 489, 505, 490, 491, 497, 499, 500, 134, 501, - 510, 534, 535, 536, 511, 512, 539, 522, 551, 528, - 531, 533, 523, 542, 506, 146, 147, 273, 543, 544, - 545, 546, 444, 557, 547, 487, 488, 548, 549, 569, - 492, 550, 494, 556, 555, 273, 498, 559, 521, 560, - 561, 134, 502, 503, 504, 570, 146, 147, 571, 572, - 573, 134, 134, 134, 576, 574, 577, 134, 578, 581, - 273, 273, 584, 203, 204, 273, 205, 206, 273, 104, - 338, 207, 56, 365, 471, 366, 470, 526, 527, 114, - 59, 26, 347, 134, 532, 582, 97, 426, 427, 428, - 429, 430, 496, 538, 433, 434, 435, 436, 437, 126, - 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, - 74, 75, 76, 537, 476, 77, 78, 0, 0, 0, - 558, 0, 0, 0, 19, 0, 20, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 565, 0, - 0, 0, 0, 0, 474, 475, 0, 0, 0, 0, - 0, 481, 0, 0, 0, 0, 0, 0, -82, 19, - 0, 20, 0, 579, 580, 6, -82, -82, 583, 0, - 0, 585, 0, -82, -82, -82, -82, -82, -82, -82, - 0, -82, 21, 0, 0, 0, 0, 0, 0, -82, - 22, 0, 0, 0, 23, 0, 0, 513, 514, 515, - 516, 0, 517, 518, 519, 520, 0, 126, 64, 65, + 86, 330, 146, 147, 25, 115, 385, 91, 124, 278, + 135, 40, 441, 86, 128, 94, 551, 347, 348, 138, + 139, 140, 141, 142, 143, 144, 145, 19, 272, 20, + 272, 272, 138, 139, 140, 141, 142, 143, 144, 145, + 443, 403, 272, 564, 25, 136, -112, 566, 44, 45, + 46, 414, 242, 4, 132, 132, 137, 128, 573, 442, + 134, 404, 243, 128, 323, 242, 413, 30, 47, 429, + 49, 132, 98, 99, 100, 352, 101, 102, 103, 466, + 219, 220, 429, 237, 40, 130, 429, 442, 50, 309, + 430, 27, 313, 28, 465, 326, 429, 314, 315, 316, + 317, 327, 464, 126, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, 321, 322, 77, + 78, 31, 32, 33, 34, 35, 36, 37, 19, 346, + 20, 116, 117, 274, 275, 58, 92, 307, 308, 134, + 310, 311, 134, 60, 95, 276, 62, 134, 134, 134, + 134, 125, -177, 138, 139, 140, 141, 142, 143, 144, + 145, 51, 108, 241, 318, 319, 320, 134, 134, 246, + 349, 350, 550, 19, 353, 20, 7, 8, 9, 52, + 11, 53, 13, 5, 54, 565, 6, 463, 527, 112, + 528, 109, 55, 110, 7, 8, 9, 10, 11, 12, + 13, 408, 409, 411, 272, 111, 355, 119, 212, 213, + 120, 121, 272, 272, 272, 14, -113, 126, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, - 76, 0, 0, 77, 78, 0, 0, 0, 0, 0, - 540, 541, 19, 0, 20, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 79, - 0, 0, 80, 0, 0, 81, 0, 82, 127, 0, - 0, 0, 562, 0, 563, 564, 126, 222, 223, 224, - 225, 226, 227, 228, 229, 230, 231, 232, 75, 76, - 0, 0, 77, 78, 0, 0, 0, 0, 0, 0, - 0, 19, 0, 20, 126, 64, 65, 66, 67, 68, + 76, 131, 379, 77, 78, 324, 325, 401, 331, 332, + 86, 122, 19, 123, 20, -72, -72, -76, -76, 211, + 236, 380, 215, 79, 245, 238, 80, -71, -71, 81, + 239, 82, 127, -75, -75, -70, -70, 216, 381, -74, + -74, -69, -69, 272, 272, 272, 244, 399, -73, -73, + 217, 272, 333, 334, 277, 86, 400, 134, 101, 102, + 328, 353, -79, 272, 272, 279, 280, 281, 282, 283, + 284, 448, -80, 450, 451, 452, 337, 386, 359, 456, + 351, 285, 286, 287, 288, 394, 395, 396, 360, 361, + 365, 366, 367, 368, 369, 372, 373, 374, 375, 376, + 272, 272, 377, 378, 382, 272, 384, 272, 388, 387, + 389, 272, 390, 391, 392, 398, 393, 272, 272, 272, + 397, 134, 449, 134, 134, 134, 416, 402, 412, 134, + 457, 415, 418, 419, 421, 436, 422, 79, 437, 423, + 80, 461, 444, 81, 447, 82, 438, 439, 440, 453, + 355, 454, 272, 272, 446, 455, 462, 460, 403, 272, + 471, 475, 491, 476, 477, 478, 458, 459, 272, 480, + 484, 481, 505, 482, 537, 483, 134, 507, 488, 532, + 533, 534, 487, 503, 489, 495, 497, 549, 498, 499, + 508, 509, 504, 146, 147, 272, 520, 510, 526, 521, + 529, 531, 540, 485, 486, 542, 543, 541, 490, 442, + 492, 554, 544, 272, 496, 545, 519, 546, 547, 134, + 500, 501, 502, 548, 146, 147, 553, 555, 557, 134, + 134, 134, 558, 559, 567, 134, 569, 568, 272, 272, + 570, 571, 572, 272, 574, 575, 272, 576, 579, 582, + 202, 104, 203, 204, 364, 524, 525, 205, 363, 206, + 336, 134, 530, 56, 469, 424, 425, 426, 427, 428, + 114, 536, 431, 432, 433, 434, 435, 126, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 345, 468, 77, 78, 59, 26, 97, 556, 580, + 494, 535, 19, 474, 20, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 563, 0, 0, 0, + 0, 0, 472, 473, 0, 0, 0, 0, 0, 479, + 290, 291, 0, 0, 0, 0, -82, 19, 0, 20, + 0, 577, 578, 6, -82, -82, 581, 0, 0, 583, + 0, -82, -82, -82, -82, -82, -82, -82, 0, -82, + 21, 0, 0, 0, 0, 0, 0, -82, 22, 0, + 0, 0, 23, 0, 0, 511, 512, 513, 514, 0, + 515, 516, 517, 518, 0, 126, 221, 222, 223, 224, + 225, 226, 227, 228, 229, 230, 231, 75, 76, 0, + 0, 77, 78, 0, 0, 0, 0, 0, 538, 539, + 19, 0, 20, 292, 293, 294, 295, 296, 297, 298, + 299, 300, 301, 302, 303, 304, 305, 79, 0, 0, + 80, 0, 0, 81, 0, 82, 240, 0, 0, 0, + 560, 0, 561, 562, 126, 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, 0, 0, - 0, 356, 0, 0, 126, 222, 223, 224, 225, 226, - 227, 228, 229, 230, 231, 232, 75, 76, 0, 0, - 77, 78, 0, 0, 0, 0, 0, 79, 0, 19, - 80, 20, 0, 81, 0, 82, 241, 126, 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, 0, 0, 0, 422, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 79, 0, 0, 80, - 0, 0, 81, 0, 82, 412, 126, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 0, 0, 77, 78, 79, 0, 0, 80, 0, 0, - 81, 19, 82, 20, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 469, 0, 0, 63, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 0, 0, 77, 78, 79, 0, 0, 80, 0, 409, - 81, 19, 82, 20, 133, 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, 0, 81, 0, 82, 126, 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, 126, 222, 223, 224, - 225, 226, 227, 228, 229, 230, 231, 232, 75, 76, - 0, 0, 77, 78, 0, 0, 79, 0, 0, 80, - 0, 19, 81, 20, 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, 0, 0, 0, 0, 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, 354, 126, 221, 222, 223, 224, 225, 226, 227, + 228, 229, 230, 231, 75, 76, 0, 0, 77, 78, + 0, 0, 0, 0, 0, 0, 0, 19, 0, 20, + 0, 0, 126, 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, + 0, 81, 0, 82, 410, 0, 0, 0, 0, 420, + 126, 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, 0, 0, 0, 467, 0, 0, 0, 0, 0, 0, 79, 0, 0, 80, 0, 0, - 81, 0, 82, 0, 77, 78, 0, 340, 341, 342, - 0, 0, 0, 19, 0, 20, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 79, 0, 0, 80, - 0, 0, 81, 0, 82, 0, 0, 0, 0, 0, + 81, 0, 82, 63, 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, 407, 81, 0, + 82, 0, 133, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 0, 0, 77, 78, + 0, 0, 79, 0, 0, 80, 0, 19, 81, 20, + 82, 126, 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, 126, + 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, + 231, 75, 76, 0, 0, 77, 78, 0, 0, 0, + 0, 0, 0, 0, 19, 0, 20, 0, 0, 0, 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, 154, 155, 156, 157, 158, - 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, - 169, 170, 171, 172, 173, 258, 259, 0, 0, 0, - 0, 249, 250, 77, 78, 251, 252, 253, 254, 255, - 256, 0, 19, 0, 20, 0, 0, 0, 0, 0, - 0, 0, 260, 0, 261, 182, 183, 184, 185, 0, - 262, 263, 264, 190, 191, 192, 193, 194, 195, 196, - 197, 198, 199, 200, 201, 202, 257, 0, 0, 0, - 0, 343, 0, 0, 344, 0, 345, 0, 0, 346, - 0, 0, 0, 0, 154, 155, 156, 157, 158, 159, + 0, 0, 0, 79, 0, 0, 80, 0, 0, 81, + 0, 82, 0, 0, 0, 0, 0, 0, 0, 77, + 78, 0, 338, 339, 340, 0, 0, 0, 19, 0, + 20, 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, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 79, 0, 0, 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, + 257, 258, 0, 0, 0, 0, 0, 0, 0, 79, + 0, 0, 80, 0, 0, 81, 0, 82, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 259, 0, 260, + 181, 182, 183, 184, 0, 261, 262, 263, 189, 190, + 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, + 201, 0, 0, 0, 0, 0, 341, 0, 0, 342, + 0, 343, 0, 0, 344, 248, 249, 77, 78, 250, + 251, 252, 253, 254, 255, 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, 0, 0, 0, 0, 0, + 256, 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, 257, 258, + 0, 0, 0, 0, 248, 249, 0, 0, 250, 251, + 252, 253, 254, 255, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 259, 0, 260, 181, 182, + 183, 184, 0, 261, 262, 263, 189, 190, 191, 192, + 193, 194, 195, 196, 197, 198, 199, 200, 201, 256, + 0, 0, 0, 0, 0, 0, 0, 264, 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, 257, 258, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 259, 0, 260, 181, 182, 183, + 184, 149, 261, 262, 263, 189, 190, 191, 192, 193, + 194, 195, 196, 197, 198, 199, 200, 201, 0, 0, + 0, 0, 0, 150, 151, 0, 264, 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, 258, 259, 0, 0, 0, 0, - 249, 250, 0, 0, 251, 252, 253, 254, 255, 256, + 170, 171, 172, 173, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 260, 0, 261, 182, 183, 184, 185, 0, 262, - 263, 264, 190, 191, 192, 193, 194, 195, 196, 197, - 198, 199, 200, 201, 202, 257, 0, 0, 0, 0, - 0, 0, 0, 265, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 154, 155, 156, 157, 158, 159, 160, - 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, - 171, 172, 173, 258, 259, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 260, 0, 261, 182, 183, 184, 185, 0, 262, 263, - 264, 190, 191, 192, 193, 194, 195, 196, 197, 198, - 199, 200, 201, 202, 149, 0, 0, 0, 0, 0, - 0, 0, 265, 0, 0, 150, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 151, 152, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 153, 0, 0, 0, 154, 155, 156, 157, - 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 176, 177, - 178, 0, 0, 179, 180, 181, 182, 183, 184, 185, - 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, - 196, 197, 198, 199, 200, 201, 202 + 0, 0, 0, 0, 0, 175, 176, 177, 0, 0, + 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, + 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, + 198, 199, 200, 201 }; static const short int yycheck[] = { - 38, 221, 100, 100, 3, 51, 32, 310, 10, 18, - 98, 29, 153, 51, 82, 33, 523, 237, 238, 10, - 5, 6, 7, 8, 9, 10, 11, 12, 134, 37, + 38, 220, 100, 100, 3, 51, 308, 32, 18, 152, + 98, 29, 10, 51, 82, 33, 521, 236, 237, 5, + 6, 7, 8, 9, 10, 11, 12, 28, 134, 30, 136, 137, 5, 6, 7, 8, 9, 10, 11, 12, - 4, 553, 148, 154, 43, 158, 0, 554, 152, 57, - 163, 15, 163, 27, 29, 57, 568, 125, 162, 152, - 98, 160, 150, 131, 163, 158, 57, 208, 42, 43, - 44, 45, 46, 47, 48, 28, 50, 30, 62, 152, - 118, 119, 152, 121, 58, 84, 52, 53, 54, 162, - 178, 152, 162, 181, 152, 152, 151, 158, 186, 187, - 188, 189, 160, 160, 53, 125, 72, 56, 57, 25, - 26, 131, 150, 343, 344, 345, 35, 36, 206, 207, - 73, 74, 75, 62, 77, 78, 79, 45, 151, 47, - 236, 55, 56, 136, 137, 161, 125, 126, 176, 177, - 178, 179, 180, 181, 162, 148, 25, 26, 186, 187, - 188, 189, 161, 5, 6, 7, 8, 9, 10, 11, - 12, 28, 30, 30, 18, 203, 204, 205, 206, 207, - 151, 239, 240, 158, 151, 243, 65, 66, 67, 68, - 69, 70, 71, 17, 18, 158, 17, 18, 408, 492, - 151, 494, 108, 109, 110, 111, 112, 113, 114, 115, - 116, 117, 118, 119, 120, 121, 312, 245, 17, 18, - 17, 18, 77, 78, 320, 321, 322, 0, 151, 3, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 156, 280, 19, 20, 17, 18, 327, - 17, 18, 280, 154, 28, 18, 30, 18, 31, 154, - 120, 34, 30, 291, 17, 18, 40, 17, 18, 42, - 43, 44, 45, 46, 47, 48, 17, 18, 18, 30, - 308, 30, 157, 157, 154, 381, 382, 383, 60, 325, - 63, 152, 21, 389, 21, 21, 160, 325, 326, 327, - 152, 155, 64, 361, 154, 401, 402, 102, 103, 104, - 105, 106, 107, 391, 154, 393, 394, 395, 154, 312, - 154, 399, 154, 118, 119, 120, 121, 320, 321, 322, - 156, 154, 154, 39, 154, 154, 154, 152, 152, 152, - 152, 152, 438, 439, 152, 152, 152, 443, 152, 445, - 152, 152, 30, 449, 30, 160, 152, 155, 30, 455, - 456, 457, 154, 391, 392, 393, 394, 395, 357, 154, - 15, 399, 400, 15, 152, 156, 152, 152, 30, 153, - 18, 152, 156, 152, 37, 159, 152, 161, 381, 382, - 383, 39, 420, 152, 490, 491, 389, 152, 152, 18, - 152, 497, 57, 30, 152, 152, 152, 152, 401, 402, - 506, 154, 154, 152, 152, 152, 152, 152, 446, 152, - 152, 499, 500, 501, 152, 155, 18, 152, 15, 152, - 152, 152, 156, 152, 462, 523, 523, 533, 155, 152, - 152, 155, 57, 158, 155, 438, 439, 155, 155, 39, - 443, 155, 445, 531, 155, 551, 449, 155, 486, 155, - 155, 489, 455, 456, 457, 158, 554, 554, 155, 155, - 155, 499, 500, 501, 15, 152, 15, 505, 152, 15, - 576, 577, 15, 104, 104, 581, 104, 104, 584, 43, - 234, 104, 24, 258, 421, 259, 420, 490, 491, 50, - 29, 3, 236, 531, 497, 579, 41, 367, 368, 369, - 370, 371, 446, 506, 374, 375, 376, 377, 378, 3, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 505, 426, 19, 20, -1, -1, -1, - 533, -1, -1, -1, 28, -1, 30, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 551, -1, - -1, -1, -1, -1, 424, 425, -1, -1, -1, -1, - -1, 431, -1, -1, -1, -1, -1, -1, 27, 28, - -1, 30, -1, 576, 577, 34, 35, 36, 581, -1, - -1, 584, -1, 42, 43, 44, 45, 46, 47, 48, - -1, 50, 51, -1, -1, -1, -1, -1, -1, 58, - 59, -1, -1, -1, 63, -1, -1, 477, 478, 479, - 480, -1, 482, 483, 484, 485, -1, 3, 4, 5, + 10, 37, 148, 551, 43, 4, 154, 552, 52, 53, + 54, 160, 152, 0, 163, 163, 15, 125, 566, 57, + 98, 57, 162, 131, 207, 152, 158, 62, 72, 152, + 151, 163, 73, 74, 75, 162, 77, 78, 79, 162, + 118, 119, 152, 121, 29, 84, 152, 57, 62, 177, + 160, 45, 180, 47, 160, 152, 152, 185, 186, 187, + 188, 158, 158, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 205, 206, 19, + 20, 65, 66, 67, 68, 69, 70, 71, 28, 235, + 30, 35, 36, 136, 137, 151, 161, 175, 176, 177, + 178, 179, 180, 30, 162, 148, 18, 185, 186, 187, + 188, 161, 0, 5, 6, 7, 8, 9, 10, 11, + 12, 27, 151, 125, 202, 203, 204, 205, 206, 131, + 238, 239, 158, 28, 242, 30, 42, 43, 44, 45, + 46, 47, 48, 31, 50, 158, 34, 406, 490, 156, + 492, 151, 58, 151, 42, 43, 44, 45, 46, 47, + 48, 341, 342, 343, 310, 151, 244, 53, 55, 56, + 56, 57, 318, 319, 320, 63, 154, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, -1, -1, 19, 20, -1, -1, -1, -1, -1, - 510, 511, 28, -1, 30, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 153, - -1, -1, 156, -1, -1, 159, -1, 161, 162, -1, - -1, -1, 542, -1, 544, 545, 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, + 16, 154, 278, 19, 20, 125, 126, 325, 25, 26, + 278, 18, 28, 18, 30, 17, 18, 17, 18, 30, + 120, 289, 18, 153, 40, 157, 156, 17, 18, 159, + 157, 161, 162, 17, 18, 17, 18, 30, 306, 17, + 18, 17, 18, 379, 380, 381, 154, 323, 17, 18, + 30, 387, 17, 18, 60, 323, 324, 325, 77, 78, + 152, 359, 21, 399, 400, 102, 103, 104, 105, 106, + 107, 389, 21, 391, 392, 393, 21, 310, 152, 397, + 160, 118, 119, 120, 121, 318, 319, 320, 155, 64, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 436, 437, 152, 152, 152, 441, 152, 443, 152, 156, + 152, 447, 152, 152, 152, 39, 152, 453, 454, 455, + 152, 389, 390, 391, 392, 393, 355, 30, 30, 397, + 398, 160, 152, 155, 30, 15, 154, 153, 15, 154, + 156, 30, 152, 159, 156, 161, 379, 380, 381, 152, + 418, 152, 488, 489, 387, 152, 18, 152, 37, 495, + 152, 152, 18, 152, 152, 152, 399, 400, 504, 152, + 39, 152, 57, 152, 18, 152, 444, 30, 152, 497, + 498, 499, 154, 154, 152, 152, 152, 15, 152, 152, + 152, 152, 460, 521, 521, 531, 152, 155, 152, 156, + 152, 152, 152, 436, 437, 152, 152, 155, 441, 57, + 443, 529, 155, 549, 447, 155, 484, 155, 155, 487, + 453, 454, 455, 155, 552, 552, 155, 158, 155, 497, + 498, 499, 155, 155, 39, 503, 155, 158, 574, 575, + 155, 155, 152, 579, 15, 15, 582, 152, 15, 15, + 104, 43, 104, 104, 258, 488, 489, 104, 257, 104, + 233, 529, 495, 24, 419, 365, 366, 367, 368, 369, + 50, 504, 372, 373, 374, 375, 376, 3, 4, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 235, 418, 19, 20, 29, 3, 41, 531, 577, + 444, 503, 28, 424, 30, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 549, -1, -1, -1, + -1, -1, 422, 423, -1, -1, -1, -1, -1, 429, + 25, 26, -1, -1, -1, -1, 27, 28, -1, 30, + -1, 574, 575, 34, 35, 36, 579, -1, -1, 582, + -1, 42, 43, 44, 45, 46, 47, 48, -1, 50, + 51, -1, -1, -1, -1, -1, -1, 58, 59, -1, + -1, -1, 63, -1, -1, 475, 476, 477, 478, -1, + 480, 481, 482, 483, -1, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, -1, + -1, 19, 20, -1, -1, -1, -1, -1, 508, 509, + 28, -1, 30, 108, 109, 110, 111, 112, 113, 114, + 115, 116, 117, 118, 119, 120, 121, 153, -1, -1, + 156, -1, -1, 159, -1, 161, 162, -1, -1, -1, + 540, -1, 542, 543, 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, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, - 19, 20, -1, -1, -1, -1, -1, 153, -1, 28, - 156, 30, -1, 159, -1, 161, 162, 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, 153, -1, -1, 156, - -1, -1, 159, -1, 161, 162, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, 19, 20, 153, -1, -1, 156, -1, -1, - 159, 28, 161, 30, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 40, -1, -1, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - -1, -1, 19, 20, 153, -1, -1, 156, -1, 158, - 159, 28, 161, 30, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, -1, -1, - 19, 20, -1, -1, -1, -1, -1, 153, -1, 28, - 156, 30, -1, 159, -1, 161, 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, 153, -1, -1, 156, - -1, 28, 159, 30, 161, -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, 153, -1, -1, 156, - -1, -1, 159, -1, 161, -1, -1, -1, -1, -1, - -1, -1, -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, -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, -1, -1, -1, 153, -1, 28, 156, 30, + -1, 159, -1, 161, 162, -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, -1, -1, 28, -1, 30, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, -1, 153, -1, -1, 156, -1, -1, - 159, -1, 161, -1, 19, 20, -1, 22, 23, 24, - -1, -1, -1, 28, -1, 30, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 153, -1, -1, 156, - -1, -1, 159, -1, 161, -1, -1, -1, -1, -1, + 159, -1, 161, 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, 153, -1, -1, 156, -1, 158, 159, -1, + 161, -1, 3, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, -1, -1, 19, 20, + -1, -1, 153, -1, -1, 156, -1, 28, 159, 30, + 161, 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, + 153, -1, -1, 156, -1, -1, 159, -1, 161, 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, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 153, -1, -1, 156, - -1, -1, 159, -1, 161, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, - 95, 96, 97, 98, 99, 100, 101, -1, -1, -1, - -1, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, -1, 28, -1, 30, -1, -1, -1, -1, -1, - -1, -1, 127, -1, 129, 130, 131, 132, 133, -1, - 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 62, -1, -1, -1, - -1, 156, -1, -1, 159, -1, 161, -1, -1, 164, - -1, -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, -1, -1, -1, -1, - 17, 18, -1, -1, 21, 22, 23, 24, 25, 26, + -1, -1, -1, 153, -1, -1, 156, -1, -1, 159, + -1, 161, -1, -1, -1, -1, -1, -1, -1, 19, + 20, -1, 22, 23, 24, -1, -1, -1, 28, -1, + 30, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 153, -1, -1, 156, -1, -1, 159, -1, + 161, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 127, -1, 129, 130, 131, 132, 133, -1, 135, - 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, - 146, 147, 148, 149, 150, 62, -1, -1, -1, -1, - -1, -1, -1, 159, -1, -1, -1, -1, -1, -1, + -1, 153, -1, -1, 156, -1, -1, 159, -1, 161, + 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 100, 101, -1, -1, -1, -1, -1, -1, -1, 153, + -1, -1, 156, -1, -1, 159, -1, 161, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 127, -1, 129, + 130, 131, 132, 133, -1, 135, 136, 137, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, + 150, -1, -1, -1, -1, -1, 156, -1, -1, 159, + -1, 161, -1, -1, 164, 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, -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, 100, 101, + -1, -1, -1, -1, 17, 18, -1, -1, 21, 22, + 23, 24, 25, 26, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 127, -1, 129, 130, 131, + 132, 133, -1, 135, 136, 137, 138, 139, 140, 141, + 142, 143, 144, 145, 146, 147, 148, 149, 150, 62, + -1, -1, -1, -1, -1, -1, -1, 159, -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, 100, 101, -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, 129, 130, 131, 132, + 133, 38, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 149, 150, -1, -1, + -1, -1, -1, 60, 61, -1, 159, -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, -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, 129, 130, 131, 132, 133, -1, 135, 136, + -1, -1, -1, -1, -1, 122, 123, 124, -1, -1, + 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, - 147, 148, 149, 150, 38, -1, -1, -1, -1, -1, - -1, -1, 159, -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, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 122, 123, - 124, -1, -1, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 148, 149, 150 + 147, 148, 149, 150 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -2218,50 +2213,50 @@ static const unsigned char yystos[] = 198, 198, 18, 18, 18, 161, 3, 162, 192, 193, 208, 154, 163, 3, 190, 224, 4, 15, 5, 6, 7, 8, 9, 10, 11, 12, 175, 176, 177, 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, 122, 123, 124, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 168, 169, 170, 173, 174, 235, 236, - 238, 239, 30, 55, 56, 204, 18, 30, 30, 207, - 190, 190, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 175, 176, 178, 190, 195, 190, 157, - 157, 162, 193, 152, 162, 154, 40, 193, 194, 17, - 18, 21, 22, 23, 24, 25, 26, 62, 100, 101, - 127, 129, 135, 136, 137, 159, 168, 169, 170, 173, - 174, 196, 221, 222, 223, 223, 223, 223, 224, 60, - 181, 102, 103, 104, 105, 106, 107, 118, 119, 120, - 121, 171, 25, 26, 108, 109, 110, 111, 112, 113, - 114, 115, 116, 117, 118, 119, 120, 121, 172, 190, - 190, 224, 190, 190, 232, 224, 224, 224, 224, 224, - 190, 190, 190, 224, 224, 181, 125, 126, 152, 158, - 152, 186, 186, 25, 26, 17, 18, 167, 167, 21, - 22, 23, 24, 156, 159, 161, 164, 196, 222, 186, - 186, 192, 192, 160, 162, 192, 40, 190, 210, 211, - 212, 152, 155, 64, 220, 171, 172, 154, 154, 154, - 154, 154, 195, 197, 154, 154, 154, 154, 154, 152, - 152, 188, 190, 190, 152, 183, 152, 183, 223, 156, - 152, 152, 152, 152, 152, 152, 223, 223, 223, 152, - 39, 188, 190, 224, 30, 37, 57, 184, 187, 158, - 197, 197, 162, 197, 30, 158, 160, 160, 208, 209, - 152, 155, 40, 30, 154, 154, 195, 195, 195, 195, - 195, 152, 160, 195, 195, 195, 195, 195, 15, 15, - 223, 223, 223, 10, 57, 10, 152, 237, 223, 156, - 224, 190, 224, 224, 224, 152, 152, 152, 224, 190, - 223, 223, 152, 30, 18, 186, 158, 160, 162, 40, - 210, 184, 185, 152, 195, 195, 237, 152, 152, 152, - 152, 195, 152, 152, 152, 152, 39, 223, 223, 154, - 152, 152, 223, 18, 223, 224, 233, 152, 223, 152, - 152, 152, 223, 223, 223, 154, 190, 57, 182, 30, - 152, 152, 155, 195, 195, 195, 195, 195, 195, 195, - 195, 190, 152, 156, 233, 234, 223, 223, 152, 183, - 183, 152, 223, 152, 224, 224, 224, 234, 223, 18, - 195, 195, 152, 155, 152, 152, 155, 155, 155, 155, - 155, 15, 158, 177, 230, 155, 224, 158, 223, 155, - 155, 155, 195, 195, 195, 223, 221, 158, 177, 39, - 158, 155, 155, 155, 152, 221, 15, 15, 152, 223, - 223, 15, 228, 223, 15, 223 + 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, 122, 123, 124, 127, 128, + 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, + 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, + 149, 150, 168, 169, 170, 173, 174, 235, 236, 238, + 239, 30, 55, 56, 204, 18, 30, 30, 207, 190, + 190, 4, 5, 6, 7, 8, 9, 10, 11, 12, + 13, 14, 175, 176, 178, 190, 195, 190, 157, 157, + 162, 193, 152, 162, 154, 40, 193, 194, 17, 18, + 21, 22, 23, 24, 25, 26, 62, 100, 101, 127, + 129, 135, 136, 137, 159, 168, 169, 170, 173, 174, + 196, 221, 222, 223, 223, 223, 223, 60, 181, 102, + 103, 104, 105, 106, 107, 118, 119, 120, 121, 171, + 25, 26, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 172, 190, 190, 224, + 190, 190, 232, 224, 224, 224, 224, 224, 190, 190, + 190, 224, 224, 181, 125, 126, 152, 158, 152, 186, + 186, 25, 26, 17, 18, 167, 167, 21, 22, 23, + 24, 156, 159, 161, 164, 196, 222, 186, 186, 192, + 192, 160, 162, 192, 40, 190, 210, 211, 212, 152, + 155, 64, 220, 171, 172, 154, 154, 154, 154, 154, + 195, 197, 154, 154, 154, 154, 154, 152, 152, 188, + 190, 190, 152, 183, 152, 183, 223, 156, 152, 152, + 152, 152, 152, 152, 223, 223, 223, 152, 39, 188, + 190, 224, 30, 37, 57, 184, 187, 158, 197, 197, + 162, 197, 30, 158, 160, 160, 208, 209, 152, 155, + 40, 30, 154, 154, 195, 195, 195, 195, 195, 152, + 160, 195, 195, 195, 195, 195, 15, 15, 223, 223, + 223, 10, 57, 10, 152, 237, 223, 156, 224, 190, + 224, 224, 224, 152, 152, 152, 224, 190, 223, 223, + 152, 30, 18, 186, 158, 160, 162, 40, 210, 184, + 185, 152, 195, 195, 237, 152, 152, 152, 152, 195, + 152, 152, 152, 152, 39, 223, 223, 154, 152, 152, + 223, 18, 223, 224, 233, 152, 223, 152, 152, 152, + 223, 223, 223, 154, 190, 57, 182, 30, 152, 152, + 155, 195, 195, 195, 195, 195, 195, 195, 195, 190, + 152, 156, 233, 234, 223, 223, 152, 183, 183, 152, + 223, 152, 224, 224, 224, 234, 223, 18, 195, 195, + 152, 155, 152, 152, 155, 155, 155, 155, 155, 15, + 158, 177, 230, 155, 224, 158, 223, 155, 155, 155, + 195, 195, 195, 223, 221, 158, 177, 39, 158, 155, + 155, 155, 152, 221, 15, 15, 152, 223, 223, 15, + 228, 223, 15, 223 }; #define yyerrok (yyerrstatus = 0) @@ -2931,26 +2926,26 @@ yyreduce: switch (yyn) { case 81: -#line 892 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 892 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[-1].String); ;} break; case 82: -#line 895 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 895 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; case 90: -#line 902 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 902 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; case 97: -#line 907 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 907 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2959,27 +2954,27 @@ yyreduce: break; case 98: -#line 912 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 912 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(""); ;} break; case 99: -#line 917 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 917 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 100: -#line 918 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 918 "/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 101: -#line 921 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 921 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 102: -#line 922 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 922 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, ", "); *(yyvsp[-1].String) += " " + *(yyvsp[0].String); @@ -2989,7 +2984,7 @@ yyreduce: break; case 103: -#line 930 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 930 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -2998,17 +2993,17 @@ yyreduce: break; case 104: -#line 936 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 936 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 106: -#line 940 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 940 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 107: -#line 941 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 941 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, ", "); if (!(yyvsp[0].String)->empty()) @@ -3019,7 +3014,7 @@ yyreduce: break; case 109: -#line 951 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 951 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3028,28 +3023,28 @@ yyreduce: break; case 127: -#line 973 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 973 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type) = TypeInfo::get(*(yyvsp[0].String), OpaqueTy); ;} break; case 128: -#line 976 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 976 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type) = TypeInfo::get(*(yyvsp[0].String), UnresolvedTy); ;} break; case 129: -#line 979 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 979 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Type) = (yyvsp[0].Type); ;} break; case 130: -#line 982 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 982 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Type UpReference (yyvsp[0].String)->insert(0, "\\"); (yyval.Type) = TypeInfo::get(*(yyvsp[0].String), UpRefTy); @@ -3057,7 +3052,7 @@ yyreduce: break; case 131: -#line 986 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 986 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Function derived type? std::string newTy( (yyvsp[-3].Type)->getNewTy() + "("); for (unsigned i = 0; i < (yyvsp[-1].TypeVec)->size(); ++i) { @@ -3074,7 +3069,7 @@ yyreduce: break; case 132: -#line 999 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 999 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Sized array type? uint64_t elems = atoi((yyvsp[-3].String)->c_str()); (yyvsp[-3].String)->insert(0,"[ "); @@ -3084,7 +3079,7 @@ yyreduce: break; case 133: -#line 1005 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1005 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Packed array type? uint64_t elems = atoi((yyvsp[-3].String)->c_str()); (yyvsp[-3].String)->insert(0,"< "); @@ -3094,7 +3089,7 @@ yyreduce: break; case 134: -#line 1011 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1011 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Structure type? std::string newTy("{"); for (unsigned i = 0; i < (yyvsp[-1].TypeVec)->size(); ++i) { @@ -3108,14 +3103,14 @@ yyreduce: break; case 135: -#line 1021 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1021 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Empty structure type? (yyval.Type) = TypeInfo::get("{}", StructTy, new TypeList()); ;} break; case 136: -#line 1024 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1024 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Packed Structure type? std::string newTy("<{"); for (unsigned i = 0; i < (yyvsp[-2].TypeVec)->size(); ++i) { @@ -3129,21 +3124,21 @@ yyreduce: break; case 137: -#line 1034 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1034 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Empty packed structure type? (yyval.Type) = TypeInfo::get("<{}>", PackedStructTy, new TypeList()); ;} break; case 138: -#line 1037 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1037 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Pointer type? (yyval.Type) = (yyvsp[-1].Type)->getPointerType(); ;} break; case 139: -#line 1045 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1045 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.TypeVec) = new TypeList(); (yyval.TypeVec)->push_back((yyvsp[0].Type)); @@ -3151,7 +3146,7 @@ yyreduce: break; case 140: -#line 1049 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1049 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.TypeVec) = (yyvsp[-2].TypeVec); (yyval.TypeVec)->push_back((yyvsp[0].Type)); @@ -3159,7 +3154,7 @@ yyreduce: break; case 142: -#line 1057 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1057 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.TypeVec) = (yyvsp[-2].TypeVec); (yyval.TypeVec)->push_back(TypeInfo::get("void",VoidTy)); @@ -3168,7 +3163,7 @@ yyreduce: break; case 143: -#line 1062 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1062 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.TypeVec) = new TypeList(); (yyval.TypeVec)->push_back(TypeInfo::get("void",VoidTy)); @@ -3177,14 +3172,14 @@ yyreduce: break; case 144: -#line 1067 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1067 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.TypeVec) = new TypeList(); ;} break; case 145: -#line 1077 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1077 "/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)->getNewTy()); @@ -3194,7 +3189,7 @@ yyreduce: break; case 146: -#line 1083 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1083 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string((yyvsp[-2].Type)->getNewTy()); @@ -3203,7 +3198,7 @@ yyreduce: break; case 147: -#line 1088 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1088 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string((yyvsp[-2].Type)->getNewTy()); @@ -3213,7 +3208,7 @@ yyreduce: break; case 148: -#line 1094 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1094 "/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)->getNewTy()); @@ -3223,7 +3218,7 @@ yyreduce: break; case 149: -#line 1100 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1100 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-3].Type); (yyval.Const).cnst = new std::string((yyvsp[-3].Type)->getNewTy()); @@ -3233,7 +3228,7 @@ yyreduce: break; case 150: -#line 1106 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1106 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-2].Type); (yyval.Const).cnst = new std::string((yyvsp[-2].Type)->getNewTy()); @@ -3242,7 +3237,7 @@ yyreduce: break; case 151: -#line 1111 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1111 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy()); @@ -3252,7 +3247,7 @@ yyreduce: break; case 152: -#line 1117 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1117 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy()); @@ -3262,7 +3257,7 @@ yyreduce: break; case 153: -#line 1123 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1123 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name = getUniqueName((yyvsp[0].String), (yyvsp[-1].Type)->resolve(), true); (yyval.Const).type = (yyvsp[-1].Type); @@ -3273,7 +3268,7 @@ yyreduce: break; case 154: -#line 1130 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1130 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy()); @@ -3283,7 +3278,7 @@ yyreduce: break; case 155: -#line 1136 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1136 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Const).type = (yyvsp[-1].Type); (yyval.Const).cnst = new std::string((yyvsp[-1].Type)->getNewTy()); @@ -3293,7 +3288,7 @@ yyreduce: break; case 156: -#line 1142 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1142 "/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)->getNewTy()); @@ -3303,7 +3298,7 @@ yyreduce: break; case 157: -#line 1148 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1148 "/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)->getNewTy()); @@ -3313,7 +3308,7 @@ yyreduce: break; case 158: -#line 1154 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1154 "/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)->getNewTy()); @@ -3323,7 +3318,7 @@ yyreduce: break; case 159: -#line 1160 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1160 "/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)->getNewTy()); @@ -3333,7 +3328,7 @@ yyreduce: break; case 160: -#line 1166 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1166 "/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)->getNewTy()); @@ -3343,7 +3338,7 @@ yyreduce: break; case 161: -#line 1174 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1174 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string source = *(yyvsp[-3].Const).cnst; const TypeInfo* SrcTy = (yyvsp[-3].Const).type->resolve(); @@ -3361,7 +3356,7 @@ yyreduce: break; case 162: -#line 1188 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1188 "/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) { @@ -3377,7 +3372,7 @@ yyreduce: break; case 163: -#line 1200 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1200 "/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(); @@ -3386,7 +3381,7 @@ yyreduce: break; case 164: -#line 1205 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1205 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { const char* op = getDivRemOpcode(*(yyvsp[-5].String), (yyvsp[-3].Const).type); (yyval.String) = new std::string(op); @@ -3396,7 +3391,7 @@ yyreduce: break; case 165: -#line 1211 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1211 "/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(); @@ -3405,7 +3400,7 @@ yyreduce: break; case 166: -#line 1216 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1216 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) = getCompareOp(*(yyvsp[-5].String), (yyvsp[-3].Const).type); *(yyvsp[-5].String) += "(" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; @@ -3415,7 +3410,7 @@ yyreduce: break; case 167: -#line 1222 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1222 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-6].String) += " " + *(yyvsp[-5].String) + " (" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -3424,7 +3419,7 @@ yyreduce: break; case 168: -#line 1227 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1227 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-6].String) += " " + *(yyvsp[-5].String) + " (" + *(yyvsp[-3].Const).cnst + "," + *(yyvsp[-1].Const).cnst + ")"; delete (yyvsp[-5].String); (yyvsp[-3].Const).destroy(); (yyvsp[-1].Const).destroy(); @@ -3433,7 +3428,7 @@ yyreduce: break; case 169: -#line 1232 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1232 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { const char* shiftop = (yyvsp[-5].String)->c_str(); if (*(yyvsp[-5].String) == "shr") @@ -3445,7 +3440,7 @@ yyreduce: break; case 170: -#line 1240 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1240 "/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(); @@ -3454,7 +3449,7 @@ yyreduce: break; case 171: -#line 1245 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1245 "/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(); @@ -3463,7 +3458,7 @@ yyreduce: break; case 172: -#line 1250 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1250 "/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(); @@ -3472,7 +3467,7 @@ yyreduce: break; case 173: -#line 1260 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1260 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].Const).cnst; (yyvsp[0].Const).destroy(); @@ -3481,25 +3476,25 @@ yyreduce: break; case 174: -#line 1265 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1265 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(*(yyvsp[0].Const).cnst); (yyvsp[0].Const).destroy(); ;} break; case 177: -#line 1280 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1280 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { ;} break; case 178: -#line 1285 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1285 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; case 179: -#line 1288 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1288 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -3508,7 +3503,7 @@ yyreduce: break; case 180: -#line 1293 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1293 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << "module asm " << ' ' << *(yyvsp[0].String) << '\n'; (yyval.String) = 0; @@ -3516,7 +3511,7 @@ yyreduce: break; case 181: -#line 1297 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1297 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << "implementation\n"; (yyval.String) = 0; @@ -3524,17 +3519,17 @@ yyreduce: break; case 182: -#line 1301 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1301 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; case 184: -#line 1303 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1303 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "external"; ;} break; case 185: -#line 1306 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1306 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { EnumeratedTypes.push_back((yyvsp[0].Type)); if (!(yyvsp[-2].String)->empty()) { @@ -3548,7 +3543,7 @@ yyreduce: break; case 186: -#line 1316 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1316 "/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); @@ -3557,7 +3552,7 @@ yyreduce: break; case 187: -#line 1321 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1321 "/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); @@ -3566,7 +3561,7 @@ yyreduce: break; case 188: -#line 1326 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1326 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) { std::string Name = getGlobalName((yyvsp[-4].String),*(yyvsp[-3].String), (yyvsp[-1].Const).type->getPointerType(), @@ -3580,7 +3575,7 @@ yyreduce: break; case 189: -#line 1336 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1336 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) { std::string Name = getGlobalName((yyvsp[-4].String),*(yyvsp[-3].String),(yyvsp[-1].Type)->getPointerType(), @@ -3594,7 +3589,7 @@ yyreduce: break; case 190: -#line 1346 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1346 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) { std::string Name = getGlobalName((yyvsp[-4].String),*(yyvsp[-3].String),(yyvsp[-1].Type)->getPointerType(), @@ -3608,7 +3603,7 @@ yyreduce: break; case 191: -#line 1356 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1356 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-4].String)->empty()) { std::string Name = getGlobalName((yyvsp[-4].String),*(yyvsp[-3].String),(yyvsp[-1].Type)->getPointerType(), @@ -3622,7 +3617,7 @@ yyreduce: break; case 192: -#line 1366 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1366 "/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); @@ -3631,7 +3626,7 @@ yyreduce: break; case 193: -#line 1371 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1371 "/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); @@ -3640,14 +3635,14 @@ yyreduce: break; case 194: -#line 1376 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1376 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; case 198: -#line 1386 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1386 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3656,7 +3651,7 @@ yyreduce: break; case 199: -#line 1391 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1391 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); if (*(yyvsp[0].String) == "64") @@ -3667,7 +3662,7 @@ yyreduce: break; case 200: -#line 1398 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1398 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3676,7 +3671,7 @@ yyreduce: break; case 201: -#line 1403 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1403 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " = " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3685,7 +3680,7 @@ yyreduce: break; case 202: -#line 1410 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1410 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, "[ "); *(yyvsp[-1].String) += " ]"; @@ -3694,7 +3689,7 @@ yyreduce: break; case 203: -#line 1417 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1417 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3703,19 +3698,19 @@ yyreduce: break; case 205: -#line 1423 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1423 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 209: -#line 1432 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1432 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 210: -#line 1434 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1434 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string((yyvsp[-1].Type)->getNewTy()); if (!(yyvsp[0].String)->empty()) { @@ -3727,7 +3722,7 @@ yyreduce: break; case 211: -#line 1443 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1443 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -3735,21 +3730,21 @@ yyreduce: break; case 212: -#line 1447 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1447 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; case 213: -#line 1451 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1451 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; case 214: -#line 1454 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1454 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += ", ..."; (yyval.String) = (yyvsp[-2].String); @@ -3758,19 +3753,19 @@ yyreduce: break; case 215: -#line 1459 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1459 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); ;} break; case 216: -#line 1462 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1462 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 217: -#line 1465 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1465 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-7].String)->empty()) { *(yyvsp[-7].String) += " "; @@ -3791,17 +3786,17 @@ yyreduce: break; case 218: -#line 1483 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1483 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string("{"); delete (yyvsp[0].String); ;} break; case 219: -#line 1484 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1484 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string ("{"); ;} break; case 220: -#line 1487 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1487 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << "define "; if (!(yyvsp[-2].String)->empty()) { @@ -3814,17 +3809,17 @@ yyreduce: break; case 221: -#line 1498 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1498 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string("}"); delete (yyvsp[0].String); ;} break; case 222: -#line 1499 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1499 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string("}"); ;} break; case 223: -#line 1501 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1501 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if ((yyvsp[-1].String)) *O << *(yyvsp[-1].String); @@ -3835,12 +3830,12 @@ yyreduce: break; case 224: -#line 1510 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1510 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 227: -#line 1516 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1516 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-1].String)->empty()) *(yyvsp[-2].String) += " " + *(yyvsp[-1].String); @@ -3852,12 +3847,12 @@ yyreduce: break; case 228: -#line 1529 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1529 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; case 238: -#line 1535 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1535 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].String)->insert(0, "<"); *(yyvsp[-1].String) += ">"; @@ -3866,7 +3861,7 @@ yyreduce: break; case 240: -#line 1541 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1541 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-3].String)->empty()) { *(yyvsp[-4].String) += " " + *(yyvsp[-3].String); @@ -3878,7 +3873,7 @@ yyreduce: break; case 243: -#line 1554 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1554 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value).val = (yyvsp[0].String); (yyval.Value).constant = false; @@ -3887,7 +3882,7 @@ yyreduce: break; case 244: -#line 1559 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1559 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.Value).val = (yyvsp[0].String); (yyval.Value).constant = true; @@ -3896,7 +3891,7 @@ yyreduce: break; case 245: -#line 1569 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1569 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-1].Type) = (yyvsp[-1].Type)->resolve(); std::string Name = getUniqueName((yyvsp[0].Value).val, (yyvsp[-1].Type)); @@ -3908,28 +3903,28 @@ yyreduce: break; case 246: -#line 1578 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1578 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; case 247: -#line 1581 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1581 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Do not allow functions with 0 basic blocks (yyval.String) = 0; ;} break; case 248: -#line 1589 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1589 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; case 249: -#line 1593 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1593 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -3938,14 +3933,14 @@ yyreduce: break; case 250: -#line 1598 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1598 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = 0; ;} break; case 251: -#line 1601 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1601 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -3954,12 +3949,12 @@ yyreduce: break; case 253: -#line 1607 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1607 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = (yyvsp[0].String); *(yyval.String) = "unwind"; ;} break; case 254: -#line 1609 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1609 "/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(); @@ -3968,7 +3963,7 @@ yyreduce: break; case 255: -#line 1614 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1614 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Return with no result... *O << " " << *(yyvsp[-1].String) << ' ' << (yyvsp[0].Type)->getNewTy() << '\n'; delete (yyvsp[-1].String); @@ -3977,7 +3972,7 @@ yyreduce: break; case 256: -#line 1619 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1619 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Unconditional Branch... *O << " " << *(yyvsp[-2].String) << ' ' << (yyvsp[-1].Type)->getNewTy() << ' ' << *(yyvsp[0].Value).val << '\n'; delete (yyvsp[-2].String); (yyvsp[0].Value).destroy(); @@ -3986,7 +3981,7 @@ yyreduce: break; case 257: -#line 1624 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1624 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name = getUniqueName((yyvsp[-6].Value).val, (yyvsp[-7].Type)); *O << " " << *(yyvsp[-8].String) << ' ' << (yyvsp[-7].Type)->getNewTy() << ' ' << Name << ", " @@ -3998,7 +3993,7 @@ yyreduce: break; case 258: -#line 1632 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1632 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name = getUniqueName((yyvsp[-6].Value).val, (yyvsp[-7].Type)); *O << " " << *(yyvsp[-8].String) << ' ' << (yyvsp[-7].Type)->getNewTy() << ' ' << Name << ", " @@ -4010,7 +4005,7 @@ yyreduce: break; case 259: -#line 1640 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1640 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name = getUniqueName((yyvsp[-5].Value).val, (yyvsp[-6].Type)); *O << " " << *(yyvsp[-7].String) << ' ' << (yyvsp[-6].Type)->getNewTy() << ' ' << Name << ", " @@ -4021,7 +4016,7 @@ yyreduce: break; case 260: -#line 1648 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1648 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { const TypeInfo* ResTy = getFunctionReturnType((yyvsp[-10].Type)); *O << " "; @@ -4046,7 +4041,7 @@ yyreduce: break; case 261: -#line 1669 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1669 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -4055,7 +4050,7 @@ yyreduce: break; case 262: -#line 1674 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1674 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *O << " " << *(yyvsp[0].String) << '\n'; delete (yyvsp[0].String); @@ -4064,7 +4059,7 @@ yyreduce: break; case 263: -#line 1680 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1680 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + (yyvsp[-4].Type)->getNewTy() + " " + *(yyvsp[-3].String) + ", " + (yyvsp[-1].Type)->getNewTy() + " " + *(yyvsp[0].Value).val; @@ -4074,7 +4069,7 @@ yyreduce: break; case 264: -#line 1686 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1686 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyvsp[-3].String)->insert(0, (yyvsp[-4].Type)->getNewTy() + " " ); *(yyvsp[-3].String) += ", " + (yyvsp[-1].Type)->getNewTy() + " " + *(yyvsp[0].Value).val; @@ -4084,7 +4079,7 @@ yyreduce: break; case 265: -#line 1694 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1694 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { if (!(yyvsp[-1].String)->empty()) { // Get a unique name for this value, based on its type. @@ -4104,7 +4099,7 @@ yyreduce: break; case 266: -#line 1712 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1712 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // Used for PHI nodes std::string Name = getUniqueName((yyvsp[-3].Value).val, (yyvsp[-5].Type)); Name.insert(0, (yyvsp[-5].Type)->getNewTy() + "["); @@ -4116,7 +4111,7 @@ yyreduce: break; case 267: -#line 1720 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1720 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name = getUniqueName((yyvsp[-3].Value).val, (yyvsp[-6].Value).type); *(yyvsp[-6].Value).val += ", [" + Name + "," + *(yyvsp[-1].Value).val + "]"; @@ -4126,7 +4121,7 @@ yyreduce: break; case 268: -#line 1729 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1729 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); (yyval.ValList)->push_back((yyvsp[0].Value)); @@ -4134,7 +4129,7 @@ yyreduce: break; case 269: -#line 1733 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1733 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = (yyvsp[-2].ValList); (yyval.ValList)->push_back((yyvsp[0].Value)); @@ -4142,17 +4137,17 @@ yyreduce: break; case 270: -#line 1740 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1740 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = (yyvsp[0].ValList); ;} break; case 271: -#line 1741 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1741 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); ;} break; case 272: -#line 1745 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1745 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].String); delete (yyvsp[0].String); @@ -4161,7 +4156,7 @@ yyreduce: break; case 274: -#line 1753 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1753 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { const char* op = getDivRemOpcode(*(yyvsp[-4].String), (yyvsp[-3].Type)); std::string Name1 = getUniqueName((yyvsp[-2].Value).val, (yyvsp[-3].Type)); @@ -4174,7 +4169,7 @@ yyreduce: break; case 275: -#line 1762 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1762 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name1 = getUniqueName((yyvsp[-2].Value).val, (yyvsp[-3].Type)); std::string Name2 = getUniqueName((yyvsp[0].Value).val, (yyvsp[-3].Type)); @@ -4186,7 +4181,7 @@ yyreduce: break; case 276: -#line 1770 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1770 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name1 = getUniqueName((yyvsp[-2].Value).val, (yyvsp[-3].Type)); std::string Name2 = getUniqueName((yyvsp[0].Value).val, (yyvsp[-3].Type)); @@ -4199,7 +4194,7 @@ yyreduce: break; case 277: -#line 1779 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1779 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name1 = getUniqueName((yyvsp[-2].Value).val, (yyvsp[-3].Type)); std::string Name2 = getUniqueName((yyvsp[0].Value).val, (yyvsp[-3].Type)); @@ -4211,7 +4206,7 @@ yyreduce: break; case 278: -#line 1787 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1787 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name1 = getUniqueName((yyvsp[-2].Value).val, (yyvsp[-3].Type)); std::string Name2 = getUniqueName((yyvsp[0].Value).val, (yyvsp[-3].Type)); @@ -4223,16 +4218,7 @@ yyreduce: break; case 279: -#line 1795 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" - { - (yyval.Value) = (yyvsp[0].Value); - (yyval.Value).val->insert(0, *(yyvsp[-1].String) + " "); - delete (yyvsp[-1].String); - ;} - break; - - case 280: -#line 1800 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1795 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { const char* shiftop = (yyvsp[-3].String)->c_str(); if (*(yyvsp[-3].String) == "shr") @@ -4244,8 +4230,8 @@ yyreduce: ;} break; - case 281: -#line 1809 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 280: +#line 1804 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string source = *(yyvsp[-2].Value).val; const TypeInfo* SrcTy = (yyvsp[-2].Value).type->resolve(); @@ -4276,8 +4262,8 @@ yyreduce: ;} break; - case 282: -#line 1837 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 281: +#line 1832 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyval.Value).val = (yyvsp[-5].String); @@ -4286,8 +4272,8 @@ yyreduce: ;} break; - case 283: -#line 1843 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 282: +#line 1838 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + (yyvsp[0].Type)->getNewTy(); (yyval.Value).val = (yyvsp[-3].String); @@ -4296,8 +4282,8 @@ yyreduce: ;} break; - case 284: -#line 1849 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 283: +#line 1844 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-3].String) += " " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyval.Value).val = (yyvsp[-3].String); @@ -4307,8 +4293,18 @@ yyreduce: ;} break; + case 284: +#line 1851 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; + (yyval.Value).val = (yyvsp[-5].String); + (yyval.Value).type = (yyvsp[-4].Value).type; + (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); + ;} + break; + case 285: -#line 1856 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1857 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; (yyval.Value).val = (yyvsp[-5].String); @@ -4318,17 +4314,7 @@ yyreduce: break; case 286: -#line 1862 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" - { - *(yyvsp[-5].String) += " " + *(yyvsp[-4].Value).val + ", " + *(yyvsp[-2].Value).val + ", " + *(yyvsp[0].Value).val; - (yyval.Value).val = (yyvsp[-5].String); - (yyval.Value).type = (yyvsp[-4].Value).type; - (yyvsp[-4].Value).destroy(); (yyvsp[-2].Value).destroy(); (yyvsp[0].Value).destroy(); - ;} - break; - - case 287: -#line 1868 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1863 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val; (yyval.Value).val = (yyvsp[-1].String); @@ -4337,8 +4323,8 @@ yyreduce: ;} break; - case 288: -#line 1874 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 287: +#line 1869 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { // map llvm.isunordered to "fcmp uno" if (*(yyvsp[-3].Value).val == "%llvm.isunordered.f32" || @@ -4369,23 +4355,23 @@ yyreduce: ;} break; - case 290: -#line 1907 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 289: +#line 1902 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = (yyvsp[0].ValList); ;} break; - case 291: -#line 1908 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 290: +#line 1903 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.ValList) = new ValueList(); ;} break; - case 293: -#line 1913 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 292: +#line 1908 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { (yyval.String) = new std::string(); ;} break; - case 294: -#line 1916 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 293: +#line 1911 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " " + (yyvsp[-1].Type)->getNewTy(); if (!(yyvsp[0].String)->empty()) @@ -4396,21 +4382,21 @@ yyreduce: ;} break; + case 294: +#line 1919 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" + { + std::string Name = getUniqueName((yyvsp[-1].Value).val, (yyvsp[-2].Type)); + *(yyvsp[-5].String) += " " + (yyvsp[-4].Type)->getNewTy() + ", " + (yyvsp[-2].Type)->getNewTy() + " " + Name; + if (!(yyvsp[0].String)->empty()) + *(yyvsp[-5].String) += " " + *(yyvsp[0].String); + (yyval.Value).val = (yyvsp[-5].String); + (yyval.Value).type = (yyvsp[-4].Type)->getPointerType(); + (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String); + ;} + break; + case 295: -#line 1924 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" - { - std::string Name = getUniqueName((yyvsp[-1].Value).val, (yyvsp[-2].Type)); - *(yyvsp[-5].String) += " " + (yyvsp[-4].Type)->getNewTy() + ", " + (yyvsp[-2].Type)->getNewTy() + " " + Name; - if (!(yyvsp[0].String)->empty()) - *(yyvsp[-5].String) += " " + *(yyvsp[0].String); - (yyval.Value).val = (yyvsp[-5].String); - (yyval.Value).type = (yyvsp[-4].Type)->getPointerType(); - (yyvsp[-1].Value).destroy(); delete (yyvsp[0].String); - ;} - break; - - case 296: -#line 1933 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1928 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-2].String) += " " + (yyvsp[-1].Type)->getNewTy(); if (!(yyvsp[0].String)->empty()) @@ -4421,8 +4407,8 @@ yyreduce: ;} break; - case 297: -#line 1941 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 296: +#line 1936 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name = getUniqueName((yyvsp[-1].Value).val, (yyvsp[-2].Type)); *(yyvsp[-5].String) += " " + (yyvsp[-4].Type)->getNewTy() + ", " + (yyvsp[-2].Type)->getNewTy() + " " + Name; @@ -4434,8 +4420,8 @@ yyreduce: ;} break; - case 298: -#line 1950 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 297: +#line 1945 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { *(yyvsp[-1].String) += " " + *(yyvsp[0].Value).val; (yyval.Value).val = (yyvsp[-1].String); @@ -4444,8 +4430,8 @@ yyreduce: ;} break; - case 299: -#line 1956 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 298: +#line 1951 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name = getUniqueName((yyvsp[0].Value).val, (yyvsp[-1].Type)); if (!(yyvsp[-3].String)->empty()) @@ -4457,8 +4443,8 @@ yyreduce: ;} break; - case 300: -#line 1965 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 299: +#line 1960 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name = getUniqueName((yyvsp[0].Value).val, (yyvsp[-1].Type)); if (!(yyvsp[-5].String)->empty()) @@ -4470,8 +4456,8 @@ yyreduce: ;} break; - case 301: -#line 1974 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" + case 300: +#line 1969 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" { std::string Name = getUniqueName((yyvsp[-1].Value).val, (yyvsp[-2].Type)); // Upgrade the indices @@ -4501,7 +4487,7 @@ yyreduce: } /* Line 1126 of yacc.c. */ -#line 4505 "UpgradeParser.tab.c" +#line 4491 "UpgradeParser.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -4769,7 +4755,7 @@ yyreturn: } -#line 1997 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 1992 "/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 3b247ca604e..e51db225975 100644 --- a/tools/llvm-upgrade/UpgradeParser.h.cvs +++ b/tools/llvm-upgrade/UpgradeParser.h.cvs @@ -333,7 +333,7 @@ #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) -#line 802 "/proj/llvm/llvm-3/tools/llvm-upgrade/UpgradeParser.y" +#line 802 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y" typedef union YYSTYPE { std::string* String; const TypeInfo* Type; diff --git a/tools/llvm-upgrade/UpgradeParser.y.cvs b/tools/llvm-upgrade/UpgradeParser.y.cvs index f6338e72926..1320923a3ca 100644 --- a/tools/llvm-upgrade/UpgradeParser.y.cvs +++ b/tools/llvm-upgrade/UpgradeParser.y.cvs @@ -1792,11 +1792,6 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { $$.type = TypeInfo::get("bool",BoolTy); delete $2; $4.destroy(); $6.destroy(); } - | NOT ResolvedVal { - $$ = $2; - $$.val->insert(0, *$1 + " "); - delete $1; - } | ShiftOps ResolvedVal ',' ResolvedVal { const char* shiftop = $1->c_str(); if (*$1 == "shr")