diff options
Diffstat (limited to 'lib/AsmParser/llvmAsmParser.cpp')
| -rw-r--r-- | lib/AsmParser/llvmAsmParser.cpp | 1578 |
1 files changed, 793 insertions, 785 deletions
diff --git a/lib/AsmParser/llvmAsmParser.cpp b/lib/AsmParser/llvmAsmParser.cpp index 53e1447c20..4439a2077d 100644 --- a/lib/AsmParser/llvmAsmParser.cpp +++ b/lib/AsmParser/llvmAsmParser.cpp @@ -113,6 +113,7 @@ #include "llvm/SymbolTable.h" #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/ADT/STLExtras.h" +#include "llvm/Support/MathExtras.h" #include <algorithm> #include <iostream> #include <list> @@ -610,7 +611,10 @@ static void setValueName(Value *V, char *NameStr) { /// this is a declaration, otherwise it is a definition. static void ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage, bool isConstantGlobal, const Type *Ty, - Constant *Initializer) { + Constant *Initializer, unsigned Align) { + if (Align != 0 && !isPowerOf2_32(Align)) + ThrowException("Global alignment must be a power of two!"); + if (isa<FunctionType>(Ty)) ThrowException("Cannot declare global vars of function type!"); @@ -640,6 +644,7 @@ static void ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage, GV->setInitializer(Initializer); GV->setLinkage(Linkage); GV->setConstant(isConstantGlobal); + GV->setAlignment(Align); InsertValue(GV, CurModule.Values); return; } @@ -666,6 +671,7 @@ static void ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage, if (isConstantGlobal) EGV->setConstant(true); EGV->setLinkage(Linkage); + EGV->setAlignment(Align); return; } @@ -678,6 +684,7 @@ static void ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage, GlobalVariable *GV = new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name, CurModule.CurrentModule); + GV->setAlignment(Align); InsertValue(GV, CurModule.Values); } @@ -956,7 +963,7 @@ Module *llvm::RunVMAsmParser(const char * AsmString, Module * M) { } -#line 866 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y" +#line 873 "/Users/sabre/cvs/llvm/lib/AsmParser/llvmAsmParser.y" typedef union { llvm::Module *ModuleVal; llvm::Function *FunctionVal; @@ -1006,11 +1013,11 @@ typedef union { -#define YYFINAL 426 +#define YYFINAL 431 #define YYFLAG -32768 #define YYNTBASE 109 -#define YYTRANSLATE(x) ((unsigned)(x) <= 348 ? yytranslate[x] : 171) +#define YYTRANSLATE(x) ((unsigned)(x) <= 348 ? yytranslate[x] : 172) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1056,24 +1063,24 @@ static const short yyprhs[] = { 0, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 67, 68, 70, 72, 74, 76, 77, - 78, 80, 82, 84, 87, 88, 92, 94, 96, 98, + 78, 80, 82, 84, 87, 88, 91, 92, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 116, 118, - 120, 122, 124, 126, 128, 130, 132, 134, 137, 142, - 148, 154, 158, 161, 164, 166, 170, 172, 176, 178, - 179, 184, 188, 192, 197, 202, 206, 209, 212, 215, - 218, 221, 224, 227, 230, 233, 236, 243, 249, 258, - 265, 272, 279, 286, 290, 292, 294, 296, 298, 301, - 304, 307, 309, 314, 317, 323, 329, 333, 338, 339, - 341, 343, 347, 351, 355, 359, 363, 365, 366, 368, - 370, 372, 373, 376, 380, 382, 384, 388, 390, 391, - 398, 400, 402, 406, 408, 410, 413, 414, 418, 420, - 422, 424, 426, 428, 430, 432, 436, 438, 440, 442, - 444, 446, 449, 452, 455, 459, 462, 463, 465, 468, - 471, 475, 485, 495, 504, 518, 520, 522, 529, 535, - 538, 545, 553, 555, 559, 561, 562, 565, 567, 573, - 579, 585, 588, 593, 598, 605, 610, 615, 620, 623, - 631, 633, 636, 637, 639, 640, 644, 651, 655, 662, - 665, 670, 677 + 120, 122, 124, 126, 128, 130, 132, 134, 136, 138, + 141, 146, 152, 158, 162, 165, 168, 170, 174, 176, + 180, 182, 183, 188, 192, 196, 201, 206, 210, 213, + 216, 219, 222, 225, 228, 231, 234, 237, 240, 247, + 253, 262, 269, 276, 283, 290, 294, 296, 298, 300, + 302, 305, 308, 311, 313, 318, 321, 328, 335, 339, + 344, 345, 347, 349, 353, 357, 361, 365, 369, 371, + 372, 374, 376, 378, 379, 382, 386, 388, 390, 394, + 396, 397, 405, 407, 409, 413, 415, 417, 420, 421, + 425, 427, 429, 431, 433, 435, 437, 439, 443, 445, + 447, 449, 451, 453, 456, 459, 462, 466, 469, 470, + 472, 475, 478, 482, 492, 502, 511, 525, 527, 529, + 536, 542, 545, 552, 560, 562, 566, 568, 569, 572, + 574, 580, 586, 592, 595, 600, 605, 612, 617, 622, + 627, 630, 638, 640, 643, 644, 646, 647, 651, 658, + 662, 669, 672, 677, 684 }; static const short yyrhs[] = { 5, @@ -1083,97 +1090,97 @@ static const short yyrhs[] = { 5, 0, 79, 0, 80, 0, 90, 0, 91, 0, 16, 0, 14, 0, 12, 0, 10, 0, 17, 0, 15, 0, 13, 0, 11, 0, 115, 0, 116, 0, 18, - 0, 19, 0, 141, 95, 0, 0, 40, 0, 41, + 0, 19, 0, 142, 95, 0, 0, 40, 0, 41, 0, 42, 0, 43, 0, 0, 0, 58, 0, 59, - 0, 60, 0, 57, 4, 0, 0, 96, 53, 4, - 0, 125, 0, 8, 0, 127, 0, 8, 0, 127, - 0, 9, 0, 10, 0, 11, 0, 12, 0, 13, - 0, 14, 0, 15, 0, 16, 0, 17, 0, 18, - 0, 19, 0, 20, 0, 21, 0, 44, 0, 126, - 0, 154, 0, 97, 4, 0, 124, 98, 129, 99, - 0, 100, 4, 101, 127, 102, 0, 103, 4, 101, - 127, 104, 0, 105, 128, 106, 0, 105, 106, 0, - 127, 107, 0, 127, 0, 128, 96, 127, 0, 128, - 0, 128, 96, 36, 0, 36, 0, 0, 125, 100, - 132, 102, 0, 125, 100, 102, 0, 125, 108, 24, - 0, 125, 103, 132, 104, 0, 125, 105, 132, 106, - 0, 125, 105, 106, 0, 125, 37, 0, 125, 38, - 0, 125, 154, 0, 125, 131, 0, 125, 26, 0, - 115, 110, 0, 116, 4, 0, 9, 27, 0, 9, - 28, 0, 118, 7, 0, 88, 98, 130, 35, 125, - 99, 0, 86, 98, 130, 168, 99, 0, 89, 98, - 130, 96, 130, 96, 130, 99, 0, 111, 98, 130, - 96, 130, 99, 0, 112, 98, 130, 96, 130, 99, - 0, 113, 98, 130, 96, 130, 99, 0, 114, 98, - 130, 96, 130, 99, 0, 132, 96, 130, 0, 130, - 0, 32, 0, 33, 0, 135, 0, 135, 150, 0, - 135, 151, 0, 135, 25, 0, 136, 0, 136, 119, - 20, 123, 0, 136, 151, 0, 136, 119, 120, 133, - 130, 0, 136, 119, 46, 133, 125, 0, 136, 47, - 138, 0, 136, 54, 95, 139, 0, 0, 52, 0, - 51, 0, 49, 95, 137, 0, 50, 95, 4, 0, - 48, 95, 24, 0, 100, 140, 102, 0, 140, 96, - 24, 0, 24, 0, 0, 22, 0, 24, 0, 141, - 0, 0, 125, 142, 0, 144, 96, 143, 0, 143, - 0, 144, 0, 144, 96, 36, 0, 36, 0, 0, - 121, 123, 141, 98, 145, 99, 0, 29, 0, 105, - 0, 120, 146, 147, 0, 30, 0, 106, 0, 157, - 149, 0, 0, 31, 152, 146, 0, 3, 0, 4, - 0, 7, 0, 27, 0, 28, 0, 37, 0, 38, - 0, 103, 132, 104, 0, 131, 0, 109, 0, 141, - 0, 154, 0, 153, 0, 125, 155, 0, 157, 158, - 0, 148, 158, 0, 159, 119, 160, 0, 159, 162, - 0, 0, 23, 0, 61, 156, 0, 61, 8, 0, - 62, 21, 155, 0, 62, 9, 155, 96, 21, 155, - 96, 21, 155, 0, 63, 117, 155, 96, 21, 155, - 100, 161, 102, 0, 63, 117, 155, 96, 21, 155, - 100, 102, 0, 64, 121, 123, 155, 98, 165, 99, - 35, 21, 155, 65, 21, 155, 0, 65, 0, 66, - 0, 161, 117, 153, 96, 21, 155, 0, 117, 153, - 96, 21, 155, 0, 119, 167, 0, 125, 100, 155, - 96, 155, 102, 0, 163, 96, 100, 155, 96, 155, - 102, 0, 156, 0, 164, 96, 156, 0, 164, 0, - 0, 56, 55, 0, 55, 0, 111, 125, 155, 96, - 155, 0, 112, 125, 155, 96, 155, 0, 113, 125, - 155, 96, 155, 0, 45, 156, 0, 114, 156, 96, - 156, 0, 88, 156, 35, 125, 0, 89, 156, 96, - 156, 96, 156, 0, 92, 156, 96, 125, 0, 93, - 156, 96, 125, 0, 94, 156, 96, 125, 0, 87, - 163, 0, 166, 121, 123, 155, 98, 165, 99, 0, - 170, 0, 96, 164, 0, 0, 34, 0, 0, 81, - 125, 122, 0, 81, 125, 96, 15, 155, 122, 0, - 82, 125, 122, 0, 82, 125, 96, 15, 155, 122, - 0, 83, 156, 0, 169, 84, 125, 155, 0, 169, - 85, 156, 96, 125, 155, 0, 86, 125, 155, 168, - 0 + 0, 60, 0, 57, 4, 0, 0, 53, 4, 0, + 0, 96, 53, 4, 0, 126, 0, 8, 0, 128, + 0, 8, 0, 128, 0, 9, 0, 10, 0, 11, + 0, 12, 0, 13, 0, 14, 0, 15, 0, 16, + 0, 17, 0, 18, 0, 19, 0, 20, 0, 21, + 0, 44, 0, 127, 0, 155, 0, 97, 4, 0, + 125, 98, 130, 99, 0, 100, 4, 101, 128, 102, + 0, 103, 4, 101, 128, 104, 0, 105, 129, 106, + 0, 105, 106, 0, 128, 107, 0, 128, 0, 129, + 96, 128, 0, 129, 0, 129, 96, 36, 0, 36, + 0, 0, 126, 100, 133, 102, 0, 126, 100, 102, + 0, 126, 108, 24, 0, 126, 103, 133, 104, 0, + 126, 105, 133, 106, 0, 126, 105, 106, 0, 126, + 37, 0, 126, 38, 0, 126, 155, 0, 126, 132, + 0, 126, 26, 0, 115, 110, 0, 116, 4, 0, + 9, 27, 0, 9, 28, 0, 118, 7, 0, 88, + 98, 131, 35, 126, 99, 0, 86, 98, 131, 169, + 99, 0, 89, 98, 131, 96, 131, 96, 131, 99, + 0, 111, 98, 131, 96, 131, 99, 0, 112, 98, + 131, 96, 131, 99, 0, 113, 98, 131, 96, 131, + 99, 0, 114, 98, 131, 96, 131, 99, 0, 133, + 96, 131, 0, 131, 0, 32, 0, 33, 0, 136, + 0, 136, 151, 0, 136, 152, 0, 136, 25, 0, + 137, 0, 137, 119, 20, 124, 0, 137, 152, 0, + 137, 119, 120, 134, 131, 123, 0, 137, 119, 46, + 134, 126, 123, 0, 137, 47, 139, 0, 137, 54, + 95, 140, 0, 0, 52, 0, 51, 0, 49, 95, + 138, 0, 50, 95, 4, 0, 48, 95, 24, 0, + 100, 141, 102, 0, 141, 96, 24, 0, 24, 0, + 0, 22, 0, 24, 0, 142, 0, 0, 126, 143, + 0, 145, 96, 144, 0, 144, 0, 145, 0, 145, + 96, 36, 0, 36, 0, 0, 121, 124, 142, 98, + 146, 99, 122, 0, 29, 0, 105, 0, 120, 147, + 148, 0, 30, 0, 106, 0, 158, 150, 0, 0, + 31, 153, 147, 0, 3, 0, 4, 0, 7, 0, + 27, 0, 28, 0, 37, 0, 38, 0, 103, 133, + 104, 0, 132, 0, 109, 0, 142, 0, 155, 0, + 154, 0, 126, 156, 0, 158, 159, 0, 149, 159, + 0, 160, 119, 161, 0, 160, 163, 0, 0, 23, + 0, 61, 157, 0, 61, 8, 0, 62, 21, 156, + 0, 62, 9, 156, 96, 21, 156, 96, 21, 156, + 0, 63, 117, 156, 96, 21, 156, 100, 162, 102, + 0, 63, 117, 156, 96, 21, 156, 100, 102, 0, + 64, 121, 124, 156, 98, 166, 99, 35, 21, 156, + 65, 21, 156, 0, 65, 0, 66, 0, 162, 117, + 154, 96, 21, 156, 0, 117, 154, 96, 21, 156, + 0, 119, 168, 0, 126, 100, 156, 96, 156, 102, + 0, 164, 96, 100, 156, 96, 156, 102, 0, 157, + 0, 165, 96, 157, 0, 165, 0, 0, 56, 55, + 0, 55, 0, 111, 126, 156, 96, 156, 0, 112, + 126, 156, 96, 156, 0, 113, 126, 156, 96, 156, + 0, 45, 157, 0, 114, 157, 96, 157, 0, 88, + 157, 35, 126, 0, 89, 157, 96, 157, 96, 157, + 0, 92, 157, 96, 126, 0, 93, 157, 96, 126, + 0, 94, 157, 96, 126, 0, 87, 164, 0, 167, + 121, 124, 156, 98, 166, 99, 0, 171, 0, 96, + 165, 0, 0, 34, 0, 0, 81, 126, 123, 0, + 81, 126, 96, 15, 156, 123, 0, 82, 126, 123, + 0, 82, 126, 96, 15, 156, 123, 0, 83, 157, + 0, 170, 84, 126, 156, 0, 170, 85, 157, 96, + 126, 156, 0, 86, 126, 156, 169, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 983, 984, 991, 992, 1001, 1001, 1001, 1001, 1001, 1002, - 1002, 1002, 1003, 1003, 1003, 1003, 1003, 1003, 1005, 1005, - 1009, 1009, 1009, 1009, 1010, 1010, 1010, 1010, 1011, 1011, - 1012, 1012, 1015, 1018, 1022, 1022, 1023, 1024, 1025, 1028, - 1028, 1029, 1030, 1031, 1040, 1040, 1050, 1050, 1051, 1051, - 1053, 1062, 1062, 1062, 1062, 1062, 1062, 1062, 1063, 1063, - 1063, 1063, 1063, 1063, 1064, 1067, 1070, 1076, 1083, 1095, - 1099, 1110, 1119, 1122, 1130, 1134, 1139, 1140, 1143, 1146, - 1156, 1181, 1194, 1222, 1247, 1267, 1279, 1288, 1292, 1351, - 1357, 1365, 1370, 1375, 1378, 1381, 1388, 1398, 1429, 1436, - 1457, 1464, 1469, 1479, 1482, 1489, 1489, 1499, 1506, 1510, - 1513, 1516, 1529, 1549, 1551, 1555, 1559, 1561, 1563, 1568, - 1569, 1571, 1574, 1582, 1587, 1589, 1593, 1597, 1605, 1605, - 1606, 1606, 1608, 1614, 1619, 1625, 1628, 1633, 1637, 1641, - 1721, 1721, 1723, 1731, 1731, 1733, 1737, 1737, 1746, 1749, - 1752, 1755, 1758, 1761, 1764, 1767, 1791, 1798, 1801, 1806, - 1806, 1812, 1816, 1819, 1827, 1836, 1840, 1850, 1861, 1864, - 1867, 1870, 1873, 1887, 1891, 1944, 1947, 1953, 1961, 1971, - 1978, 1983, 1990, 1994, 2000, 2000, 2002, 2005, 2011, 2023, - 2031, 2041, 2053, 2060, 2067, 2074, 2079, 2098, 2120, 2134, - 2191, 2197, 2199, 2203, 2206, 2212, 2219, 2226, 2233, 2240, - 2247, 2257, 2270 + 990, 991, 998, 999, 1008, 1008, 1008, 1008, 1008, 1009, + 1009, 1009, 1010, 1010, 1010, 1010, 1010, 1010, 1012, 1012, + 1016, 1016, 1016, 1016, 1017, 1017, 1017, 1017, 1018, 1018, + 1019, 1019, 1022, 1025, 1029, 1029, 1030, 1031, 1032, 1035, + 1035, 1036, 1037, 1038, 1047, 1047, 1049, 1049, 1059, 1059, + 1060, 1060, 1062, 1071, 1071, 1071, 1071, 1071, 1071, 1071, + 1072, 1072, 1072, 1072, 1072, 1072, 1073, 1076, 1079, 1085, + 1092, 1104, 1108, 1119, 1128, 1131, 1139, 1143, 1148, 1149, + 1152, 1155, 1165, 1190, 1203, 1231, 1256, 1276, 1288, 1297, + 1301, 1360, 1366, 1374, 1379, 1384, 1387, 1390, 1397, 1407, + 1438, 1445, 1466, 1473, 1478, 1488, 1491, 1498, 1498, 1508, + 1515, 1519, 1522, 1525, 1538, 1558, 1560, 1564, 1568, 1570, + 1572, 1577, 1578, 1580, 1583, 1591, 1596, 1598, 1602, 1606, + 1614, 1614, 1615, 1615, 1617, 1623, 1628, 1634, 1637, 1642, + 1646, 1650, 1733, 1733, 1735, 1743, 1743, 1745, 1749, 1749, + 1758, 1761, 1764, 1767, 1770, 1773, 1776, 1779, 1803, 1810, + 1813, 1818, 1818, 1824, 1828, 1831, 1839, 1848, 1852, 1862, + 1873, 1876, 1879, 1882, 1885, 1899, 1903, 1956, 1959, 1965, + 1973, 1983, 1990, 1995, 2002, 2006, 2012, 2012, 2014, 2017, + 2023, 2035, 2043, 2053, 2065, 2072, 2079, 2086, 2091, 2110, + 2132, 2146, 2203, 2209, 2211, 2215, 2218, 2224, 2231, 2238, + 2245, 2252, 2259, 2269, 2282 }; #endif @@ -1194,15 +1201,15 @@ static const char * const yytname[] = { "$","error","$undefined.","ESINT64VAL" "VAARG","VAARG_old","VANEXT_old","'='","','","'\\\\'","'('","')'","'['","'x'", "']'","'<'","'>'","'{'","'}'","'*'","'c'","INTVAL","EINT64VAL","ArithmeticOps", "LogicalOps","SetCondOps","ShiftOps","SIntType","UIntType","IntType","FPType", -"OptAssign","OptLinkage","OptCallingConv","OptCAlign","TypesV","UpRTypesV","Types", -"PrimType","UpRTypes","TypeListI","ArgTypeListI","ConstVal","ConstExpr","ConstVector", -"GlobalType","Module","FunctionList","ConstPool","BigOrLittle","TargetDefinition", -"LibrariesDefinition","LibList","Name","OptName","ArgVal","ArgListH","ArgList", -"FunctionHeaderH","BEGIN","FunctionHeader","END","Function","FunctionProto", -"@1","ConstValueRef","SymbolicValueRef","ValueRef","ResolvedVal","BasicBlockList", -"BasicBlock","InstructionList","BBTerminatorInst","JumpTable","Inst","PHIList", -"ValueRefList","ValueRefListE","OptTailCall","InstVal","IndexList","OptVolatile", -"MemoryInst", NULL +"OptAssign","OptLinkage","OptCallingConv","OptAlign","OptCAlign","TypesV","UpRTypesV", +"Types","PrimType","UpRTypes","TypeListI","ArgTypeListI","ConstVal","ConstExpr", +"ConstVector","GlobalType","Module","FunctionList","ConstPool","BigOrLittle", +"TargetDefinition","LibrariesDefinition","LibList","Name","OptName","ArgVal", +"ArgListH","ArgList","FunctionHeaderH","BEGIN","FunctionHeader","END","Function", +"FunctionProto","@1","ConstValueRef","SymbolicValueRef","ValueRef","ResolvedVal", +"BasicBlockList","BasicBlock","InstructionList","BBTerminatorInst","JumpTable", +"Inst","PHIList","ValueRefList","ValueRefListE","OptTailCall","InstVal","IndexList", +"OptVolatile","MemoryInst", NULL }; #endif @@ -1212,23 +1219,23 @@ static const short yyr1[] = { 0, 115, 115, 115, 115, 116, 116, 116, 116, 117, 117, 118, 118, 119, 119, 120, 120, 120, 120, 120, 121, 121, 121, 121, 121, 122, 122, 123, 123, 124, 124, - 125, 126, 126, 126, 126, 126, 126, 126, 126, 126, - 126, 126, 126, 126, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 127, 128, 128, 129, 129, 129, 129, - 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, - 130, 130, 130, 130, 130, 130, 131, 131, 131, 131, - 131, 131, 131, 132, 132, 133, 133, 134, 135, 135, - 135, 135, 136, 136, 136, 136, 136, 136, 136, 137, - 137, 138, 138, 138, 139, 140, 140, 140, 141, 141, - 142, 142, 143, 144, 144, 145, 145, 145, 145, 146, - 147, 147, 148, 149, 149, 150, 152, 151, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 154, 154, 155, - 155, 156, 157, 157, 158, 159, 159, 159, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 161, 161, 162, - 163, 163, 164, 164, 165, 165, 166, 166, 167, 167, - 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, - 167, 168, 168, 169, 169, 170, 170, 170, 170, 170, - 170, 170, 170 + 125, 125, 126, 127, 127, 127, 127, 127, 127, 127, + 127, 127, 127, 127, 127, 127, 128, 128, 128, 128, + 128, 128, 128, 128, 128, 128, 129, 129, 130, 130, + 130, 130, 131, 131, 131, 131, 131, 131, 131, 131, + 131, 131, 131, 131, 131, 131, 131, 131, 132, 132, + 132, 132, 132, 132, 132, 133, 133, 134, 134, 135, + 136, 136, 136, 136, 137, 137, 137, 137, 137, 137, + 137, 138, 138, 139, 139, 139, 140, 141, 141, 141, + 142, 142, 143, 143, 144, 145, 145, 146, 146, 146, + 146, 147, 148, 148, 149, 150, 150, 151, 153, 152, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 155, + 155, 156, 156, 157, 158, 158, 159, 160, 160, 160, + 161, 161, 161, 161, 161, 161, 161, 161, 161, 162, + 162, 163, 164, 164, 165, 165, 166, 166, 167, 167, + 168, 168, 168, 168, 168, 168, 168, 168, 168, 168, + 168, 168, 168, 169, 169, 170, 170, 171, 171, 171, + 171, 171, 171, 171, 171 }; static const short yyr2[] = { 0, @@ -1236,388 +1243,378 @@ static const short yyr2[] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, 1, 1, 1, 1, 0, 0, - 1, 1, 1, 2, 0, 3, 1, 1, 1, 1, + 1, 1, 1, 2, 0, 2, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 4, 5, - 5, 3, 2, 2, 1, 3, 1, 3, 1, 0, - 4, 3, 3, 4, 4, 3, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 6, 5, 8, 6, - 6, 6, 6, 3, 1, 1, 1, 1, 2, 2, - 2, 1, 4, 2, 5, 5, 3, 4, 0, 1, - 1, 3, 3, 3, 3, 3, 1, 0, 1, 1, - 1, 0, 2, 3, 1, 1, 3, 1, 0, 6, - 1, 1, 3, 1, 1, 2, 0, 3, 1, 1, - 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, - 1, 2, 2, 2, 3, 2, 0, 1, 2, 2, - 3, 9, 9, 8, 13, 1, 1, 6, 5, 2, - 6, 7, 1, 3, 1, 0, 2, 1, 5, 5, - 5, 2, 4, 4, 6, 4, 4, 4, 2, 7, - 1, 2, 0, 1, 0, 3, 6, 3, 6, 2, - 4, 6, 4 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, + 4, 5, 5, 3, 2, 2, 1, 3, 1, 3, + 1, 0, 4, 3, 3, 4, 4, 3, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 6, 5, + 8, 6, 6, 6, 6, 3, 1, 1, 1, 1, + 2, 2, 2, 1, 4, 2, 6, 6, 3, 4, + 0, 1, 1, 3, 3, 3, 3, 3, 1, 0, + 1, 1, 1, 0, 2, 3, 1, 1, 3, 1, + 0, 7, 1, 1, 3, 1, 1, 2, 0, 3, + 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, + 1, 1, 1, 2, 2, 2, 3, 2, 0, 1, + 2, 2, 3, 9, 9, 8, 13, 1, 1, 6, + 5, 2, 6, 7, 1, 3, 1, 0, 2, 1, + 5, 5, 5, 2, 4, 4, 6, 4, 4, 4, + 2, 7, 1, 2, 0, 1, 0, 3, 6, 3, + 6, 2, 4, 6, 4 }; -static const short yydefact[] = { 119, - 39, 112, 111, 147, 35, 36, 37, 38, 40, 167, - 109, 110, 167, 129, 130, 0, 0, 39, 0, 114, - 40, 0, 41, 42, 43, 0, 0, 168, 164, 34, - 144, 145, 146, 163, 0, 0, 0, 117, 0, 0, - 0, 0, 33, 148, 44, 1, 2, 48, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 0, 0, 0, 0, 158, 0, 0, 47, - 66, 51, 159, 67, 141, 142, 143, 205, 166, 0, - 0, 0, 128, 118, 113, 106, 107, 0, 0, 68, - 0, 0, 50, 73, 75, 0, 0, 80, 74, 204, - 0, 188, 0, 0, 0, 0, 40, 176, 177, 5, +static const short yydefact[] = { 121, + 39, 114, 113, 149, 35, 36, 37, 38, 40, 169, + 111, 112, 169, 131, 132, 0, 0, 39, 0, 116, + 40, 0, 41, 42, 43, 0, 0, 170, 166, 34, + 146, 147, 148, 165, 0, 0, 0, 119, 0, 0, + 0, 0, 33, 150, 44, 1, 2, 50, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, + 66, 67, 0, 0, 0, 0, 160, 0, 0, 49, + 68, 53, 161, 69, 143, 144, 145, 207, 168, 0, + 0, 0, 130, 120, 115, 108, 109, 0, 0, 70, + 0, 0, 52, 75, 77, 0, 0, 82, 76, 206, + 0, 190, 0, 0, 0, 0, 40, 178, 179, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, - 19, 20, 0, 0, 0, 0, 0, 0, 0, 165, - 40, 180, 0, 201, 124, 121, 120, 122, 123, 127, - 0, 116, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 0, 0, 0, 0, 115, 0, 0, - 0, 72, 139, 79, 77, 0, 0, 192, 187, 170, - 169, 0, 0, 24, 28, 23, 27, 22, 26, 21, - 25, 29, 30, 0, 0, 45, 45, 210, 0, 0, - 199, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 125, 94, 95, 3, 4, 92, - 93, 96, 91, 87, 88, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 90, 89, 49, 49, - 76, 138, 132, 135, 136, 0, 0, 69, 149, 150, - 151, 152, 153, 154, 155, 0, 157, 161, 160, 162, - 0, 171, 0, 0, 0, 206, 0, 208, 203, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 126, 0, 0, 0, 82, 105, 0, - 0, 86, 0, 83, 0, 0, 0, 0, 70, 71, - 131, 133, 0, 140, 78, 0, 0, 0, 0, 0, - 0, 0, 0, 213, 0, 0, 194, 0, 196, 197, - 198, 0, 0, 0, 193, 0, 211, 0, 203, 0, - 0, 0, 81, 84, 85, 0, 0, 0, 0, 137, - 134, 156, 0, 0, 186, 45, 46, 45, 183, 202, - 0, 0, 0, 189, 190, 191, 186, 0, 0, 0, - 0, 104, 0, 0, 0, 0, 0, 0, 185, 0, - 0, 207, 209, 0, 0, 0, 195, 0, 212, 98, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 184, - 181, 0, 200, 97, 0, 100, 101, 102, 103, 0, - 174, 0, 0, 0, 182, 0, 172, 0, 173, 0, - 0, 99, 0, 0, 0, 0, 0, 0, 179, 0, - 0, 178, 175, 0, 0, 0 + 19, 20, 0, 0, 0, 0, 0, 0, 0, 167, + 40, 182, 0, 203, 126, 123, 122, 124, 125, 129, + 0, 47, 54, 55, 56, 57, 58, 59, 60, 61, + 62, 63, 64, 0, 0, 0, 0, 47, 0, 0, + 0, 74, 141, 81, 79, 0, 0, 194, 189, 172, + 171, 0, 0, 24, 28, 23, 27, 22, 26, 21, + 25, 29, 30, 0, 0, 47, 47, 212, 0, 0, + 201, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 127, 0, 118, 96, 97, 3, + 4, 94, 95, 98, 93, 89, 90, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 92, 91, + 117, 51, 51, 78, 140, 134, 137, 138, 0, 0, + 71, 151, 152, 153, 154, 155, 156, 157, 0, 159, + 163, 162, 164, 0, 173, 0, 0, 0, 208, 0, + 210, 205, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, + 0, 84, 107, 0, 0, 88, 0, 85, 0, 0, + 0, 0, 72, 73, 133, 135, 0, 45, 80, 0, + 0, 0, 0, 0, 0, 0, 215, 0, 0, 196, + 0, 198, 199, 200, 0, 0, 0, 195, 0, 213, + 0, 48, 205, 0, 0, 0, 83, 86, 87, 0, + 0, 0, 0, 139, 136, 0, 142, 158, 0, 0, + 188, 47, 47, 185, 204, 0, 0, 0, 191, 192, + 193, 188, 0, 0, 0, 0, 106, 0, 0, 0, + 0, 46, 0, 0, 187, 0, 209, 211, 0, 0, + 0, 197, 0, 214, 100, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 186, 183, 0, 202, 99, 0, + 102, 103, 104, 105, 0, 176, 0, 0, 0, 184, + 0, 174, 0, 175, 0, 0, 101, 0, 0, 0, + 0, 0, 0, 181, 0, 0, 180, 177, 0, 0, + 0 }; static const short yydefgoto[] = { 67, - 220, 233, 234, 235, 236, 164, 165, 194, 166, 18, - 9, 26, 266, 68, 69, 167, 71, 72, 96, 176, - 289, 257, 290, 88, 424, 1, 2, 148, 38, 84, - 151, 73, 302, 244, 245, 246, 27, 77, 10, 33, - 11, 12, 21, 258, 74, 260, 349, 13, 29, 30, - 140, 403, 79, 201, 369, 370, 141, 142, 314, 143, - 144 + 222, 235, 236, 237, 238, 164, 165, 194, 166, 18, + 9, 26, 347, 217, 68, 69, 167, 71, 72, 96, + 176, 293, 260, 294, 88, 429, 1, 2, 148, 38, + 84, 151, 73, 306, 247, 248, 249, 27, 77, 10, + 33, 11, 12, 21, 261, 74, 263, 354, 13, 29, + 30, 140, 408, 79, 201, 375, 376, 141, 142, 317, + 143, 144 }; static const short yypact[] = {-32768, - 15, 304,-32768,-32768,-32768,-32768,-32768,-32768, 104, -16, --32768,-32768, -13,-32768,-32768, -27, -69, 23, -57,-32768, - 104, 88,-32768,-32768,-32768, 954, -18,-32768,-32768, 50, --32768,-32768,-32768,-32768, -34, -22, 10,-32768, -5, 954, - 58, 58,-32768,-32768,-32768,-32768,-32768, 17,-32768,-32768, + 191, 336,-32768,-32768,-32768,-32768,-32768,-32768, 37, 19, +-32768,-32768, -17,-32768,-32768, 101, -32, 31, -25,-32768, + 37, 53,-32768,-32768,-32768, 896, -13,-32768,-32768, 130, +-32768,-32768,-32768,-32768, -19, -16, 33,-32768, 26, 896, + 58, 58,-32768,-32768,-32768,-32768,-32768, 55,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768, 126, 142, 148, 531,-32768, 50, 61,-32768, --32768, -30,-32768,-32768,-32768,-32768,-32768, 1111,-32768, 150, - 66, 166, 153,-32768,-32768,-32768,-32768, 991, 1028,-32768, - 74, 77,-32768,-32768, -30, -36, 81, 769,-32768,-32768, - 991,-32768, 125, 1065, 3, 123, 104,-32768,-32768,-32768, +-32768,-32768, 127, 156, 166, 124,-32768, 130, 82,-32768, +-32768, -81,-32768,-32768,-32768,-32768,-32768, 1053,-32768, 157, + 54, 178, 160,-32768,-32768,-32768,-32768, 933, 970,-32768, + 88, 91,-32768,-32768, -81, -42, 85, 711,-32768,-32768, + 933,-32768, 141, 1007, 0, 104, 37,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768, 991, 991, 991, 991, 991, 991, 991, --32768,-32768, 991, 991, 991, 991, 991, 991, 991,-32768, - 104,-32768, 57,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -8,-32768, 117, 146, 177, 151, 178, 162, 179, 164, - 180, 182, 183, 169, 187, 185, 407,-32768, 991, 991, - 991,-32768, 806,-32768, 97, 95, 595,-32768,-32768, 17, --32768, 595, 595,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768, 595, 954, 100, 101,-32768, 595, 98, - 103, 165, 106, 107, 111, 112, 595, 595, 595, 113, - 954, 991, 991, 186,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768, 120, 122, 124, 843, 1028, - 552, 188, 127, 128, 129, 130,-32768,-32768, -31, -65, - -30,-32768, 50,-32768, 115, 133, 880,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768, 1028,-32768,-32768,-32768,-32768, - 137,-32768, 138, 595, -6,-32768, -2,-32768, 139, 595, - 121, 991, 991, 991, 991, 991, 140, 141, 143, 991, - 595, 595, 144,-32768, 1028, 1028, 1028,-32768,-32768, 18, - -7,-32768, 0,-32768, 1028, 1028, 1028, 1028,-32768,-32768, --32768,-32768, 917,-32768,-32768, 25, 202, 203, 131, 595, - 234, 595, 991,-32768, 145, 595,-32768, 147,-32768,-32768, --32768, 595, 595, 595,-32768, 154,-32768, 991, 139, 209, - 149, 1028,-32768,-32768,-32768, 157, 159, 160, 161,-32768, --32768,-32768, 595, 595, 991, 167,-32768, 167,-32768, 168, - 595, 170, 991,-32768,-32768,-32768, 991, 595, 163, 991, - 1028,-32768, 1028, 1028, 1028, 1028, 171, 158, 168, 175, - 207,-32768,-32768, 991, 173, 595,-32768, 191,-32768,-32768, - 192, 174, 195, 196, 199, 200, 248, 20, 241,-32768, --32768, 176,-32768,-32768, 1028,-32768,-32768,-32768,-32768, 595, --32768, 673, 69, 258,-32768, 205,-32768, 210,-32768, 673, - 595,-32768, 260, 213, 240, 595, 289, 290,-32768, 595, - 595,-32768,-32768, 312, 315,-32768 +-32768,-32768,-32768, 933, 933, 933, 933, 933, 933, 933, +-32768,-32768, 933, 933, 933, 933, 933, 933, 933,-32768, + 37,-32768, 71,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + -77, 102, 131, 159, 195, 161, 196, 163, 201, 171, + 202, 203, 204, 175, 208, 206, 387, 102, 933, 933, + 933,-32768, 748,-32768, 118, 116, 560,-32768,-32768, 55, +-32768, 560, 560,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 560, 896, 129, 132,-32768, 560, 123, + 139, 205, 140, 142, 143, 145, 560, 560, 560, 146, + 896, 933, 933, 213,-32768, 173,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768, 148, 149, 150, + 785, 970, 511, 219, 158, 162, 164, 165,-32768,-32768, +-32768, -14, -48, -81,-32768, 130,-32768, 168, 167, 822, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 970,-32768, +-32768,-32768,-32768, 169,-32768, 172, 560, -12,-32768, -7, +-32768, 174, 560, 144, 933, 933, 933, 933, 933, 177, + 179, 180, 933, 560, 560, 181,-32768, 251, 970, 970, + 970,-32768,-32768, -74, -36,-32768, -41,-32768, 970, 970, + 970, 970,-32768,-32768,-32768,-32768, 859, 216,-32768, -35, + 237, 238, 176, 560, 560, 933,-32768, 184, 560,-32768, + 186,-32768,-32768,-32768, 560, 560, 560,-32768, 185,-32768, + 933,-32768, 174, 236, 189, 970,-32768,-32768,-32768, 198, + 199, 200, 207,-32768,-32768, 293,-32768,-32768, 560, 560, + 933, 102, 102,-32768, 214, 560, 215, 933,-32768,-32768, +-32768, 933, 560, 217, 933, 970,-32768, 970, 970, 970, + 970,-32768, 218, 212, 214, 223,-32768,-32768, 933, 197, + 560,-32768, 224,-32768,-32768, 225, 221, 227, 228, 229, + 230, 277, 20, 265,-32768,-32768, 231,-32768,-32768, 970, +-32768,-32768,-32768,-32768, 560,-32768, 615, 70, 280,-32768, + 232,-32768, 234,-32768, 615, 560,-32768, 281, 239, 250, + 560, 283, 313,-32768, 560, 560,-32768,-32768, 340, 341, +-32768 }; static const short yypgoto[] = {-32768, --32768, 238, 239, 242, 251, -102, -100, -385,-32768, 288, - 314, -82, -195, -35,-32768, -26,-32768, -46, 232,-32768, - -81, 172, -203, 291,-32768,-32768,-32768,-32768,-32768,-32768, --32768, -1,-32768, 35,-32768,-32768, 319,-32768,-32768,-32768, --32768, 339,-32768, -283, -51, 114, -85,-32768, 329,-32768, --32768,-32768,-32768,-32768, 30, -4,-32768,-32768, 26,-32768, --32768 +-32768, 264, 267, 268, 269, -102, -101, -381,-32768, 318, + 333, -96,-32768, -158, -38,-32768, -26,-32768, -46, 254, +-32768, -82, 188, -209, 317,-32768,-32768,-32768,-32768,-32768, +-32768,-32768, -1,-32768, 59,-32768,-32768, 344,-32768,-32768, +-32768,-32768, 359,-32768, -349, -6, 155, -86,-32768, 357, +-32768,-32768,-32768,-32768,-32768, 56, 9,-32768,-32768, 40, +-32768,-32768 }; -#define YYLAST 1205 +#define YYLAST 1147 static const short yytable[] = { 70, - 19, 268, 402, 192, 85, 193, 28, 168, 310, 28, - 75, 182, 312, 70, -108, 178, 31, 410, 181, 95, - 35, 36, 37, 183, 195, 39, 291, 293, 19, 184, - 185, 186, 187, 188, 189, 190, 191, 43, 300, 3, - 198, 99, 40, 202, 203, 4, 311, 204, 205, 206, - 311, 95, 306, 210, 5, 6, 7, 8, 211, 171, - 80, 152, 5, 6, 7, 8, 97, -49, 41, 172, - 299, 14, 81, 15, 177, 99, 99, 177, 184, 185, - 186, 187, 188, 189, 190, 191, 76, 214, 332, 86, - 87, 45, 32, 215, 83, 332, 334, 196, 197, 177, - 199, 200, 177, 177, 82, 335, 177, 177, 177, 207, - 208, 209, 177, 332, -50, 238, 146, 147, 408, 333, - 332, 401, 239, 240, 241, 259, 414, 283, 342, 90, - 259, 259, 184, 185, 186, 187, 188, 189, 190, 191, - 212, 213, 259, 216, 217, 91, 243, 259, -24, -24, - 372, 92, 373, -23, -23, 259, 259, 259, 98, 264, - 22, 23, 24, 25, -22, -22, -21, -21, 70, 149, - 409, 218, 219, 145, 169, 281, 150, 170, 173, 179, - -28, -27, -26, -25, 70, 282, 177, 318, -31, -32, - 221, 222, 247, 248, 325, 265, 267, 270, 271, 272, - 241, 273, 274, 329, 330, 331, 275, 276, 280, 284, - 303, 294, 259, 336, 337, 338, 339, 285, 259, 286, - 316, 287, 343, 344, 295, 296, 297, 298, 345, 259, - 259, 304, 307, 308, 313, 322, 323, 347, 324, 328, - 351, 301, 353, 360, 361, 317, 177, 319, 320, 321, - 362, 357, 363, 177, 364, 365, 366, 388, 259, 311, - 259, 380, 371, 374, 259, 376, 387, 377, 400, 395, - 259, 259, 259, 389, 391, 404, 243, 405, 411, 382, - 416, 383, 384, 385, 386, 192, 177, 193, 390, 393, - 394, 259, 259, 396, 397, 261, 262, 398, 399, 259, - 192, 358, 193, 412, 418, 413, 259, 263, 417, 420, - 421, 425, 269, 406, 426, 136, 137, 78, 177, 138, - 277, 278, 279, -34, 259, 14, 177, 15, 139, 175, - 177, 42, 89, 381, 4, -34, -34, 341, 237, 44, - 20, 34, 350, -34, -34, -34, -34, 177, 259, -34, - 16, 0, 378, 0, 359, 0, 0, 17, 0, 259, - 0, 0, 0, 0, 259, 0, 0, 0, 259, 259, - 0, 0, 0, 0, 0, 0, 0, 309, 0, 0, - 0, 0, 0, 315, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 326, 327, 0, 0, 0, 0, + 19, 85, 314, 192, 193, 28, 168, 315, 182, 241, + 195, 407, 31, 70, 178, 75, -51, 181, 214, 95, + 183, 336, 295, 297, 215, 99, 415, 337, 19, 184, + 185, 186, 187, 188, 189, 190, 191, 269, 271, 198, + 288, 28, 202, 203, 211, 288, 204, 205, 206, 310, + 40, 95, 210, 171, 336, 304, 45, 413, 99, 336, + 336, 152, 39, 172, 339, 419, 97, 338, 348, 43, + 5, 6, 7, 8, 177, 80, 41, 177, 81, 184, + 185, 186, 187, 188, 189, 190, 191, 303, 32, 86, + 87, 76, 99, 22, 23, 24, 25, 196, 197, 177, + 199, 200, 177, 177, 146, 147, 177, 177, 177, 207, + 208, 209, 177, 184, 185, 186, 187, 188, 189, 190, + 191, 406, 242, 243, 244, 83, 286, 82, 46, 47, + 90, 93, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 14, 246, 15, 35, 36, + 37, 14, -52, 15, 212, 213, 267, 218, 219, 91, + 240, -24, -24, -23, -23, -22, -22, 62, 70, 92, + 262, 414, 284, -21, -21, 262, 262, 220, 221, 98, + 145, 149, 173, 150, 70, 285, 177, 262, 169, 321, + -110, 170, 262, 377, 378, 179, 328, 216, -28, -27, + 262, 262, 262, 244, -26, -25, 333, 334, 335, -31, + -32, 223, 224, 250, 251, 3, 340, 341, 342, 343, + 63, 4, 273, 64, 268, 288, 65, 270, 66, 94, + 5, 6, 7, 8, 274, 276, 287, 277 |