diff options
| -rw-r--r-- | tools/llvm-upgrade/UpgradeParser.cpp.cvs | 1294 | ||||
| -rw-r--r-- | tools/llvm-upgrade/UpgradeParser.h.cvs | 2 | ||||
| -rw-r--r-- | tools/llvm-upgrade/UpgradeParser.y.cvs | 5 |
3 files changed, 641 insertions, 660 deletions
diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs index ac0044ba8a..da69f6f9bc 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 <algorithm> @@ -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, 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, 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, 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, 0, 0, 0, 0, 0, 79, 0, 0, 80, - 0, 0, 81, 0, 82, 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, 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, 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, - 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, - 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, + 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, - 260, 0, 261, 182, 183, 184, 185, 0, 262, 263, - 264, 190, 191, 192, 193, 194, 195, 196, 197, 198, - 199, 200, 201, |