diff --git a/libasn1parser/asn1p_y.c b/libasn1parser/asn1p_y.c
index ae4e31a43f281003bb297ce4abffcabc8c7dee22..bc495515fd3fdb8730d328a2b59f0e81232f707d 100644
--- a/libasn1parser/asn1p_y.c
+++ b/libasn1parser/asn1p_y.c
@@ -206,11 +206,11 @@ typedef union {
-#define YYFINAL 431
+#define YYFINAL 425
#define YYFLAG -32768
#define YYNTBASE 118
-#define YYTRANSLATE(x) ((unsigned)(x) <= 356 ? yytranslate[x] : 222)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 356 ? yytranslate[x] : 220)
static const char yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -258,144 +258,143 @@ static const short yyprhs[] = { 0,
57, 60, 63, 64, 66, 68, 71, 73, 75, 77,
79, 81, 82, 86, 88, 92, 95, 97, 100, 105,
107, 111, 113, 117, 119, 123, 127, 130, 132, 136,
- 138, 142, 144, 151, 153, 155, 156, 158, 160, 164,
- 166, 168, 173, 177, 181, 188, 190, 194, 196, 200,
- 204, 208, 210, 214, 216, 218, 219, 221, 223, 227,
- 231, 235, 237, 239, 243, 246, 248, 254, 255, 257,
- 259, 263, 266, 271, 276, 277, 279, 280, 287, 289,
- 292, 294, 296, 298, 302, 306, 310, 312, 317, 322,
- 327, 334, 341, 343, 348, 353, 355, 359, 361, 365,
- 369, 373, 375, 379, 381, 385, 387, 389, 391, 393,
- 398, 402, 403, 407, 409, 411, 413, 415, 417, 419,
- 421, 423, 425, 429, 431, 433, 435, 437, 440, 442,
- 444, 446, 448, 451, 454, 456, 458, 461, 464, 466,
- 468, 470, 472, 474, 477, 479, 482, 484, 486, 488,
- 490, 492, 494, 496, 498, 500, 502, 504, 506, 508,
- 510, 512, 514, 516, 518, 520, 521, 523, 525, 530,
- 534, 539, 541, 545, 551, 553, 557, 561, 565, 569,
- 574, 578, 580, 582, 586, 590, 594, 598, 600, 602,
- 603, 609, 611, 614, 617, 621, 623, 625, 627, 629,
- 631, 633, 635, 637, 641, 647, 649, 653, 655, 659,
- 660, 662, 664, 666, 668, 670, 672, 676, 681, 683,
- 687, 690, 694, 696, 700, 701, 703, 705, 708, 711,
- 715, 717, 721, 723, 728, 733, 735, 737, 739, 741,
- 742, 744, 747, 752, 753, 755, 757, 759, 760, 762,
- 764, 766, 768, 770, 771, 773
+ 138, 142, 144, 145, 152, 154, 156, 161, 165, 169,
+ 176, 178, 182, 184, 188, 192, 196, 198, 202, 204,
+ 206, 207, 209, 211, 215, 219, 223, 225, 227, 231,
+ 234, 236, 242, 243, 245, 247, 251, 254, 259, 264,
+ 265, 267, 268, 275, 277, 280, 282, 284, 286, 290,
+ 294, 298, 300, 305, 310, 315, 322, 329, 331, 336,
+ 341, 343, 347, 349, 353, 357, 361, 363, 367, 369,
+ 373, 375, 377, 379, 381, 386, 390, 391, 395, 397,
+ 399, 401, 403, 405, 407, 409, 411, 413, 417, 419,
+ 421, 423, 425, 428, 430, 432, 434, 436, 439, 442,
+ 444, 446, 449, 452, 454, 456, 458, 460, 462, 465,
+ 467, 470, 472, 474, 476, 478, 480, 482, 484, 486,
+ 488, 490, 492, 494, 496, 498, 500, 502, 504, 506,
+ 508, 509, 511, 513, 518, 522, 527, 529, 533, 539,
+ 541, 545, 549, 553, 557, 562, 566, 568, 570, 574,
+ 578, 582, 586, 588, 590, 591, 597, 599, 602, 605,
+ 609, 611, 613, 615, 617, 619, 621, 623, 625, 629,
+ 635, 637, 641, 643, 647, 648, 650, 652, 654, 656,
+ 658, 660, 664, 669, 671, 675, 678, 682, 684, 688,
+ 689, 691, 693, 696, 699, 703, 705, 709, 711, 716,
+ 721, 723, 725, 727, 729, 730, 732, 735, 740, 741,
+ 743, 745, 747, 748, 750, 752, 754, 756, 758, 759,
+ 761
};
static const short yyrhs[] = { 119,
- 0, 120, 0, 119, 120, 0, 218, 121, 36, 125,
+ 0, 120, 0, 119, 120, 0, 216, 121, 36, 125,
3, 23, 128, 41, 0, 0, 122, 0, 105, 123,
106, 0, 105, 106, 0, 124, 0, 123, 124, 0,
- 221, 0, 221, 107, 9, 108, 0, 9, 0, 0,
+ 219, 0, 219, 107, 9, 108, 0, 9, 0, 0,
126, 0, 127, 0, 126, 127, 0, 43, 86, 0,
54, 86, 0, 22, 86, 0, 45, 55, 0, 14,
59, 0, 0, 129, 0, 130, 0, 129, 130, 0,
- 132, 0, 137, 0, 145, 0, 172, 0, 140, 0,
- 0, 40, 14, 131, 0, 181, 0, 56, 133, 109,
+ 132, 0, 137, 0, 143, 0, 170, 0, 140, 0,
+ 0, 40, 14, 131, 0, 179, 0, 56, 133, 109,
0, 56, 48, 0, 134, 0, 133, 134, 0, 135,
- 48, 218, 121, 0, 136, 0, 135, 110, 136, 0,
- 218, 0, 218, 105, 106, 0, 221, 0, 44, 138,
+ 48, 216, 121, 0, 136, 0, 135, 110, 136, 0,
+ 216, 0, 216, 105, 106, 0, 219, 0, 44, 138,
109, 0, 44, 19, 109, 0, 44, 109, 0, 139,
- 0, 138, 110, 139, 0, 218, 0, 218, 105, 106,
- 0, 221, 0, 218, 141, 3, 105, 142, 106, 0,
- 167, 0, 178, 0, 0, 143, 0, 144, 0, 143,
- 110, 144, 0, 104, 0, 189, 0, 218, 3, 213,
- 89, 0, 218, 3, 165, 0, 218, 3, 155, 0,
- 218, 105, 146, 106, 3, 165, 0, 147, 0, 146,
- 110, 147, 0, 218, 0, 218, 111, 221, 0, 218,
- 111, 218, 0, 178, 111, 221, 0, 149, 0, 148,
- 110, 149, 0, 165, 0, 221, 0, 0, 151, 0,
- 152, 0, 151, 110, 152, 0, 221, 165, 207, 0,
- 32, 70, 165, 0, 164, 0, 154, 0, 153, 110,
- 154, 0, 221, 165, 0, 164, 0, 30, 105, 157,
- 106, 159, 0, 0, 90, 0, 158, 0, 157, 110,
- 158, 0, 170, 207, 0, 170, 165, 156, 207, 0,
- 170, 170, 156, 207, 0, 0, 160, 0, 0, 97,
- 84, 105, 161, 162, 106, 0, 163, 0, 162, 163,
- 0, 4, 0, 170, 0, 104, 0, 104, 112, 175,
- 0, 104, 112, 212, 0, 213, 166, 185, 0, 180,
- 0, 29, 105, 153, 106, 0, 80, 105, 150, 106,
- 0, 81, 105, 150, 106, 0, 80, 185, 70, 220,
- 213, 166, 0, 81, 185, 70, 220, 213, 166, 0,
- 20, 0, 20, 37, 27, 221, 0, 218, 105, 148,
- 106, 0, 167, 0, 58, 70, 167, 0, 13, 0,
- 13, 113, 218, 0, 219, 113, 218, 0, 13, 113,
- 221, 0, 219, 0, 219, 113, 168, 0, 169, 0,
- 168, 113, 169, 0, 171, 0, 171, 0, 15, 0,
- 16, 0, 221, 141, 3, 173, 0, 221, 111, 173,
- 0, 0, 105, 174, 177, 0, 65, 0, 47, 0,
- 88, 0, 5, 0, 7, 0, 176, 0, 212, 0,
- 175, 0, 221, 0, 218, 113, 221, 0, 6, 0,
- 10, 0, 11, 0, 4, 0, 177, 4, 0, 26,
- 0, 65, 0, 78, 0, 179, 0, 69, 83, 0,
- 67, 53, 0, 79, 0, 46, 0, 38, 73, 0,
- 28, 83, 0, 93, 0, 49, 0, 181, 0, 60,
- 0, 42, 0, 24, 83, 0, 178, 0, 179, 209,
- 0, 25, 0, 50, 0, 51, 0, 52, 0, 61,
- 0, 66, 0, 76, 0, 85, 0, 87, 0, 92,
- 0, 94, 0, 95, 0, 96, 0, 68, 0, 101,
- 0, 102, 0, 99, 0, 100, 0, 98, 0, 0,
- 186, 0, 187, 0, 82, 107, 188, 108, 0, 107,
- 188, 108, 0, 187, 107, 188, 108, 0, 189, 0,
- 189, 110, 104, 0, 189, 110, 104, 110, 189, 0,
- 190, 0, 19, 98, 190, 0, 189, 182, 190, 0,
- 189, 183, 190, 0, 190, 184, 190, 0, 193, 107,
- 188, 108, 0, 107, 188, 108, 0, 194, 0, 195,
- 0, 194, 192, 194, 0, 63, 192, 194, 0, 194,
- 192, 62, 0, 63, 192, 62, 0, 201, 0, 196,
- 0, 0, 33, 27, 105, 191, 177, 0, 103, 0,
- 103, 114, 0, 114, 103, 0, 114, 103, 114, 0,
- 82, 0, 48, 0, 47, 0, 88, 0, 212, 0,
- 176, 0, 221, 0, 218, 0, 97, 31, 187, 0,
- 97, 32, 105, 197, 106, 0, 198, 0, 197, 110,
- 198, 0, 104, 0, 221, 185, 199, 0, 0, 200,
- 0, 75, 0, 17, 0, 71, 0, 202, 0, 203,
- 0, 105, 218, 106, 0, 202, 105, 204, 106, 0,
- 205, 0, 204, 110, 205, 0, 115, 206, 0, 115,
- 113, 206, 0, 221, 0, 206, 113, 221, 0, 0,
- 208, 0, 71, 0, 35, 173, 0, 105, 106, 0,
- 105, 210, 106, 0, 211, 0, 210, 110, 211, 0,
- 221, 0, 221, 107, 212, 108, 0, 221, 107, 175,
- 108, 0, 212, 0, 104, 0, 9, 0, 12, 0,
- 0, 214, 0, 215, 217, 0, 116, 216, 9, 117,
- 0, 0, 91, 0, 21, 0, 77, 0, 0, 54,
- 0, 43, 0, 13, 0, 14, 0, 14, 0, 0,
- 221, 0, 8, 0
+ 0, 138, 110, 139, 0, 216, 0, 216, 105, 106,
+ 0, 219, 0, 0, 216, 142, 3, 105, 141, 175,
+ 0, 165, 0, 176, 0, 216, 3, 211, 89, 0,
+ 216, 3, 163, 0, 216, 3, 153, 0, 216, 105,
+ 144, 106, 3, 163, 0, 145, 0, 144, 110, 145,
+ 0, 216, 0, 216, 111, 219, 0, 216, 111, 216,
+ 0, 176, 111, 219, 0, 147, 0, 146, 110, 147,
+ 0, 163, 0, 219, 0, 0, 149, 0, 150, 0,
+ 149, 110, 150, 0, 219, 163, 205, 0, 32, 70,
+ 163, 0, 162, 0, 152, 0, 151, 110, 152, 0,
+ 219, 163, 0, 162, 0, 30, 105, 155, 106, 157,
+ 0, 0, 90, 0, 156, 0, 155, 110, 156, 0,
+ 168, 205, 0, 168, 163, 154, 205, 0, 168, 168,
+ 154, 205, 0, 0, 158, 0, 0, 97, 84, 105,
+ 159, 160, 106, 0, 161, 0, 160, 161, 0, 4,
+ 0, 168, 0, 104, 0, 104, 112, 173, 0, 104,
+ 112, 210, 0, 211, 164, 183, 0, 178, 0, 29,
+ 105, 151, 106, 0, 80, 105, 148, 106, 0, 81,
+ 105, 148, 106, 0, 80, 183, 70, 218, 211, 164,
+ 0, 81, 183, 70, 218, 211, 164, 0, 20, 0,
+ 20, 37, 27, 219, 0, 216, 105, 146, 106, 0,
+ 165, 0, 58, 70, 165, 0, 13, 0, 13, 113,
+ 216, 0, 217, 113, 216, 0, 13, 113, 219, 0,
+ 217, 0, 217, 113, 166, 0, 167, 0, 166, 113,
+ 167, 0, 169, 0, 169, 0, 15, 0, 16, 0,
+ 219, 142, 3, 171, 0, 219, 111, 171, 0, 0,
+ 105, 172, 175, 0, 65, 0, 47, 0, 88, 0,
+ 5, 0, 7, 0, 174, 0, 210, 0, 173, 0,
+ 219, 0, 216, 113, 219, 0, 6, 0, 10, 0,
+ 11, 0, 4, 0, 175, 4, 0, 26, 0, 65,
+ 0, 78, 0, 177, 0, 69, 83, 0, 67, 53,
+ 0, 79, 0, 46, 0, 38, 73, 0, 28, 83,
+ 0, 93, 0, 49, 0, 179, 0, 60, 0, 42,
+ 0, 24, 83, 0, 176, 0, 177, 207, 0, 25,
+ 0, 50, 0, 51, 0, 52, 0, 61, 0, 66,
+ 0, 76, 0, 85, 0, 87, 0, 92, 0, 94,
+ 0, 95, 0, 96, 0, 68, 0, 101, 0, 102,
+ 0, 99, 0, 100, 0, 98, 0, 0, 184, 0,
+ 185, 0, 82, 107, 186, 108, 0, 107, 186, 108,
+ 0, 185, 107, 186, 108, 0, 187, 0, 187, 110,
+ 104, 0, 187, 110, 104, 110, 187, 0, 188, 0,
+ 19, 98, 188, 0, 187, 180, 188, 0, 187, 181,
+ 188, 0, 188, 182, 188, 0, 191, 107, 186, 108,
+ 0, 107, 186, 108, 0, 192, 0, 193, 0, 192,
+ 190, 192, 0, 63, 190, 192, 0, 192, 190, 62,
+ 0, 63, 190, 62, 0, 199, 0, 194, 0, 0,
+ 33, 27, 105, 189, 175, 0, 103, 0, 103, 114,
+ 0, 114, 103, 0, 114, 103, 114, 0, 82, 0,
+ 48, 0, 47, 0, 88, 0, 210, 0, 174, 0,
+ 219, 0, 216, 0, 97, 31, 185, 0, 97, 32,
+ 105, 195, 106, 0, 196, 0, 195, 110, 196, 0,
+ 104, 0, 219, 183, 197, 0, 0, 198, 0, 75,
+ 0, 17, 0, 71, 0, 200, 0, 201, 0, 105,
+ 216, 106, 0, 200, 105, 202, 106, 0, 203, 0,
+ 202, 110, 203, 0, 115, 204, 0, 115, 113, 204,
+ 0, 219, 0, 204, 113, 219, 0, 0, 206, 0,
+ 71, 0, 35, 171, 0, 105, 106, 0, 105, 208,
+ 106, 0, 209, 0, 208, 110, 209, 0, 219, 0,
+ 219, 107, 210, 108, 0, 219, 107, 173, 108, 0,
+ 210, 0, 104, 0, 9, 0, 12, 0, 0, 212,
+ 0, 213, 215, 0, 116, 214, 9, 117, 0, 0,
+ 91, 0, 21, 0, 77, 0, 0, 54, 0, 43,
+ 0, 13, 0, 14, 0, 14, 0, 0, 219, 0,
+ 8, 0
};
#endif
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 305, 311, 317, 333, 358, 360, 363, 367, 372, 379,
- 387, 392, 396, 405, 407, 415, 419, 427, 431, 434,
- 437, 441, 461, 463, 471, 475, 507, 511, 520, 527,
- 540, 547, 549, 561, 574, 581, 586, 592, 598, 607,
- 613, 619, 626, 632, 640, 644, 647, 654, 660, 666,
- 673, 679, 688, 698, 706, 714, 716, 726, 729, 733,
- 736, 748, 760, 766, 782, 791, 801, 811, 816, 823,
- 830, 840, 846, 852, 856, 879, 881, 883, 889, 895,
- 902, 909, 914, 920, 926, 932, 937, 947, 949, 952,
- 960, 966, 975, 981, 998, 1000, 1005, 1009, 1014, 1019,
- 1025, 1029, 1040, 1049, 1058, 1069, 1091, 1095, 1101, 1107,
- 1113, 1123, 1133, 1139, 1153, 1177, 1184, 1198, 1207, 1217,
- 1227, 1237, 1245, 1266, 1275, 1284, 1285, 1287, 1294, 1306,
- 1316, 1324, 1324, 1329, 1334, 1339, 1344, 1348, 1352, 1355,
- 1358, 1363, 1375, 1392, 1397, 1402, 1435, 1445, 1459, 1461,
- 1462, 1463, 1464, 1465, 1466, 1467, 1468, 1469, 1470, 1471,
- 1472, 1478, 1480, 1481, 1484, 1491, 1503, 1505, 1509, 1513,
- 1514, 1515, 1516, 1517, 1521, 1522, 1523, 1524, 1528, 1529,
- 1536, 1536, 1537, 1537, 1538, 1540, 1542, 1547, 1551, 1560,
- 1564, 1569, 1573, 1579, 1589, 1593, 1596, 1599, 1602, 1607,
- 1616, 1624, 1630, 1636, 1643, 1651, 1659, 1668, 1671, 1674,
- 1675, 1685, 1687, 1688, 1689, 1692, 1696, 1701, 1707, 1712,
- 1715, 1718, 1731, 1745, 1749, 1754, 1758, 1763, 1770, 1783,
- 1785, 1788, 1792, 1795, 1800, 1804, 1812, 1827, 1833, 1840,
- 1853, 1865, 1880, 1884, 1901, 1906, 1909, 1914, 1936, 1941,
- 1946, 1952, 1958, 1966, 1974, 1982, 1989, 1999, 2004, 2034,
- 2036, 2039, 2046, 2052, 2054, 2055, 2056, 2059, 2061, 2062,
- 2065, 2070, 2077, 2084, 2086, 2090
+ 302, 308, 314, 330, 355, 357, 360, 364, 369, 376,
+ 384, 389, 393, 402, 404, 412, 416, 424, 428, 431,
+ 434, 438, 458, 460, 468, 472, 504, 508, 517, 524,
+ 537, 544, 546, 558, 571, 578, 583, 589, 595, 604,
+ 610, 616, 623, 629, 637, 641, 644, 651, 657, 663,
+ 670, 676, 685, 687, 696, 704, 718, 730, 736, 752,
+ 761, 771, 781, 786, 793, 800, 810, 816, 822, 826,
+ 849, 851, 853, 859, 865, 872, 879, 884, 890, 896,
+ 902, 907, 917, 919, 922, 930, 936, 945, 951, 968,
+ 970, 975, 979, 984, 989, 995, 999, 1010, 1019, 1028,
+ 1039, 1061, 1065, 1071, 1077, 1083, 1093, 1103, 1109, 1123,
+ 1147, 1154, 1168, 1177, 1187, 1197, 1207, 1215, 1236, 1245,
+ 1254, 1255, 1257, 1264, 1276, 1286, 1294, 1294, 1299, 1304,
+ 1309, 1314, 1318, 1322, 1325, 1328, 1333, 1345, 1362, 1367,
+ 1372, 1405, 1415, 1429, 1431, 1432, 1433, 1434, 1435, 1436,
+ 1437, 1438, 1439, 1440, 1441, 1442, 1448, 1450, 1451, 1454,
+ 1461, 1473, 1475, 1479, 1483, 1484, 1485, 1486, 1487, 1491,
+ 1492, 1493, 1494, 1498, 1499, 1506, 1506, 1507, 1507, 1508,
+ 1510, 1512, 1517, 1521, 1530, 1534, 1539, 1543, 1549, 1559,
+ 1563, 1566, 1569, 1572, 1577, 1586, 1594, 1600, 1606, 1613,
+ 1621, 1629, 1638, 1641, 1644, 1645, 1655, 1657, 1658, 1659,
+ 1662, 1666, 1671, 1677, 1682, 1685, 1688, 1701, 1715, 1719,
+ 1724, 1728, 1733, 1740, 1753, 1755, 1758, 1762, 1765, 1770,
+ 1774, 1782, 1797, 1803, 1810, 1823, 1835, 1850, 1854, 1871,
+ 1876, 1879, 1884, 1906, 1911, 1916, 1922, 1928, 1936, 1944,
+ 1952, 1959, 1969, 1974, 2004, 2006, 2009, 2016, 2022, 2024,
+ 2025, 2026, 2029, 2031, 2032, 2035, 2040, 2047, 2054, 2056,
+ 2060
};
#endif
@@ -428,17 +427,17 @@ static const char * const yytname[] = { "$","error","$undefined.","TOK_PPEQ",
"ModuleSpecificationFlag","optModuleSpecificationBody","ModuleSpecificationBody",
"ModuleSpecificationElement","@1","ImportsDefinition","ImportsBundleSet","ImportsBundle",
"ImportsList","ImportsElement","ExportsDefinition","ExportsBody","ExportsElement",
-"ValueSetDefinition","DefinedTypeRef","optValueSetBody","ValueSetBody","ValueSetElement",
-"DataTypeReference","ParameterArgumentList","ParameterArgumentName","ActualParameterList",
-"ActualParameter","optComponentTypeLists","ComponentTypeLists","ComponentType",
-"AlternativeTypeLists","AlternativeType","ClassDeclaration","optUnique","ClassFieldList",
-"ClassField","optWithSyntax","WithSyntax","@2","WithSyntaxFormat","WithSyntaxFormatToken",
-"ExtensionAndException","Type","TypeDeclaration","ComplexTypeReference","ComplexTypeReferenceAmpList",
+"ValueSetDefinition","@2","DefinedTypeRef","DataTypeReference","ParameterArgumentList",
+"ParameterArgumentName","ActualParameterList","ActualParameter","optComponentTypeLists",
+"ComponentTypeLists","ComponentType","AlternativeTypeLists","AlternativeType",
+"ClassDeclaration","optUnique","ClassFieldList","ClassField","optWithSyntax",
+"WithSyntax","@3","WithSyntaxFormat","WithSyntaxFormatToken","ExtensionAndException",
+"Type","TypeDeclaration","ComplexTypeReference","ComplexTypeReferenceAmpList",
"ComplexTypeReferenceElement","ClassFieldIdentifier","ClassFieldName","ValueDefinition",
-"Value","@3","DefinedValue","RestrictedCharacterStringValue","Opaque","BasicTypeId",
+"Value","@4","DefinedValue","RestrictedCharacterStringValue","Opaque","BasicTypeId",
"BasicTypeId_UniverationCompatible","BasicType","BasicString","Union","Intersection",
"Except","optConstraints","Constraints","SetOfConstraints","ElementSetSpecs",
-"ElementSetSpec","ConstraintSubtypeElement","@4","ConstraintRangeSpec","ConstraintSpec",
+"ElementSetSpec","ConstraintSubtypeElement","@5","ConstraintRangeSpec","ConstraintSpec",
"SingleValue","ContainedSubtype","InnerTypeConstraint","WithComponentsList",
"WithComponentsElement","optPresenceConstraint","PresenceConstraint","TableConstraint",
"SimpleTableConstraint","ComponentRelationConstraint","AtNotationList","AtNotationElement",
@@ -454,29 +453,29 @@ static const short yyr1[] = { 0,
127, 127, 128, 128, 129, 129, 130, 130, 130, 130,
130, 131, 130, 130, 132, 132, 133, 133, 134, 135,
135, 136, 136, 136, 137, 137, 137, 138, 138, 139,
- 139, 139, 140, 141, 141, 142, 142, 143, 143, 144,
- 144, 145, 145, 145, 145, 146, 146, 147, 147, 147,
- 147, 148, 148, 149, 149, 150, 150, 151, 151, 152,
- 152, 152, 153, 153, 154, 154, 155, 156, 156, 157,
- 157, 158, 158, 158, 159, 159, 161, 160, 162, 162,
- 163, 163, 164, 164, 164, 165, 166, 166, 166, 166,
- 166, 166, 166, 166, 166, 166, 166, 167, 167, 167,
- 167, 167, 167, 168, 168, 169, 170, 171, 171, 172,
- 173, 174, 173, 173, 173, 173, 173, 173, 173, 173,
- 173, 175, 175, 176, 176, 176, 177, 177, 178, 178,
- 178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
- 178, 179, 179, 179, 180, 180, 181, 181, 181, 181,
- 181, 181, 181, 181, 181, 181, 181, 181, 181, 181,
- 182, 182, 183, 183, 184, 185, 185, 186, 186, 187,
- 187, 188, 188, 188, 189, 189, 189, 189, 189, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 191,
- 190, 192, 192, 192, 192, 193, 193, 194, 194, 194,
- 194, 194, 195, 196, 196, 197, 197, 198, 198, 199,
- 199, 200, 200, 200, 201, 201, 202, 203, 204, 204,
- 205, 205, 206, 206, 207, 207, 208, 208, 209, 209,
- 210, 210, 211, 211, 211, 211, 211, 212, 212, 213,
- 213, 214, 215, 216, 216, 216, 216, 217, 217, 217,
- 218, 218, 219, 220, 220, 221
+ 139, 139, 141, 140, 142, 142, 143, 143, 143, 143,
+ 144, 144, 145, 145, 145, 145, 146, 146, 147, 147,
+ 148, 148, 149, 149, 150, 150, 150, 151, 151, 152,
+ 152, 153, 154, 154, 155, 155, 156, 156, 156, 157,
+ 157, 159, 158, 160, 160, 161, 161, 162, 162, 162,
+ 163, 164, 164, 164, 164, 164, 164, 164, 164, 164,
+ 164, 164, 165, 165, 165, 165, 165, 165, 166, 166,
+ 167, 168, 169, 169, 170, 171, 172, 171, 171, 171,
+ 171, 171, 171, 171, 171, 171, 173, 173, 174, 174,
+ 174, 175, 175, 176, 176, 176, 176, 176, 176, 176,
+ 176, 176, 176, 176, 176, 176, 177, 177, 177, 178,
+ 178, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 180, 180, 181, 181, 182,
+ 183, 183, 184, 184, 185, 185, 186, 186, 186, 187,
+ 187, 187, 187, 187, 188, 188, 188, 188, 188, 188,
+ 188, 188, 188, 188, 189, 188, 190, 190, 190, 190,
+ 191, 191, 192, 192, 192, 192, 192, 193, 194, 194,
+ 195, 195, 196, 196, 197, 197, 198, 198, 198, 199,
+ 199, 200, 201, 202, 202, 203, 203, 204, 204, 205,
+ 205, 206, 206, 207, 207, 208, 208, 209, 209, 209,
+ 209, 209, 210, 210, 211, 211, 212, 213, 214, 214,
+ 214, 214, 215, 215, 215, 216, 216, 217, 218, 218,
+ 219
};
static const short yyr2[] = { 0,
@@ -485,343 +484,325 @@ static const short yyr2[] = { 0,
2, 2, 0, 1, 1, 2, 1, 1, 1, 1,
1, 0, 3, 1, 3, 2, 1, 2, 4, 1,
3, 1, 3, 1, 3, 3, 2, 1, 3, 1,
- 3, 1, 6, 1, 1, 0, 1, 1, 3, 1,
- 1, 4, 3, 3, 6, 1, 3, 1, 3, 3,
- 3, 1, 3, 1, 1, 0, 1, 1, 3, 3,
- 3, 1, 1, 3, 2, 1, 5, 0, 1, 1,
- 3, 2, 4, 4, 0, 1, 0, 6, 1, 2,
- 1, 1, 1, 3, 3, 3, 1, 4, 4, 4,
- 6, 6, 1, 4, 4, 1, 3, 1, 3, 3,
- 3, 1, 3, 1, 3, 1, 1, 1, 1, 4,
- 3, 0, 3, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 3, 1, 1, 1, 1, 2, 1, 1,
- 1, 1, 2, 2, 1, 1, 2, 2, 1, 1,
- 1, 1, 1, 2, 1, 2, 1, 1, 1, 1,
+ 3, 1, 0, 6, 1, 1, 4, 3, 3, 6,
+ 1, 3, 1, 3, 3, 3, 1, 3, 1, 1,
+ 0, 1, 1, 3, 3, 3, 1, 1, 3, 2,
+ 1, 5, 0, 1, 1, 3, 2, 4, 4, 0,
+ 1, 0, 6, 1, 2, 1, 1, 1, 3, 3,
+ 3, 1, 4, 4, 4, 6, 6, 1, 4, 4,
+ 1, 3, 1, 3, 3, 3, 1, 3, 1, 3,
+ 1, 1, 1, 1, 4, 3, 0, 3, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 3, 1, 1,
+ 1, 1, 2, 1, 1, 1, 1, 2, 2, 1,
+ 1, 2, 2, 1, 1, 1, 1, 1, 2, 1,
+ 2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 0, 1, 1, 4, 3,
- 4, 1, 3, 5, 1, 3, 3, 3, 3, 4,
- 3, 1, 1, 3, 3, 3, 3, 1, 1, 0,
- 5, 1, 2, 2, 3, 1, 1, 1, 1, 1,
- 1, 1, 1, 3, 5, 1, 3, 1, 3, 0,
- 1, 1, 1, 1, 1, 1, 3, 4, 1, 3,
- 2, 3, 1, 3, 0, 1, 1, 2, 2, 3,
- 1, 3, 1, 4, 4, 1, 1, 1, 1, 0,
- 1, 2, 4, 0, 1, 1, 1, 0, 1, 1,
- 1, 1, 1, 0, 1, 1
+ 0, 1, 1, 4, 3, 4, 1, 3, 5, 1,
+ 3, 3, 3, 3, 4, 3, 1, 1, 3, 3,
+ 3, 3, 1, 1, 0, 5, 1, 2, 2, 3,
+ 1, 1, 1, 1, 1, 1, 1, 1, 3, 5,
+ 1, 3, 1, 3, 0, 1, 1, 1, 1, 1,
+ 1, 3, 4, 1, 3, 2, 3, 1, 3, 0,
+ 1, 1, 2, 2, 3, 1, 3, 1, 4, 4,
+ 1, 1, 1, 1, 0, 1, 2, 4, 0, 1,
+ 1, 1, 0, 1, 1, 1, 1, 1, 0, 1,
+ 1
};
static const short yydefact[] = { 0,
- 271, 272, 1, 2, 5, 3, 0, 0, 6, 276,
+ 266, 267, 1, 2, 5, 3, 0, 0, 6, 271,
13, 8, 0, 9, 11, 14, 7, 10, 0, 0,
0, 0, 0, 0, 0, 15, 16, 0, 22, 20,
- 18, 21, 19, 0, 17, 12, 23, 167, 0, 0,
- 168, 169, 170, 0, 171, 172, 180, 173, 174, 175,
- 176, 177, 178, 179, 0, 24, 25, 27, 28, 31,
+ 18, 21, 19, 0, 17, 12, 23, 162, 0, 0,
+ 163, 164, 165, 0, 166, 167, 175, 168, 169, 170,
+ 171, 172, 173, 174, 0, 24, 25, 27, 28, 31,
29, 30, 34, 0, 0, 32, 0, 47, 0, 48,
50, 52, 36, 0, 37, 0, 40, 42, 44, 4,
- 26, 260, 118, 273, 0, 149, 0, 0, 163, 156,
- 160, 162, 150, 0, 0, 151, 155, 159, 0, 0,
- 54, 55, 152, 161, 122, 0, 33, 46, 45, 0,
- 0, 35, 38, 0, 0, 0, 0, 264, 64, 63,
- 0, 261, 268, 0, 164, 158, 157, 154, 153, 0,
- 66, 0, 68, 0, 0, 0, 49, 51, 5, 41,
- 43, 0, 266, 267, 265, 0, 118, 273, 113, 0,
- 0, 186, 186, 62, 186, 116, 165, 152, 107, 0,
- 270, 269, 262, 119, 121, 0, 0, 0, 0, 56,
- 128, 129, 123, 124, 126, 120, 137, 144, 138, 258,
- 145, 146, 259, 135, 134, 136, 132, 130, 141, 139,
- 140, 0, 142, 39, 0, 90, 260, 127, 0, 0,
- 0, 0, 0, 76, 0, 0, 187, 188, 76, 0,
- 106, 0, 166, 260, 260, 67, 71, 70, 69, 0,
- 0, 218, 217, 0, 216, 219, 0, 60, 0, 0,
- 0, 57, 58, 221, 61, 195, 0, 202, 203, 209,
- 208, 235, 236, 220, 223, 222, 0, 0, 0, 0,
- 95, 0, 0, 247, 88, 88, 92, 246, 0, 263,
- 0, 103, 0, 83, 86, 260, 117, 0, 0, 0,
- 77, 78, 82, 260, 0, 192, 274, 0, 0, 274,
- 257, 249, 0, 251, 256, 253, 0, 72, 74, 75,
- 65, 0, 0, 212, 0, 0, 0, 0, 0, 0,
- 53, 0, 183, 184, 181, 182, 0, 0, 185, 0,
- 0, 0, 0, 125, 147, 133, 143, 131, 0, 87,
- 96, 91, 248, 89, 245, 245, 114, 0, 108, 0,
- 85, 0, 260, 109, 0, 245, 190, 0, 260, 275,
- 0, 110, 260, 250, 0, 0, 115, 260, 196, 210,
- 213, 214, 207, 205, 224, 0, 237, 201, 59, 197,
- 198, 199, 0, 206, 204, 0, 0, 239, 148, 0,
- 93, 94, 104, 105, 142, 84, 189, 81, 79, 80,
- 193, 0, 191, 0, 252, 0, 0, 73, 0, 215,
- 228, 0, 226, 186, 200, 0, 241, 243, 238, 0,
- 97, 0, 111, 112, 255, 254, 211, 225, 0, 230,
- 242, 0, 240, 0, 194, 227, 233, 234, 232, 229,
- 231, 244, 101, 0, 99, 102, 98, 100, 0, 0,
- 0
+ 26, 255, 113, 268, 0, 144, 0, 0, 158, 151,
+ 155, 157, 145, 0, 0, 146, 150, 154, 0, 0,
+ 55, 56, 147, 156, 117, 0, 33, 46, 45, 0,
+ 0, 35, 38, 0, 0, 0, 0, 259, 59, 58,
+ 0, 256, 263, 0, 159, 153, 152, 149, 148, 0,
+ 61, 0, 63, 0, 0, 0, 49, 51, 5, 41,
+ 43, 0, 261, 262, 260, 0, 113, 268, 108, 0,
+ 0, 181, 181, 57, 181, 111, 160, 147, 102, 0,
+ 265, 264, 257, 114, 116, 0, 0, 0, 0, 53,
+ 123, 124, 118, 119, 121, 115, 132, 139, 133, 253,
+ 140, 141, 254, 130, 129, 131, 127, 125, 136, 134,
+ 135, 0, 137, 39, 0, 85, 255, 122, 0, 0,
+ 0, 0, 0, 71, 0, 0, 182, 183, 71, 0,
+ 101, 0, 161, 255, 255, 62, 66, 65, 64, 0,
+ 0, 0, 0, 0, 90, 0, 0, 242, 83, 83,
+ 87, 241, 0, 258, 0, 98, 0, 78, 81, 255,
+ 112, 0, 0, 0, 72, 73, 77, 255, 0, 0,
+ 213, 212, 0, 211, 214, 0, 0, 0, 216, 0,
+ 187, 190, 0, 197, 198, 204, 203, 230, 231, 215,
+ 218, 217, 269, 0, 0, 269, 252, 244, 0, 246,
+ 251, 248, 0, 67, 69, 70, 60, 142, 54, 120,
+ 128, 138, 126, 0, 82, 91, 86, 243, 84, 240,
+ 240, 109, 0, 103, 0, 80, 0, 255, 104, 0,
+ 240, 0, 0, 207, 0, 0, 0, 0, 0, 0,
+ 185, 178, 179, 176, 177, 0, 0, 0, 180, 0,
+ 0, 0, 0, 255, 270, 0, 105, 255, 245, 0,
+ 0, 110, 255, 143, 0, 88, 89, 99, 100, 137,
+ 79, 184, 76, 74, 75, 191, 205, 208, 209, 202,
+ 200, 219, 0, 232, 196, 188, 192, 193, 194, 0,
+ 201, 199, 0, 0, 234, 0, 186, 0, 247, 0,
+ 0, 68, 92, 0, 210, 223, 0, 221, 181, 0,
+ 195, 0, 236, 238, 233, 0, 106, 107, 250, 249,
+ 0, 206, 220, 0, 225, 189, 237, 0, 235, 96,
+ 0, 94, 97, 222, 228, 229, 227, 224, 226, 239,
+ 93, 95, 0, 0, 0
};
-static const short yydefgoto[] = { 429,
+static const short yydefgoto[] = { 423,
3, 4, 8, 9, 13, 14, 25, 26, 27, 55,
56, 57, 107, 58, 74, 75, 76, 77, 59, 69,
- 70, 60, 100, 231, 232, 233, 61, 130, 131, 287,
- 288, 270, 271, 272, 263, 264, 119, 325, 195, 196,
- 320, 321, 414, 424, 425, 273, 289, 155, 156, 173,
- 174, 197, 198, 62, 188, 248, 189, 234, 316, 157,
- 103, 159, 104, 307, 308, 310, 206, 207, 208, 275,
- 276, 236, 389, 296, 237, 238, 239, 240, 392, 393,
- 420, 421, 241, 242, 243, 367, 368, 397, 257, 258,
- 213, 283, 284, 244, 259, 122, 123, 146, 163, 245,
- 105, 339, 246
+ 70, 60, 220, 100, 61, 130, 131, 283, 284, 244,
+ 245, 246, 237, 238, 119, 300, 195, 196, 295, 296,
+ 401, 411, 412, 247, 285, 155, 156, 173, 174, 197,
+ 198, 62, 188, 222, 189, 259, 289, 157, 103, 159,
+ 104, 327, 328, 330, 206, 207, 208, 260, 261, 262,
+ 384, 316, 263, 264, 265, 266, 387, 388, 418, 419,
+ 267, 268, 269, 374, 375, 393, 231, 232, 213, 279,
+ 280, 270, 233, 122, 123, 146, 163, 271, 105, 334,
+ 272
};
-static const short yypact[] = { 166,
--32768,-32768, 166,-32768, -69,-32768, 32, 14,-32768,-32768,
--32768,-32768, 60,-32768, -62, 132,-32768,-32768, 55, 42,
- -13, 58, 65, 64, 125, 132,-32768, 96,-32768,-32768,
--32768,-32768,-32768, 135,-32768,-32768, 507,-32768, 158, 9,
--32768,-32768,-32768, 38,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768, 122, 507,-32768,-32768,-32768,-32768,
--32768,-32768,-32768, 357, 736,-32768, 100,-32768, 80,-32768,
- 146,-32768,-32768, 34,-32768, -17,-32768, 147,-32768,-32768,
--32768, -4, 140,-32768, 178,-32768, 184, 159,-32768,-32768,
--32768,-32768,-32768, 215, 188,-32768,-32768,-32768, 811, 269,
--32768,-32768,-32768,-32768, 170, 282,-32768,-32768,-32768, 168,
- 180,-32768,-32768, 166, 168, 182, 186, 8,-32768,-32768,
- 584,-32768, 44, 168,-32768,-32768,-32768,-32768,-32768, -10,
--32768, 189, 191, 198, 225, 465,-32768,-32768, -69,-32768,
--32768, 204,-32768,-32768,-32768, 280, -8, 199, 256, 200,
- 238, -25, -24,-32768, -44,-32768,-32768, 205,-32768, 206,
--32768,-32768,-32768,-32768,-32768, 309, 811, 305, 168, 202,
--32768,-32768, 201,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+static const short yypact[] = { 228,
+-32768,-32768, 228,-32768, -83,-32768, 30, 43,-32768,-32768,
+-32768,-32768, 36,-32768, -14, 181,-32768,-32768, 132, 85,
+ 68, 73, 109, 95, 193, 181,-32768, 93,-32768,-32768,
+-32768,-32768,-32768, 189,-32768,-32768, 429,-32768, 209, 21,
+-32768,-32768,-32768, 144,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768, 184, 429,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768, 354, 658,-32768, 118,-32768, 190,-32768,
+ 134,-32768,-32768, 18,-32768, -27,-32768, 156,-32768,-32768,
+-32768, -12, 150,-32768, 182,-32768, 204, 195,-32768,-32768,
+-32768,-32768,-32768, 236, 212,-32768,-32768,-32768, 733, 299,
+-32768,-32768,-32768,-32768, 205, 316,-32768,-32768,-32768, 185,
+ 216,-32768,-32768, 228, 185, 217, 219, 25,-32768,-32768,
+ 506,-32768, 117, 185,-32768,-32768,-32768,-32768,-32768, -55,
+-32768, 210, 214, 223, 266, 63,-32768,-32768, -83,-32768,
+-32768, 268,-32768,-32768,-32768, 321, 34, 226, 295, 232,
+ 269, -18, -17,-32768, -2,-32768,-32768, 233,-32768, 235,
+-32768,-32768,-32768,-32768,-32768, 338, 733, 334, 185,-32768,
+-32768,-32768, 234,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 207, 208,-32768, 50,-32768, 39,-32768, 209, 290,
- 12, 217, 211, 7, 268, 252,-32768, 218, 7, 254,
--32768, 53,-32768, 5, 213,-32768,-32768,-32768,-32768, 229,
- 303,-32768,-32768, -1,-32768,-32768, 216,-32768, 166, 268,
- 226, 224,-32768,-32768, 156, 237, 230, -1,-32768,-32768,
--32768, 231,-32768,-32768,-32768,-32768, 204, 336, 305, 465,
- 245, 204, 465,-32768, 253, 253,-32768,-32768, 661,-32768,
- 305, 233, 81,-32768,-32768, 213,-32768, 268, 276, 241,
- 242,-32768,-32768, 213, 243, 68, 305, 268, 247, 305,
--32768,-32768, 82,-32768,-32768, 248, 89,-32768,-32768,-32768,
--32768, 455, 249, 244, 258, 286, 250, 259, 257, 260,
--32768, 202,-32768,-32768,-32768,-32768, 455, 455,-32768, 455,
- 268, 448, 251,-32768,-32768, 363,-32768,-32768, 285,-32768,
--32768,-32768,-32768,-32768, 0, 0,-32768, 214,-32768, 12,
--32768, 264, 213,-32768, 7, 0,-32768, 272, 213,-32768,
- 270,-32768, 213,-32768, 67, 214,-32768, 5,-32768,-32768,
--32768, 263,-32768,-32768, 218, 19,-32768,-32768,-32768,-32768,
--32768,-32768, 271,-32768,-32768, 6, 119,-32768,-32768, 275,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- 274, 661,-32768, 661,-32768, 278, 279,-32768, 336,-32768,
--32768, 127,-32768, -44,-32768, 305, 277,-32768,-32768, 251,
--32768, 268,-32768,-32768,-32768,-32768, 363,-32768, 19, 17,
- 277, 305,-32768, 149, 156,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768, 28,-32768,-32768,-32768,-32768, 388, 391,
--32768
+-32768, 237, 242,-32768, 81,-32768, 27,-32768, 231, 322,
+ 11, 240, 247, 49, 238, 285,-32768, 251, 49, 289,
+-32768, 44,-32768, 7, 244,-32768,-32768,-32768,-32768, 358,
+ 268, 358, 334, 63, 267, 268, 63,-32768, 273, 273,
+-32768,-32768, 583,-32768, 334, 253, 98,-32768,-32768, 244,
+-32768, 238, 302, 270, 263,-32768,-32768, 244, 276, 348,
+-32768,-32768, 64,-32768,-32768, 275, 228, 238,-32768, 279,
+ 130, 283, 277, 64,-32768,-32768,-32768, 272,-32768,-32768,
+-32768,-32768, 334, 238, 284, 334,-32768,-32768, 100,-32768,
+-32768, 286, 105,-32768,-32768,-32768,-32768,-32768, 379,-32768,
+ 379,-32768,-32768, 305,-32768,-32768,-32768,-32768,-32768, -10,
+ -10,-32768, 296,-32768, 11,-32768, 287, 244,-32768, 49,
+ -10, 264, 293, 280, 288, 174, 292, 297, 301, 300,
+-32768,-32768,-32768,-32768,-32768, 306, 264, 264,-32768, 264,
+ 238, 282, 294, 244,-32768, 303,-32768, 244,-32768, 51,
+ 296,-32768, 7,-32768, 307,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 304,-32768,
+-32768, 251, 28,-32768,-32768, 314,-32768,-32768,-32768, 308,
+-32768,-32768, 6, 112,-32768, 583,-32768, 583,-32768, 309,
+ 317,-32768,-32768, 358,-32768,-32768, 154,-32768, -2, 238,
+-32768, 334, 313,-32768,-32768, 294,-32768,-32768,-32768,-32768,
+ 159, 379,-32768, 28, 24, 215, 313, 334,-32768,-32768,
+ 12,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768, 413, 427,-32768
};
static const short yypgoto[] = {-32768,
--32768, 389, 255,-32768,-32768, 380,-32768,-32768, 370,-32768,
--32768, 341,-32768,-32768,-32768, 327,-32768, 289,-32768,-32768,
- 300,-32768, 346,-32768,-32768, 110,-32768,-32768, 246,-32768,
- 66, 210,-32768, 85,-32768, 86,-32768, 165,-32768, 163,
--32768,-32768,-32768,-32768, 3, -189, -73, -186, -54,-32768,
- 181, -190, -114,-32768, -47,-32768, -251, -118, 40, -40,
- -120,-32768, 33,-32768,-32768,-32768, -150,-32768, 133, -164,
- -166, -201,-32768, 193,-32768, -218,-32768,-32768,-32768, 23,
--32768,-32768,-32768,-32768,-32768,-32768, 37, 43, -152,-32768,
--32768,-32768, 93, -128, -80,-32768,-32768,-32768,-32768, 16,
--32768, 154, -7
+-32768, 425, 290,-32768,-32768, 418,-32768,-32768, 408,-32768,
+-32768, 380,-32768,-32768,-32768, 361,-32768, 323,-32768,-32768,
+ 330,-32768,-32768, 386,-32768,-32768, 278,-32768, 101, 243,
+-32768, 143,-32768, 151,-32768, 225,-32768, 239,-32768,-32768,
+-32768,-32768, 46, -184, -75, -284, -53,-32768, 241, -192,
+ -115,-32768, -89,-32768, -255, -58, -214, -41, -120,-32768,
+ 45,-32768,-32768,-32768, -151,-32768, 141, -86, 70, -216,
+-32768, 197,-32768, -225,-32768,-32768,-32768, 59,-32768,-32768,
+-32768,-32768,-32768,-32768, 71, 72, -111,-32768,-32768,-32768,
+ 126, -127, -79,-32768,-32768,-32768,-32768, 10,-32768, 192,
+ -7
};
-#define YYLAST 907
+#define YYLAST 829
static const short yytable[] = { 15,
- 158, 121, 210, 235, 211, 15, 256, 191, 120, 101,
- 101, 265, 10, 10, 10, 5, 10, 190, 5, 10,
- 175, 1, 2, 102, 102, 117, 10, 67, 143, 65,
- 114, 423, 72, 417, 253, 7, 79, 203, 269, 10,
- 11, 10, 171, 172, 19, 10, 1, 2, 65, 16,
- 1, 2, 64, 171, 172, 71, 203, 203, 132, 78,
- 10, 180, 205, 28, 183, 300, 79, 10, 11, 63,
- 254, 64, 30, 253, 10, 180, 373, 354, 183, 204,
- 209, 205, 205, 285, 144, 73, 161, 418, 63, 78,
- 349, 419, 115, 365, 386, 166, -271, 162, 145, 167,
- 29, 294, 72, 332, 124, 360, 361, 79, 362, 254,
- 262, 118, 295, 341, 133, 262, 165, 68, 396, 32,
- 118, 191, 391, 255, 191, 71, 132, 34, 193, 139,
- 78, 190, 175, 427, 190, 235, 160, 12, 158, 164,
- 265, 291, 112, 31, -245, 20, 363, 267, -245, 33,
- 176, 192, 423, 21, 118, 251, 281, 37, 282, 252,
- 217, 219, 80, 171, 172, 17, 303, 304, 305, 306,
- 281, 66, 371, 372, 22, 10, 23, 338, 1, 2,
- 1, 2, 133, 380, 218, 24, 329, 344, 109, 110,
- 330, 345, 331, 266, 347, 403, 274, 404, 348, 374,
- 336, 274, 318, 36, 286, 323, 290, 178, 108, 10,
- 180, 181, 182, 183, 1, 2, 285, 387, 171, 172,
- 220, 10, 180, 426, 399, 183, 1, 2, 400, 83,
- 84, 127, 408, 426, 221, 415, 409, 1, 2, 171,
- 172, 317, 193, 410, 299, 193, 297, 298, 222, 223,
- 111, 116, 124, 327, 303, 304, 305, 306, 382, 378,
- 125, 158, 384, 158, 224, 192, 126, 128, 192, 340,
- 129, 134, 340, 178, 160, 10, 180, 181, 182, 183,
- 1, 2, 135, 225, 136, 138, 220, 141, 199, 226,
- 142, 178, 200, 10, 180, 181, 182, 183, 227, 168,
- 221, 169, 170, -272, 201, 228, 229, 202, 230, 212,
- 214, 215, 10, 247, 222, 223, 261, 268, 250, 249,
- 375, 277, 266, 280, 278, 260, 292, 274, 118, 293,
- 224, 301, 222, 302, 309, 313, 311, 286, 375, 315,
- 290, 319, 324, 192, 328, 333, 334, 353, 394, 225,
- 337, 335, 342, 350, 346, 226, 205, 351, 398, 82,
- 352, 192, 357, 356, 227, 366, 369, 358, 370, 83,
- 84, 377, 229, 226, 230, 381, 390, 383, 395, 401,
- 85, 38, 86, 402, 87, 405, 406, 430, 398, 412,
- 431, 6, 18, 194, 88, 35, 81, 160, 89, 160,
- 113, 394, 90, 140, 422, 91, 41, 42, 43, 137,
- 106, 359, 216, 388, 322, 376, 92, 45, 279, 379,
- 326, 93, 46, 94, 47, 95, 428, 314, 407, 355,
- 312, 416, 48, 343, 96, 97, 413, 385, 411, 0,
- 0, 49, 0, 50, 0, 0, 0, 0, 51, 98,
- 52, 53, 54, 178, 0, 10, 180, 181, 182, 183,
- 178, 99, 10, 180, 181, 182, 183, 1, 2, 177,
- 178, 179, 10, 180, 181, 182, 183, 1, 2, 0,
- 0, 0, 0, 0, 0, 0, 0, 221, 0, 0,
- 0, 0, 0, 0, 222, 0, 0, 0, 0, 0,
- 0, 222, 223, 0, 0, 0, 0, 0, 0, 364,
- 0, 184, 0, 0, 10, 0, 0, 224, 0, 1,
- 2, 0, 0, 0, 0, 0, 0, 0, 0, 185,
- 0, 38, 0, 0, 0, 226, 225, 0, 0, 0,
- 0, 0, 226, 0, 0, 0, 39, 0, 0, 0,
- 40, 227, 186, 0, 0, 0, 41, 42, 43, 229,
- 0, 230, 44, 0, 0, 0, 0, 45, 0, 187,
- 0, 0, 46, 0, 47, 0, 0, 0, 0, 0,
- 0, 0, 48, 0, 0, 0, 0, 0, 0, 0,
- 0, 49, 0, 50, 0, 0, 147, 148, 51, 0,
- 52, 53, 54, 149, 0, 0, 0, 85, 38, 86,
- 0, 87, 150, 0, 0, 0, 0, 0, 0, 0,
- 0, 88, 0, 0, 0, 89, 0, 0, 0, 90,
- 0, 0, 91, 41, 42, 43, 0, 0, 0, 0,
- 0, 151, 0, 92, 45, 0, 0, 0, 93, 46,
- 94, 47, 95, 0, 0, 0, 0, 0, 0, 48,
- 0, 96, 97, 152, 153, 0, 0, 0, 49, 0,
- 50, 0, 154, 147, 148, 51, 98, 52, 53, 54,
- 149, 0, 0, 0, 85, 38, 86, 0, 87, 150,
- 0, 0, 0, 0, 0, 0, 0, 0, 88, 0,
- 0, 0, 89, 0, 0, 0, 90, 0, 0, 91,
- 41, 42, 43, 0, 0, 0, 0, 0, 151, 0,
- 92, 45, 0, 0, 0, 93, 46, 94, 47, 95,
- 0, 0, 0, 0, 0, 0, 48, 0, 96, 97,
- 152, 153, 0, 0, 0, 49, 0, 50, 83, 84,
- 0, 0, 51, 98, 52, 53, 54, 0, 0, 85,
- 38, 86, 0, 87, 0, 0, 0, 0, 0, 0,
+ 158, 210, 121, 211, 230, 15, 120, 291, 191, 5,
+ 101, 101, 5, 10, 10, 410, 239, 117, 10, 175,
+ 114, 7, 102, 102, 227, 10, 171, 172, 10, 65,
+ 1, 2, 72, 1, 2, 10, 79, 10, 11, 67,
+ 415, 171, 172, 10, 11, 143, 64, 348, 65, 71,
+ 166, 10, 180, 78, 167, 183, 10, 132, 10, 180,
+ 228, 227, 183, 203, 203, 64, 79, 177, 178, 179,
+ 10, 180, 181, 182, 183, 1, 2, 190, 16, 203,
+ 243, 63, 115, 78, 281, 380, 204, 209, 205, 205,
+ 361, 397, 19, 398, 416, 356, 191, 228, 417, 191,
+ 63, 144, 72, 118, 205, 175, 372, 79, 133, 184,
+ 367, 368, 158, 369, 236, 145, 165, 421, 392, 71,
+ 239, 229, 118, 139, 78, 132, 112, 185, 193, 68,
+ 160, 386, -240, 164, 293, 12, -240, 298, -266, 287,
+ 28, 17, 118, 29, 176, 192, 124, 277, 241, 278,
+ 186, 10, 236, 30, 277, 307, 1, 2, 31, 161,
+ 217, 219, 410, 32, 306, 190, 314, 187, 190, 402,
+ 162, 320, 311, 171, 172, 349, 133, 315, 218, 178,
+ 33, 10, 180, 181, 182, 183, 225, 336, 346, 347,
+ 226, 73, 10, 240, 20, 34, 248, 1, 2, 355,
+ 36, 248, 21, 304, 282, 339, 286, 305, 413, 340,
+ 342, 37, 281, 381, 343, 292, 193, 395, 413, 193,
+ 251, 396, 66, 22, 80, 23, 108, 302, 322, 323,
+ 324, 325, 353, 192, 24, 360, 192, 405, 111, 326,
+ 1, 2, 160, 178, 370, 10, 180, 181, 182, 183,
+ 1, 2, 83, 84, 376, 158, 249, 158, 378, 403,
+ 116, 255, 124, 404, 125, 335, 319, 127, 335, 178,
+ 250, 10, 180, 181, 182, 183, 1, 2, 1, 2,
+ 171, 172, 171, 172, 251, 252, 126, 178, 128, 10,
+ 180, 181, 182, 183, 129, 350, 250, 240, 109, 110,
+ 253, 134, 248, 10, 180, 317, 318, 183, 1, 2,
+ 251, 252, 192, 322, 323, 324, 325, 135, 136, 254,
+ 168, 138, 141, 142, 169, 255, 253, 170, 251, 199,
+ -267, 200, 282, 350, 256, 286, 201, 212, 202, 214,
+ 215, 10, 257, 371, 258, 254, 221, 234, 235, 223,
+ 192, 255, 224, 242, 273, 389, 82, 274, 276, 118,
+ 256, 288, 299, 294, 303, 394, 83, 84, 257, 255,
+ 258, 308, 310, 312, 313, 309, 333, 85, 38, 86,
+ 329, 87, 344, 331, 394, 160, 321, 160, 345, 337,
+ 359, 88, 341, 358, 352, 89, 389, 357, 205, 90,
+ 420, 363, 91, 41, 42, 43, 364, 365, 373, 366,
+ 377, 383, 424, 92, 45, 391, 399, 385, 93, 46,
+ 94, 47, 95, 390, 400, 408, 425, 6, 194, 48,
+ 18, 96, 97, 35, 113, 81, 10, 140, 49, 137,
+ 50, 1, 2, 382, 216, 51, 98, 52, 53, 54,
+ 106, 275, 354, 38, 301, 351, 422, 362, 99, 406,
+ 332, 290, 414, 407, 297, 379, 409, 338, 39, 0,
+ 0, 0, 40, 0, 0, 0, 0, 0, 41, 42,
+ 43, 0, 0, 0, 44, 0, 0, 0, 0, 45,
+ 0, 0, 0, 0, 46, 0, 47, 0, 0, 0,
+ 0, 0, 0, 0, 48, 0, 0, 0, 0, 0,
+ 0, 0, 0, 49, 0, 50, 0, 0, 147, 148,
+ 51, 0, 52, 53, 54, 149, 0, 0, 0, 85,
+ 38, 86, 0, 87, 150, 0, 0, 0, 0, 0,
0, 0, 0, 88, 0, 0, 0, 89, 0, 0,
0, 90, 0, 0, 91, 41, 42, 43, 0, 0,
- 0, 0, 0, 0, 0, 92, 45, 0, 0, 0,
+ 0, 0, 0, 151, 0, 92, 45, 0, 0, 0,
93, 46, 94, 47, 95, 0, 0, 0, 0, 0,
- 0, 48, 0, 96, 97, 0, 0, 0, 0, 0,
- 49, 0, 50, 1, 2, 0, 0, 51, 98, 52,
- 53, 54, 0, 0, 85, 38, 86, 0, 87, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 88, 0,
- 0, 0, 89, 0, 0, 0, 90, 0, 0, 91,
- 41, 42, 43, 0, 0, 0, 0, 0, 0, 0,
- 92, 45, 0, 0, 0, 93, 46, 94, 47, 95,
- 0, 0, 0, 0, 0, 0, 48, 0, 96, 97,
- 0, 0, 0, 0, 0, 49, 0, 50, 0, 0,
- 0, 0, 51, 98, 52, 53, 54
+ 0, 48, 0, 96, 97, 152, 153, 0, 0, 0,
+ 49, 0, 50, 0, 154, 147, 148, 51, 98, 52,
+ 53, 54, 149, 0, 0, 0, 85, 38, 86, 0,
+ 87, 150, 0, 0, 0, 0, 0, 0, 0, 0,
+ 88, 0, 0, 0, 89, 0, 0, 0, 90, 0,
+ 0, 91, 41, 42, 43, 0, 0, 0, 0, 0,
+ 151, 0, 92, 45, 0, 0, 0, 93, 46, 94,
+ 47, 95, 0, 0, 0, 0, 0, 0, 48, 0,
+ 96, 97, 152, 153, 0, 0, 0, 49, 0, 50,
+ 83, 84, 0, 0, 51, 98, 52, 53, 54, 0,
+ 0, 85, 38, 86, 0, 87, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 88, 0, 0, 0, 89,
+ 0, 0, 0, 90, 0, 0, 91, 41, 42, 43,
+ 0, 0, 0, 0, 0, 0, 0, 92, 45, 0,
+ 0, 0, 93, 46, 94, 47, 95, 0, 0, 0,
+ 0, 0, 0, 48, 0, 96, 97, 0, 0, 0,
+ 0, 0, 49, 0, 50, 1, 2, 0, 0, 51,
+ 98, 52, 53, 54, 0, 0, 85, 38, 86, 0,
+ 87, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 88, 0, 0, 0, 89, 0, 0, 0, 90, 0,
+ 0, 91, 41, 42, 43, 0, 0, 0, 0, 0,
+ 0, 0, 92, 45, 0, 0, 0, 93, 46, 94,
+ 47, 95, 0, 0, 0, 0, 0, 0, 48, 0,
+ 96, 97, 0, 0, 0, 0, 0, 49, 0, 50,
+ 0, 0, 0, 0, 51, 98, 52, 53, 54
};
static const short yycheck[] = { 7,
- 121, 82, 153, 170, 155, 13, 197, 136, 82, 64,
- 65, 201, 8, 8, 8, 0, 8, 136, 3, 8,
- 135, 13, 14, 64, 65, 30, 8, 19, 21, 37,
- 48, 4, 40, 17, 35, 105, 44, 82, 32, 8,
- 9, 8, 15, 16, 107, 8, 13, 14, 56, 36,
- 13, 14, 37, 15, 16, 40, 82, 82, 99, 44,
- 8, 9, 107, 9, 12, 230, 74, 8, 9, 37,
- 71, 56, 86, 35, 8, 9, 328, 296, 12, 105,
- 105, 107, 107, 212, 77, 48, 43, 71, 56, 74,
- 292, 75, 110, 312, 346, 106, 105, 54, 91, 110,
- 59, 103, 110, 268, 113, 307, 308, 115, 310, 71,
- 104, 116, 114, 278, 99, 104, 124, 109, 113, 55,
- 116, 250, 104, 197, 253, 110, 167, 3, 136, 114,
- 115, 250, 247, 106, 253, 302, 121, 106, 259, 124,
- 330, 215, 109, 86, 106, 14, 311, 202, 110, 86,
- 135, 136, 4, 22, 116, 106, 104, 23, 106, 110,
- 168, 169, 41, 15, 16, 106, 99, 100, 101, 102,
- 104, 14, 325, 326, 43, 8, 45, 110, 13, 14,
- 13, 14, 167, 336, 169, 54, 106, 106, 109, 110,
- 110, 110, 266, 201, 106, 382, 204, 384, 110, 328,
- 274, 209, 250, 108, 212, 253, 214, 6, 109, 8,
- 9, 10, 11, 12, 13, 14, 345, 346, 15, 16,
- 19, 8, 9, 414, 106, 12, 13, 14, 110, 13,
- 14, 73, 106, 424, 33, 402, 110, 13, 14, 15,
- 16, 249, 250, 394, 229, 253, 31, 32, 47, 48,
- 105, 105, 113, 261, 99, 100, 101, 102, 339, 333,
- 83, 382, 343, 384, 63, 250, 83, 53, 253, 277,
- 83, 3, 280, 6, 259, 8, 9, 10, 11, 12,
- 13, 14, 113, 82, 3, 106, 19, 106, 9, 88,
- 105, 6, 37, 8, 9, 10, 11, 12, 97, 111,
- 33, 111, 105, 105, 105, 104, 105, 70, 107, 105,
- 105, 3, 8, 113, 47, 48, 27, 107, 111, 113,
- 328, 70, 330, 70, 107, 117, 98, 335, 116, 27,
- 63, 106, 47, 110, 98, 105, 107, 345, 346, 4,
- 348, 97, 90, 328, 112, 70, 106, 62, 356, 82,
- 108, 110, 106, 105, 107, 88, 107, 114, 366, 3,
- 103, 346, 106, 105, 97, 115, 4, 108, 84, 13,
- 14, 108, 105, 88, 107, 104, 114, 108, 108, 105,
- 24, 25, 26, 110, 28, 108, 108, 0, 396, 113,
- 0, 3, 13, 139, 38, 26, 56, 382, 42, 384,
- 74, 409, 46, 115, 412, 49, 50, 51, 52, 110,
- 65, 302, 167, 348, 252, 330, 60, 61, 209, 335,
- 256, 65, 66, 67, 68, 69, 424, 247, 389, 297,
- 238, 409, 76, 280, 78, 79, 400, 345, 396, -1,
- -1, 85, -1, 87, -1, -1, -1, -1, 92, 93,
- 94, 95, 96, 6, -1, 8, 9, 10, 11, 12,
- 6, 105, 8, 9, 10, 11, 12, 13, 14, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, -1,
- -1, -1, -1, -1, -1, -1, -1, 33, -1, -1,
- -1, -1, -1, -1, 47, -1, -1, -1, -1, -1,
- -1, 47, 48, -1, -1, -1, -1, -1, -1, 62,
- -1, 47, -1, -1, 8, -1, -1, 63, -1, 13,
- 14, -1, -1, -1, -1, -1, -1, -1, -1, 65,
- -1, 25, -1, -1, -1, 88, 82, -1, -1, -1,
- -1, -1, 88, -1, -1, -1, 40, -1, -1, -1,
- 44, 97, 88, -1, -1, -1, 50, 51, 52, 105,
- -1, 107, 56, -1, -1, -1, -1, 61, -1, 105,
- -1, -1, 66, -1, 68, -1, -1, -1, -1, -1,
- -1, -1, 76, -1, -1, -1, -1, -1, -1, -1,
- -1, 85, -1, 87, -1, -1, 13, 14, 92, -1,
- 94, 95, 96, 20, -1, -1, -1, 24, 25, 26,
- -1, 28, 29, -1, -1, -1, -1, -1, -1, -1,
- -1, 38, -1, -1, -1, 42, -1, -1, -1, 46,
- -1, -1, 49, 50, 51, 52, -1, -1, -1, -1,
- -1, 58, -1, 60, 61, -1, -1, -1, 65, 66,
- 67, 68, 69, -1, -1, -1, -1, -1, -1, 76,
- -1, 78, 79, 80, 81, -1, -1, -1, 85, -1,
- 87, -1, 89, 13, 14, 92, 93, 94, 95, 96,
- 20, -1, -1, -1, 24, 25, 26, -1, 28, 29,
- -1, -1, -1, -1, -1, -1, -1, -1, 38, -1,
- -1, -1, 42, -1, -1, -1, 46, -1, -1, 49,
- 50, 51, 52, -1, -1, -1, -1, -1, 58, -1,
- 60, 61, -1, -1, -1, 65, 66, 67, 68, 69,
- -1, -1, -1, -1, -1, -1, 76, -1, 78, 79,
- 80, 81, -1, -1, -1, 85, -1, 87, 13, 14,
- -1, -1, 92, 93, 94, 95, 96, -1, -1, 24,
- 25, 26, -1, 28, -1, -1, -1, -1, -1, -1,
+ 121, 153, 82, 155, 197, 13, 82, 222, 136, 0,
+ 64, 65, 3, 8, 8, 4, 201, 30, 8, 135,
+ 48, 105, 64, 65, 35, 8, 15, 16, 8, 37,
+ 13, 14, 40, 13, 14, 8, 44, 8, 9, 19,
+ 17, 15, 16, 8, 9, 21, 37, 303, 56, 40,
+ 106, 8, 9, 44, 110, 12, 8, 99, 8, 9,
+ 71, 35, 12, 82, 82, 56, 74, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 136, 36, 82,
+ 32, 37, 110, 74, 212, 341, 105, 105, 107, 107,
+ 316, 376, 107, 378, 71, 312, 224, 71, 75, 227,
+ 56, 77, 110, 116, 107, 221, 332, 115, 99, 47,
+ 327, 328, 233, 330, 104, 91, 124, 106, 113, 110,
+ 305, 197, 116, 114, 115, 167, 109, 65, 136, 109,
+ 121, 104, 106, 124, 224, 106, 110, 227, 105, 215,
+ 9, 106, 116, 59, 135, 136, 113, 104, 202, 106,
+ 88, 8, 104, 86, 104, 242, 13, 14, 86, 43,
+ 168, 169, 4, 55, 240, 224, 103, 105, 227, 384,
+ 54, 258, 248, 15, 16, 303, 167, 114, 169, 6,
+ 86, 8, 9, 10, 11, 12, 106, 274, 300, 301,
+ 110, 48, 8, 201, 14, 3, 204, 13, 14, 311,
+ 108, 209, 22, 106, 212, 106, 214, 110, 401, 110,
+ 106, 23, 340, 341, 110, 223, 224, 106, 411, 227,
+ 47, 110, 14, 43, 41, 45, 109, 235, 99, 100,
+ 101, 102, 308, 224, 54, 62, 227, 389, 105, 110,
+ 13, 14, 233, 6, 331, 8, 9, 10, 11, 12,
+ 13, 14, 13, 14, 334, 376, 19, 378, 338, 106,
+ 105, 88, 113, 110, 83, 273, 257, 73, 276, 6,
+ 33, 8, 9, 10, 11, 12, 13, 14, 13, 14,
+ 15, 16, 15, 16, 47, 48, 83, 6, 53, 8,
+ 9, 10, 11, 12, 83, 303, 33, 305, 109, 110,
+ 63, 3, 310, 8, 9, 31, 32, 12, 13, 14,
+ 47, 48, 303, 99, 100, 101, 102, 113, 3, 82,
+ 111, 106, 106, 105, 111, 88, 63, 105, 47, 9,
+ 105, 37, 340, 341, 97, 343, 105, 105, 70, 105,
+ 3, 8, 105, 62, 107, 82, 113, 117, 27, 113,
+ 341, 88, 111, 107, 70, 363, 3, 107, 70, 116,
+ 97, 4, 90, 97, 112, 373, 13, 14, 105, 88,
+ 107, 70, 110, 98, 27, 106, 105, 24, 25, 26,
+ 98, 28, 4, 107, 392, 376, 108, 378, 84, 106,
+ 103, 38, 107, 114, 108, 42, 404, 105, 107, 46,
+ 408, 105, 49, 50, 51, 52, 106, 108, 115, 104,
+ 108, 105, 0, 60, 61, 108, 108, 114, 65, 66,
+ 67, 68, 69, 110, 108, 113, 0, 3, 139, 76,
+ 13, 78, 79, 26, 74, 56, 8, 115, 85, 110,
+ 87, 13, 14, 343, 167, 92, 93, 94, 95, 96,
+ 65, 209, 310, 25, 230, 305, 411, 317, 105, 390,
+ 264, 221, 404, 392, 226, 340, 396, 276, 40, -1,
+ -1, -1, 44, -1, -1, -1, -1, -1, 50, 51,
+ 52, -1, -1, -1, 56, -1, -1, -1, -1, 61,
+ -1, -1, -1, -1, 66, -1, 68, -1, -1, -1,
+ -1, -1, -1, -1, 76, -1, -1, -1, -1, -1,
+ -1, -1, -1, 85, -1, 87, -1, -1, 13, 14,
+ 92, -1, 94, 95, 96, 20, -1, -1, -1, 24,
+ 25, 26, -1, 28, 29, -1, -1, -1, -1, -1,
-1, -1, -1, 38, -1, -1, -1, 42, -1, -1,
-1, 46, -1, -1, 49, 50, 51, 52, -1, -1,
- -1, -1, -1, -1, -1, 60, 61, -1, -1, -1,
+ -1, -1, -1, 58, -1, 60, 61, -1, -1, -1,
65, 66, 67, 68, 69, -1, -1, -1, -1, -1,
- -1, 76, -1, 78, 79, -1, -1, -1, -1, -1,
- 85, -1, 87, 13, 14, -1, -1, 92, 93, 94,
- 95, 96, -1, -1, 24, 25, 26, -1, 28, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 38, -1,
- -1, -1, 42, -1, -1, -1, 46, -1, -1, 49,
- 50, 51, 52, -1, -1, -1, -1, -1, -1, -1,
- 60, 61, -1, -1, -1, 65, 66, 67, 68, 69,
- -1, -1, -1, -1, -1, -1, 76, -1, 78, 79,
- -1, -1, -1, -1, -1, 85, -1, 87, -1, -1,
- -1, -1, 92, 93, 94, 95, 96
+ -1, 76, -1, 78, 79, 80, 81, -1, -1, -1,
+ 85, -1, 87, -1, 89, 13, 14, 92, 93, 94,
+ 95, 96, 20, -1, -1, -1, 24, 25, 26, -1,
+ 28, 29, -1, -1, -1, -1, -1, -1, -1, -1,
+ 38, -1, -1, -1, 42, -1, -1, -1, 46, -1,
+ -1, 49, 50, 51, 52, -1, -1, -1, -1, -1,
+ 58, -1, 60, 61, -1, -1, -1, 65, 66, 67,
+ 68, 69, -1, -1, -1, -1, -1, -1, 76, -1,
+ 78, 79, 80, 81, -1, -1, -1, 85, -1, 87,
+ 13, 14, -1, -1, 92, 93, 94, 95, 96, -1,
+ -1, 24, 25, 26, -1, 28, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 38, -1, -1, -1, 42,
+ -1, -1, -1, 46, -1, -1, 49, 50, 51, 52,
+ -1, -1, -1, -1, -1, -1, -1, 60, 61, -1,
+ -1, -1, 65, 66, 67, 68, 69, -1, -1, -1,
+ -1, -1, -1, 76, -1, 78, 79, -1, -1, -1,
+ -1, -1, 85, -1, 87, 13, 14, -1, -1, 92,
+ 93, 94, 95, 96, -1, -1, 24, 25, 26, -1,
+ 28, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 38, -1, -1, -1, 42, -1, -1, -1, 46, -1,
+ -1, 49, 50, 51, 52, -1, -1, -1, -1, -1,
+ -1, -1, 60, 61, -1, -1, -1, 65, 66, 67,
+ 68, 69, -1, -1, -1, -1, -1, -1, 76, -1,
+ 78, 79, -1, -1, -1, -1, -1, 85, -1, 87,
+ -1, -1, -1, -1, 92, 93, 94, 95, 96
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/share/bison.simple"
@@ -1367,13 +1348,13 @@ yyreduce:
switch (yyn) {
case 1:
-#line 306 "asn1p_y.y"
+#line 303 "asn1p_y.y"
{
*(void **)param = yyvsp[0].a_grammar;
;
break;}
case 2:
-#line 312 "asn1p_y.y"
+#line 309 "asn1p_y.y"
{
yyval.a_grammar = asn1p_new();
checkmem(yyval.a_grammar);
@@ -1381,14 +1362,14 @@ case 2:
;
break;}
case 3:
-#line 317 "asn1p_y.y"
+#line 314 "asn1p_y.y"
{
yyval.a_grammar = yyvsp[-1].a_grammar;
TQ_ADD(&(yyval.a_grammar->modules), yyvsp[0].a_module, mod_next);
;
break;}
case 4:
-#line 338 "asn1p_y.y"
+#line 335 "asn1p_y.y"
{
if(yyvsp[-1].a_module) {
@@ -1405,27 +1386,27 @@ case 4:
;
break;}
case 5:
-#line 359 "asn1p_y.y"
+#line 356 "asn1p_y.y"
{ yyval.a_oid = 0; ;
break;}
case 6:
-#line 360 "asn1p_y.y"
+#line 357 "asn1p_y.y"
{ yyval.a_oid = yyvsp[0].a_oid; ;
break;}
case 7:
-#line 364 "asn1p_y.y"
+#line 361 "asn1p_y.y"
{
yyval.a_oid = yyvsp[-1].a_oid;
;
break;}
case 8:
-#line 367 "asn1p_y.y"
+#line 364 "asn1p_y.y"
{
yyval.a_oid = 0;
;
break;}
case 9:
-#line 373 "asn1p_y.y"
+#line 370 "asn1p_y.y"
{
yyval.a_oid = asn1p_oid_new();
asn1p_oid_add_arc(yyval.a_oid, &yyvsp[0].a_oid_arc);
@@ -1434,7 +1415,7 @@ case 9:
;
break;}
case 10:
-#line 379 "asn1p_y.y"
+#line 376 "asn1p_y.y"
{
yyval.a_oid = yyvsp[-1].a_oid;
asn1p_oid_add_arc(yyval.a_oid, &yyvsp[0].a_oid_arc);
@@ -1443,74 +1424,74 @@ case 10:
;
break;}
case 11:
-#line 388 "asn1p_y.y"
+#line 385 "asn1p_y.y"
{ /* iso */
yyval.a_oid_arc.name = yyvsp[0].tv_str;
yyval.a_oid_arc.number = -1;
;
break;}
case 12:
-#line 392 "asn1p_y.y"
+#line 389 "asn1p_y.y"
{ /* iso(1) */
yyval.a_oid_arc.name = yyvsp[-3].tv_str;
yyval.a_oid_arc.number = yyvsp[-1].a_int;
;
break;}
case 13:
-#line 396 "asn1p_y.y"
+#line 393 "asn1p_y.y"
{ /* 1 */
yyval.a_oid_arc.name = 0;
yyval.a_oid_arc.number = yyvsp[0].a_int;
;
break;}
case 14:
-#line 406 "asn1p_y.y"
+#line 403 "asn1p_y.y"
{ yyval.a_module_flags = MSF_NOFLAGS; ;
break;}
case 15:
-#line 407 "asn1p_y.y"
+#line 404 "asn1p_y.y"
{
yyval.a_module_flags = yyvsp[0].a_module_flags;
;
break;}
case 16:
-#line 416 "asn1p_y.y"
+#line 413 "asn1p_y.y"
{
yyval.a_module_flags = yyvsp[0].a_module_flags;
;
break;}
case 17:
-#line 419 "asn1p_y.y"
+#line 416 "asn1p_y.y"
{
yyval.a_module_flags = yyvsp[-1].a_module_flags | yyvsp[0].a_module_flags;
;
break;}
case 18:
-#line 428 "asn1p_y.y"
+#line 425 "asn1p_y.y"
{
yyval.a_module_flags = MSF_EXPLICIT_TAGS;
;
break;}
case 19:
-#line 431 "asn1p_y.y"
+#line 428 "asn1p_y.y"
{
yyval.a_module_flags = MSF_IMPLICIT_TAGS;
;
break;}
case 20:
-#line 434 "asn1p_y.y"
+#line 431 "asn1p_y.y"
{
yyval.a_module_flags = MSF_AUTOMATIC_TAGS;
;
break;}
case 21:
-#line 437 "asn1p_y.y"
+#line 434 "asn1p_y.y"
{
yyval.a_module_flags = MSF_EXTENSIBILITY_IMPLIED;
;
break;}
case 22:
-#line 441 "asn1p_y.y"
+#line 438 "asn1p_y.y"
{
/* X.680Amd1 specifies TAG and XER */
if(strcmp(yyvsp[-1].tv_str, "TAG") == 0) {
@@ -1528,23 +1509,23 @@ case 22:
;
break;}
case 23:
-#line 462 "asn1p_y.y"
+#line 459 "asn1p_y.y"
{ yyval.a_module = 0; ;
break;}
case 24:
-#line 463 "asn1p_y.y"
+#line 460 "asn1p_y.y"
{
yyval.a_module = yyvsp[0].a_module;
;
break;}
case 25:
-#line 472 "asn1p_y.y"
+#line 469 "asn1p_y.y"
{
yyval.a_module = yyvsp[0].a_module;
;
break;}
case 26:
-#line 475 "asn1p_y.y"
+#line 472 "asn1p_y.y"
{
yyval.a_module = yyvsp[-1].a_module;
@@ -1574,13 +1555,13 @@ case 26:
;
break;}
case 27:
-#line 508 "asn1p_y.y"
+#line 505 "asn1p_y.y"
{
yyval.a_module = yyvsp[0].a_module;
;
break;}
case 28:
-#line 511 "asn1p_y.y"
+#line 508 "asn1p_y.y"
{
yyval.a_module = asn1p_module_new();
checkmem(yyval.a_module);
@@ -1592,7 +1573,7 @@ case 28:
;
break;}
case 29:
-#line 520 "asn1p_y.y"
+#line 517 "asn1p_y.y"
{
yyval.a_module = asn1p_module_new();
checkmem(yyval.a_module);
@@ -1602,7 +1583,7 @@ case 29:
;
break;}
case 30:
-#line 527 "asn1p_y.y"
+#line 524 "asn1p_y.y"
{
yyval.a_module = asn1p_module_new();
checkmem(yyval.a_module);
@@ -1612,7 +1593,7 @@ case 30:
;
break;}
case 31:
-#line 540 "asn1p_y.y"
+#line 537 "asn1p_y.y"
{
yyval.a_module = asn1p_module_new();
checkmem(yyval.a_module);
@@ -1622,11 +1603,11 @@ case 31:
;
break;}
case 32:
-#line 548 "asn1p_y.y"
+#line 545 "asn1p_y.y"
{ asn1p_lexer_hack_push_encoding_control(); ;
break;}
case 33:
-#line 549 "asn1p_y.y"
+#line 546 "asn1p_y.y"
{
fprintf(stderr,
"WARNING: ENCODING-CONTROL %s "
@@ -1637,7 +1618,7 @@ case 33:
;
break;}
case 34:
-#line 561 "asn1p_y.y"
+#line 558 "asn1p_y.y"
{
return yyerror(
"Attempt to redefine a standard basic type, "
@@ -1646,19 +1627,19 @@ case 34:
;
break;}
case 35:
-#line 575 "asn1p_y.y"
+#line 572 "asn1p_y.y"
{
yyval.a_module = yyvsp[-1].a_module;
;
break;}
case 36:
-#line 581 "asn1p_y.y"
+#line 578 "asn1p_y.y"
{
return yyerror("Empty IMPORTS list");
;
break;}
case 37:
-#line 587 "asn1p_y.y"
+#line 584 "asn1p_y.y"
{
yyval.a_module = asn1p_module_new();
checkmem(yyval.a_module);
@@ -1666,14 +1647,14 @@ case 37:
;
break;}
case 38:
-#line 592 "asn1p_y.y"
+#line 589 "asn1p_y.y"
{
yyval.a_module = yyvsp[-1].a_module;
TQ_ADD(&(yyval.a_module->imports), yyvsp[0].a_xports, xp_next);
;
break;}
case 39:
-#line 599 "asn1p_y.y"
+#line 596 "asn1p_y.y"
{
yyval.a_xports = yyvsp[-3].a_xports;
yyval.a_xports->from = yyvsp[-1].tv_str;
@@ -1682,7 +1663,7 @@ case 39:
;
break;}
case 40:
-#line 608 "asn1p_y.y"
+#line 605 "asn1p_y.y"
{
yyval.a_xports = asn1p_xports_new();
checkmem(yyval.a_xports);
@@ -1690,14 +1671,14 @@ case 40:
;
break;}
case 41:
-#line 613 "asn1p_y.y"
+#line 610 "asn1p_y.y"
{
yyval.a_xports = yyvsp[-2].a_xports;
TQ_ADD(&(yyval.a_xports->members), yyvsp[0].a_expr, next);
;
break;}
case 42:
-#line 620 "asn1p_y.y"
+#line 617 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1706,7 +1687,7 @@ case 42:
;
break;}
case 43:
-#line 626 "asn1p_y.y"
+#line 623 "asn1p_y.y"
{ /* Completely equivalent to above */
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1715,7 +1696,7 @@ case 43:
;
break;}
case 44:
-#line 632 "asn1p_y.y"
+#line 629 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1724,19 +1705,19 @@ case 44:
;
break;}
case 45:
-#line 641 "asn1p_y.y"
+#line 638 "asn1p_y.y"
{
yyval.a_xports = yyvsp[-1].a_xports;
;
break;}
case 46:
-#line 644 "asn1p_y.y"
+#line 641 "asn1p_y.y"
{
yyval.a_xports = 0;
;
break;}
case 47:
-#line 647 "asn1p_y.y"
+#line 644 "asn1p_y.y"
{
/* Empty EXPORTS clause effectively prohibits export. */
yyval.a_xports = asn1p_xports_new();
@@ -1744,7 +1725,7 @@ case 47:
;
break;}
case 48:
-#line 655 "asn1p_y.y"
+#line 652 "asn1p_y.y"
{
yyval.a_xports = asn1p_xports_new();
assert(yyval.a_xports);
@@ -1752,14 +1733,14 @@ case 48:
;
break;}
case 49:
-#line 660 "asn1p_y.y"
+#line 657 "asn1p_y.y"
{
yyval.a_xports = yyvsp[-2].a_xports;
TQ_ADD(&(yyval.a_xports->members), yyvsp[0].a_expr, next);
;
break;}
case 50:
-#line 667 "asn1p_y.y"
+#line 664 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1768,7 +1749,7 @@ case 50:
;
break;}
case 51:
-#line 673 "asn1p_y.y"
+#line 670 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1777,7 +1758,7 @@ case 51:
;
break;}
case 52:
-#line 679 "asn1p_y.y"
+#line 676 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1786,17 +1767,21 @@ case 52:
;
break;}
case 53:
-#line 689 "asn1p_y.y"
+#line 687 "asn1p_y.y"
+{ asn1p_lexer_hack_push_opaque_state(); ;
+ break;}
+case 54:
+#line 687 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-4].a_expr;
assert(yyval.a_expr->Identifier == 0);
yyval.a_expr->Identifier = yyvsp[-5].tv_str;
yyval.a_expr->meta_type = AMT_VALUESET;
- // take care of optValueSetBody
+ // take care of ValueSet body
;
break;}
-case 54:
-#line 699 "asn1p_y.y"
+case 55:
+#line 697 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1805,8 +1790,8 @@ case 54:
yyval.a_expr->meta_type = AMT_TYPEREF;
;
break;}
-case 55:
-#line 706 "asn1p_y.y"
+case 56:
+#line 704 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1814,37 +1799,8 @@ case 55:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 56:
-#line 715 "asn1p_y.y"
-{ ;
- break;}
case 57:
-#line 716 "asn1p_y.y"
-{
- ;
- break;}
-case 58:
-#line 727 "asn1p_y.y"
-{
- ;
- break;}
-case 59:
-#line 729 "asn1p_y.y"
-{
- ;
- break;}
-case 60:
-#line 734 "asn1p_y.y"
-{
- ;
- break;}
-case 61:
-#line 736 "asn1p_y.y"
-{
- ;
- break;}
-case 62:
-#line 752 "asn1p_y.y"
+#line 722 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1854,8 +1810,8 @@ case 62:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 63:
-#line 760 "asn1p_y.y"
+case 58:
+#line 730 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
yyval.a_expr->Identifier = yyvsp[-2].tv_str;
@@ -1863,8 +1819,8 @@ case 63:
assert(yyval.a_expr->meta_type);
;
break;}
-case 64:
-#line 766 "asn1p_y.y"
+case 59:
+#line 736 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
yyval.a_expr->Identifier = yyvsp[-2].tv_str;
@@ -1872,8 +1828,8 @@ case 64:
assert(yyval.a_expr->meta_type == AMT_OBJECT);
;
break;}
-case 65:
-#line 782 "asn1p_y.y"
+case 60:
+#line 752 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
assert(yyval.a_expr->Identifier == 0);
@@ -1882,8 +1838,8 @@ case 65:
yyval.a_expr->meta_type = AMT_PARAMTYPE;
;
break;}
-case 66:
-#line 792 "asn1p_y.y"
+case 61:
+#line 762 "asn1p_y.y"
{
int ret;
yyval.a_plist = asn1p_paramlist_new(yylineno);
@@ -1894,8 +1850,8 @@ case 66:
if(yyvsp[0].a_parg.argument) free(yyvsp[0].a_parg.argument);
;
break;}
-case 67:
-#line 801 "asn1p_y.y"
+case 62:
+#line 771 "asn1p_y.y"
{
int ret;
yyval.a_plist = yyvsp[-2].a_plist;
@@ -1905,15 +1861,15 @@ case 67:
if(yyvsp[0].a_parg.argument) free(yyvsp[0].a_parg.argument);
;
break;}
-case 68:
-#line 812 "asn1p_y.y"
+case 63:
+#line 782 "asn1p_y.y"
{
yyval.a_parg.governor = NULL;
yyval.a_parg.argument = yyvsp[0].tv_str;
;
break;}
-case 69:
-#line 816 "asn1p_y.y"
+case 64:
+#line 786 "asn1p_y.y"
{
int ret;
yyval.a_parg.governor = asn1p_ref_new(yylineno);
@@ -1922,8 +1878,8 @@ case 69:
yyval.a_parg.argument = yyvsp[0].tv_str;
;
break;}
-case 70:
-#line 823 "asn1p_y.y"
+case 65:
+#line 793 "asn1p_y.y"
{
int ret;
yyval.a_parg.governor = asn1p_ref_new(yylineno);
@@ -1932,8 +1888,8 @@ case 70:
yyval.a_parg.argument = yyvsp[0].tv_str;
;
break;}
-case 71:
-#line 830 "asn1p_y.y"
+case 66:
+#line 800 "asn1p_y.y"
{
int ret;
yyval.a_parg.governor = asn1p_ref_new(yylineno);
@@ -1943,29 +1899,29 @@ case 71:
yyval.a_parg.argument = yyvsp[0].tv_str;
;
break;}
-case 72:
-#line 841 "asn1p_y.y"
+case 67:
+#line 811 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 73:
-#line 846 "asn1p_y.y"
+case 68:
+#line 816 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 74:
-#line 853 "asn1p_y.y"
+case 69:
+#line 823 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
;
break;}
-case 75:
-#line 856 "asn1p_y.y"
+case 70:
+#line 826 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -1974,31 +1930,31 @@ case 75:
yyval.a_expr->meta_type = AMT_VALUE;
;
break;}
-case 76:
-#line 880 "asn1p_y.y"
+case 71:
+#line 850 "asn1p_y.y"
{ yyval.a_expr = asn1p_expr_new(yylineno); ;
break;}
-case 77:
-#line 881 "asn1p_y.y"
+case 72:
+#line 851 "asn1p_y.y"
{ yyval.a_expr = yyvsp[0].a_expr; ;
break;}
-case 78:
-#line 884 "asn1p_y.y"
+case 73:
+#line 854 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 79:
-#line 889 "asn1p_y.y"
+case 74:
+#line 859 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 80:
-#line 896 "asn1p_y.y"
+case 75:
+#line 866 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-1].a_expr;
assert(yyval.a_expr->Identifier == 0);
@@ -2006,8 +1962,8 @@ case 80:
yyval.a_expr->marker = yyvsp[0].a_marker;
;
break;}
-case 81:
-#line 902 "asn1p_y.y"
+case 76:
+#line 872 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2016,43 +1972,43 @@ case 81:
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 82:
-#line 909 "asn1p_y.y"
+case 77:
+#line 879 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
;
break;}
-case 83:
-#line 915 "asn1p_y.y"
+case 78:
+#line 885 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 84:
-#line 920 "asn1p_y.y"
+case 79:
+#line 890 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 85:
-#line 927 "asn1p_y.y"
+case 80:
+#line 897 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
assert(yyval.a_expr->Identifier == 0);
yyval.a_expr->Identifier = yyvsp[-1].tv_str;
;
break;}
-case 86:
-#line 932 "asn1p_y.y"
+case 81:
+#line 902 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
;
break;}
-case 87:
-#line 938 "asn1p_y.y"
+case 82:
+#line 908 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
checkmem(yyval.a_expr);
@@ -2061,16 +2017,16 @@ case 87:
assert(yyval.a_expr->meta_type == AMT_OBJECT);
;
break;}
-case 88:
-#line 948 "asn1p_y.y"
+case 83:
+#line 918 "asn1p_y.y"
{ yyval.a_int = 0; ;
break;}
-case 89:
-#line 949 "asn1p_y.y"
+case 84:
+#line 919 "asn1p_y.y"
{ yyval.a_int = 1; ;
break;}
-case 90:
-#line 953 "asn1p_y.y"
+case 85:
+#line 923 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2079,15 +2035,15 @@ case 90:
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 91:
-#line 960 "asn1p_y.y"
+case 86:
+#line 930 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 92:
-#line 967 "asn1p_y.y"
+case 87:
+#line 937 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2097,8 +2053,8 @@ case 92:
yyval.a_expr->marker = yyvsp[0].a_marker;
;
break;}
-case 93:
-#line 975 "asn1p_y.y"
+case 88:
+#line 945 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
yyval.a_expr->Identifier = yyvsp[-3].a_refcomp.name;
@@ -2106,8 +2062,8 @@ case 93:
yyval.a_expr->unique = yyvsp[-1].a_int;
;
break;}
-case 94:
-#line 981 "asn1p_y.y"
+case 89:
+#line 951 "asn1p_y.y"
{
int ret;
yyval.a_expr = asn1p_expr_new(yylineno);
@@ -2124,48 +2080,48 @@ case 94:
yyval.a_expr->unique = yyvsp[-1].a_int;
;
break;}
-case 95:
-#line 999 "asn1p_y.y"
+case 90:
+#line 969 "asn1p_y.y"
{ yyval.a_wsynt = 0; ;
break;}
-case 96:
-#line 1000 "asn1p_y.y"
+case 91:
+#line 970 "asn1p_y.y"
{
yyval.a_wsynt = yyvsp[0].a_wsynt;
;
break;}
-case 97:
-#line 1007 "asn1p_y.y"
+case 92:
+#line 977 "asn1p_y.y"
{ asn1p_lexer_hack_enable_with_syntax(); ;
break;}
-case 98:
-#line 1009 "asn1p_y.y"
+case 93:
+#line 979 "asn1p_y.y"
{
yyval.a_wsynt = yyvsp[-1].a_wsynt;
;
break;}
-case 99:
-#line 1015 "asn1p_y.y"
+case 94:
+#line 985 "asn1p_y.y"
{
yyval.a_wsynt = asn1p_wsyntx_new();
TQ_ADD(&(yyval.a_wsynt->chunks), yyvsp[0].a_wchunk, next);
;
break;}
-case 100:
-#line 1019 "asn1p_y.y"
+case 95:
+#line 989 "asn1p_y.y"
{
yyval.a_wsynt = yyvsp[-1].a_wsynt;
TQ_ADD(&(yyval.a_wsynt->chunks), yyvsp[0].a_wchunk, next);
;
break;}
-case 101:
-#line 1026 "asn1p_y.y"
+case 96:
+#line 996 "asn1p_y.y"
{
yyval.a_wchunk = asn1p_wsyntx_chunk_frombuf(yyvsp[0].tv_opaque.buf, yyvsp[0].tv_opaque.len, 0);
;
break;}
-case 102:
-#line 1029 "asn1p_y.y"
+case 97:
+#line 999 "asn1p_y.y"
{
asn1p_ref_t *ref;
int ret;
@@ -2176,8 +2132,8 @@ case 102:
yyval.a_wchunk = asn1p_wsyntx_chunk_fromref(ref, 0);
;
break;}
-case 103:
-#line 1041 "asn1p_y.y"
+case 98:
+#line 1011 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2187,8 +2143,8 @@ case 103:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 104:
-#line 1049 "asn1p_y.y"
+case 99:
+#line 1019 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2199,8 +2155,8 @@ case 104:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 105:
-#line 1058 "asn1p_y.y"
+case 100:
+#line 1028 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2211,8 +2167,8 @@ case 105:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 106:
-#line 1070 "asn1p_y.y"
+case 101:
+#line 1040 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-1].a_expr;
yyval.a_expr->tag = yyvsp[-2].a_tag;
@@ -2233,14 +2189,14 @@ case 106:
}
;
break;}
-case 107:
-#line 1092 "asn1p_y.y"
+case 102:
+#line 1062 "asn1p_y.y"
{
yyval.a_expr = yyvsp[0].a_expr;
;
break;}
-case 108:
-#line 1095 "asn1p_y.y"
+case 103:
+#line 1065 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-1].a_expr;
assert(yyval.a_expr->expr_type == A1TC_INVALID);
@@ -2248,8 +2204,8 @@ case 108:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 109:
-#line 1101 "asn1p_y.y"
+case 104:
+#line 1071 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-1].a_expr;
assert(yyval.a_expr->expr_type == A1TC_INVALID);
@@ -2257,8 +2213,8 @@ case 109:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 110:
-#line 1107 "asn1p_y.y"
+case 105:
+#line 1077 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-1].a_expr;
assert(yyval.a_expr->expr_type == A1TC_INVALID);
@@ -2266,8 +2222,8 @@ case 110:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 111:
-#line 1113 "asn1p_y.y"
+case 106:
+#line 1083 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2279,8 +2235,8 @@ case 111:
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 112:
-#line 1123 "asn1p_y.y"
+case 107:
+#line 1093 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2292,8 +2248,8 @@ case 112:
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 113:
-#line 1133 "asn1p_y.y"
+case 108:
+#line 1103 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2301,8 +2257,8 @@ case 113:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 114:
-#line 1139 "asn1p_y.y"
+case 109:
+#line 1109 "asn1p_y.y"
{
int ret;
yyval.a_expr = asn1p_expr_new(yylineno);
@@ -2315,8 +2271,8 @@ case 114:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 115:
-#line 1153 "asn1p_y.y"
+case 110:
+#line 1123 "asn1p_y.y"
{
int ret;
yyval.a_expr = yyvsp[-1].a_expr;
@@ -2332,8 +2288,8 @@ case 115:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 116:
-#line 1177 "asn1p_y.y"
+case 111:
+#line 1147 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2342,8 +2298,8 @@ case 116:
yyval.a_expr->meta_type = AMT_TYPEREF;
;
break;}
-case 117:
-#line 1184 "asn1p_y.y"
+case 112:
+#line 1154 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2352,8 +2308,8 @@ case 117:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 118:
-#line 1199 "asn1p_y.y"
+case 113:
+#line 1169 "asn1p_y.y"
{
int ret;
yyval.a_ref = asn1p_ref_new(yylineno);
@@ -2363,8 +2319,8 @@ case 118:
free(yyvsp[0].tv_str);
;
break;}
-case 119:
-#line 1207 "asn1p_y.y"
+case 114:
+#line 1177 "asn1p_y.y"
{
int ret;
yyval.a_ref = asn1p_ref_new(yylineno);
@@ -2376,8 +2332,8 @@ case 119:
free(yyvsp[-2].tv_str);
;
break;}
-case 120:
-#line 1217 "asn1p_y.y"
+case 115:
+#line 1187 "asn1p_y.y"
{
int ret;
yyval.a_ref = asn1p_ref_new(yylineno);
@@ -2389,8 +2345,8 @@ case 120:
free(yyvsp[-2].tv_str);
;
break;}
-case 121:
-#line 1227 "asn1p_y.y"
+case 116:
+#line 1197 "asn1p_y.y"
{
int ret;
yyval.a_ref = asn1p_ref_new(yylineno);
@@ -2402,8 +2358,8 @@ case 121:
free(yyvsp[-2].tv_str);
;
break;}
-case 122:
-#line 1237 "asn1p_y.y"
+case 117:
+#line 1207 "asn1p_y.y"
{
int ret;
yyval.a_ref = asn1p_ref_new(yylineno);
@@ -2413,8 +2369,8 @@ case 122:
checkmem(ret == 0);
;
break;}
-case 123:
-#line 1245 "asn1p_y.y"
+case 118:
+#line 1215 "asn1p_y.y"
{
int ret;
yyval.a_ref = yyvsp[0].a_ref;
@@ -2435,8 +2391,8 @@ case 123:
}
;
break;}
-case 124:
-#line 1267 "asn1p_y.y"
+case 119:
+#line 1237 "asn1p_y.y"
{
int ret;
yyval.a_ref = asn1p_ref_new(yylineno);
@@ -2446,8 +2402,8 @@ case 124:
checkmem(ret == 0);
;
break;}
-case 125:
-#line 1275 "asn1p_y.y"
+case 120:
+#line 1245 "asn1p_y.y"
{
int ret;
yyval.a_ref = yyvsp[-2].a_ref;
@@ -2456,22 +2412,22 @@ case 125:
checkmem(ret == 0);
;
break;}
-case 128:
-#line 1289 "asn1p_y.y"
+case 123:
+#line 1259 "asn1p_y.y"
{
yyval.a_refcomp.lex_type = RLT_AmpUppercase;
yyval.a_refcomp.name = yyvsp[0].tv_str;
;
break;}
-case 129:
-#line 1294 "asn1p_y.y"
+case 124:
+#line 1264 "asn1p_y.y"
{
yyval.a_refcomp.lex_type = RLT_Amplowercase;
yyval.a_refcomp.name = yyvsp[0].tv_str;
;
break;}
-case 130:
-#line 1307 "asn1p_y.y"
+case 125:
+#line 1277 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
assert(yyval.a_expr->Identifier == NULL);
@@ -2480,8 +2436,8 @@ case 130:
yyval.a_expr->value = yyvsp[0].a_value;
;
break;}
-case 131:
-#line 1317 "asn1p_y.y"
+case 126:
+#line 1287 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(0);
checkmem(yyval.a_value);
@@ -2490,76 +2446,76 @@ case 131:
yyval.a_value->value.choice_identifier.value = yyvsp[0].a_value;
;
break;}
-case 132:
-#line 1324 "asn1p_y.y"
+case 127:
+#line 1294 "asn1p_y.y"
{ asn1p_lexer_hack_push_opaque_state(); ;
break;}
-case 133:
-#line 1324 "asn1p_y.y"
+case 128:
+#line 1294 "asn1p_y.y"
{
yyval.a_value = asn1p_value_frombuf(yyvsp[0].tv_opaque.buf, yyvsp[0].tv_opaque.len, 0);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_UNPARSED;
;
break;}
-case 134:
-#line 1329 "asn1p_y.y"
+case 129:
+#line 1299 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(0);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_NULL;
;
break;}
-case 135:
-#line 1334 "asn1p_y.y"
+case 130:
+#line 1304 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(0);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_FALSE;
;
break;}
-case 136:
-#line 1339 "asn1p_y.y"
+case 131:
+#line 1309 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(0);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_TRUE;
;
break;}
-case 137:
-#line 1344 "asn1p_y.y"
+case 132:
+#line 1314 "asn1p_y.y"
{
yyval.a_value = _convert_bitstring2binary(yyvsp[0].tv_str, 'B');
checkmem(yyval.a_value);
;
break;}
-case 138:
-#line 1348 "asn1p_y.y"
+case 133:
+#line 1318 "asn1p_y.y"
{
yyval.a_value = _convert_bitstring2binary(yyvsp[0].tv_str, 'H');
checkmem(yyval.a_value);
;
break;}
-case 139:
-#line 1352 "asn1p_y.y"
+case 134:
+#line 1322 "asn1p_y.y"
{
yyval.a_value = yyval.a_value;
;
break;}
-case 140:
-#line 1355 "asn1p_y.y"
+case 135:
+#line 1325 "asn1p_y.y"
{
yyval.a_value = yyvsp[0].a_value;
;
break;}
-case 141:
-#line 1358 "asn1p_y.y"
+case 136:
+#line 1328 "asn1p_y.y"
{
yyval.a_value = yyvsp[0].a_value;
;
break;}
-case 142:
-#line 1364 "asn1p_y.y"
+case 137:
+#line 1334 "asn1p_y.y"
{
asn1p_ref_t *ref;
int ret;
@@ -2572,8 +2528,8 @@ case 142:
free(yyvsp[0].tv_str);
;
break;}
-case 143:
-#line 1375 "asn1p_y.y"
+case 138:
+#line 1345 "asn1p_y.y"
{
asn1p_ref_t *ref;
int ret;
@@ -2589,31 +2545,31 @@ case 143:
free(yyvsp[0].tv_str);
;
break;}
-case 144:
-#line 1393 "asn1p_y.y"
+case 139:
+#line 1363 "asn1p_y.y"
{
yyval.a_value = asn1p_value_frombuf(yyvsp[0].tv_opaque.buf, yyvsp[0].tv_opaque.len, 0);
checkmem(yyval.a_value);
;
break;}
-case 145:
-#line 1397 "asn1p_y.y"
+case 140:
+#line 1367 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_TUPLE;
;
break;}
-case 146:
-#line 1402 "asn1p_y.y"
+case 141:
+#line 1372 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_QUADRUPLE;
;
break;}
-case 147:
-#line 1436 "asn1p_y.y"
+case 142:
+#line 1406 "asn1p_y.y"
{
yyval.tv_opaque.len = yyvsp[0].tv_opaque.len + 1;
yyval.tv_opaque.buf = malloc(yyval.tv_opaque.len + 1);
@@ -2624,8 +2580,8 @@ case 147:
free(yyvsp[0].tv_opaque.buf);
;
break;}
-case 148:
-#line 1445 "asn1p_y.y"
+case 143:
+#line 1415 "asn1p_y.y"
{
int newsize = yyvsp[-1].tv_opaque.len + yyvsp[0].tv_opaque.len;
char *p = malloc(newsize + 1);
@@ -2639,72 +2595,72 @@ case 148:
yyval.tv_opaque.len = newsize;
;
break;}
-case 149:
-#line 1460 "asn1p_y.y"
+case 144:
+#line 1430 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_BOOLEAN; ;
break;}
-case 150:
-#line 1461 "asn1p_y.y"
+case 145:
+#line 1431 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_NULL; ;
break;}
-case 151:
-#line 1462 "asn1p_y.y"
+case 146:
+#line 1432 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_REAL; ;
break;}
-case 152:
-#line 1463 "asn1p_y.y"
+case 147:
+#line 1433 "asn1p_y.y"
{ yyval.a_type = yyvsp[0].a_type; ;
break;}
-case 153:
-#line 1464 "asn1p_y.y"
+case 148:
+#line 1434 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_OCTET_STRING; ;
break;}
-case 154:
-#line 1465 "asn1p_y.y"
+case 149:
+#line 1435 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_OBJECT_IDENTIFIER; ;
break;}
-case 155:
-#line 1466 "asn1p_y.y"
+case 150:
+#line 1436 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_RELATIVE_OID; ;
break;}
-case 156:
-#line 1467 "asn1p_y.y"
+case 151:
+#line 1437 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_EXTERNAL; ;
break;}
-case 157:
-#line 1468 "asn1p_y.y"
+case 152:
+#line 1438 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_EMBEDDED_PDV; ;
break;}
-case 158:
-#line 1469 "asn1p_y.y"
+case 153:
+#line 1439 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_CHARACTER_STRING; ;
break;}
-case 159:
-#line 1470 "asn1p_y.y"
+case 154:
+#line 1440 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_UTCTime; ;
break;}
-case 160:
-#line 1471 "asn1p_y.y"
+case 155:
+#line 1441 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_GeneralizedTime; ;
break;}
-case 161:
-#line 1472 "asn1p_y.y"
+case 156:
+#line 1442 "asn1p_y.y"
{ yyval.a_type = yyvsp[0].a_type; ;
break;}
-case 162:
-#line 1479 "asn1p_y.y"
+case 157:
+#line 1449 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_INTEGER; ;
break;}
-case 163:
-#line 1480 "asn1p_y.y"
+case 158:
+#line 1450 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_ENUMERATED; ;
break;}
-case 164:
-#line 1481 "asn1p_y.y"
+case 159:
+#line 1451 "asn1p_y.y"
{ yyval.a_type = ASN_BASIC_BIT_STRING; ;
break;}
-case 165:
-#line 1485 "asn1p_y.y"
+case 160:
+#line 1455 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -2712,8 +2668,8 @@ case 165:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 166:
-#line 1491 "asn1p_y.y"
+case 161:
+#line 1461 "asn1p_y.y"
{
if(yyvsp[0].a_expr) {
yyval.a_expr = yyvsp[0].a_expr;
@@ -2725,92 +2681,92 @@ case 166:
yyval.a_expr->meta_type = AMT_TYPE;
;
break;}
-case 167:
-#line 1504 "asn1p_y.y"
+case 162:
+#line 1474 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_BMPString; ;
break;}
-case 168:
-#line 1505 "asn1p_y.y"
+case 163:
+#line 1475 "asn1p_y.y"
{
yyval.a_type = ASN_STRING_GeneralString;
fprintf(stderr, "WARNING: GeneralString is not fully supported\n");
;
break;}
-case 169:
-#line 1509 "asn1p_y.y"
+case 164:
+#line 1479 "asn1p_y.y"
{
yyval.a_type = ASN_STRING_GraphicString;
fprintf(stderr, "WARNING: GraphicString is not fully supported\n");
;
break;}
-case 170:
-#line 1513 "asn1p_y.y"
+case 165:
+#line 1483 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_IA5String; ;
break;}
-case 171:
-#line 1514 "asn1p_y.y"
+case 166:
+#line 1484 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_ISO646String; ;
break;}
-case 172:
-#line 1515 "asn1p_y.y"
+case 167:
+#line 1485 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_NumericString; ;
break;}
-case 173:
-#line 1516 "asn1p_y.y"
+case 168:
+#line 1486 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_PrintableString; ;
break;}
-case 174:
-#line 1517 "asn1p_y.y"
+case 169:
+#line 1487 "asn1p_y.y"
{
yyval.a_type = ASN_STRING_T61String;
fprintf(stderr, "WARNING: T61String is not fully supported\n");
;
break;}
-case 175:
-#line 1521 "asn1p_y.y"
+case 170:
+#line 1491 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_TeletexString; ;
break;}
-case 176:
-#line 1522 "asn1p_y.y"
+case 171:
+#line 1492 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_UniversalString; ;
break;}
-case 177:
-#line 1523 "asn1p_y.y"
+case 172:
+#line 1493 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_UTF8String; ;
break;}
-case 178:
-#line 1524 "asn1p_y.y"
+case 173:
+#line 1494 "asn1p_y.y"
{
yyval.a_type = ASN_STRING_VideotexString;
fprintf(stderr, "WARNING: VideotexString is not fully supported\n");
;
break;}
-case 179:
-#line 1528 "asn1p_y.y"
+case 174:
+#line 1498 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_VisibleString; ;
break;}
-case 180:
-#line 1529 "asn1p_y.y"
+case 175:
+#line 1499 "asn1p_y.y"
{ yyval.a_type = ASN_STRING_ObjectDescriptor; ;
break;}
-case 186:
-#line 1541 "asn1p_y.y"
+case 181:
+#line 1511 "asn1p_y.y"
{ yyval.a_constr = 0; ;
break;}
-case 187:
-#line 1542 "asn1p_y.y"
+case 182:
+#line 1512 "asn1p_y.y"
{
yyval.a_constr = yyvsp[0].a_constr;
;
break;}
-case 188:
-#line 1548 "asn1p_y.y"
+case 183:
+#line 1518 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_SET, yyvsp[0].a_constr, 0);
;
break;}
-case 189:
-#line 1551 "asn1p_y.y"
+case 184:
+#line 1521 "asn1p_y.y"
{
/*
* This is a special case, for compatibility purposes.
@@ -2819,26 +2775,26 @@ case 189:
CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_SIZE, yyvsp[-1].a_constr, 0);
;
break;}
-case 190:
-#line 1561 "asn1p_y.y"
+case 185:
+#line 1531 "asn1p_y.y"
{
yyval.a_constr = yyvsp[-1].a_constr;
;
break;}
-case 191:
-#line 1564 "asn1p_y.y"
+case 186:
+#line 1534 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_SET, yyvsp[-3].a_constr, yyvsp[-1].a_constr);
;
break;}
-case 192:
-#line 1570 "asn1p_y.y"
+case 187:
+#line 1540 "asn1p_y.y"
{
yyval.a_constr = yyvsp[0].a_constr;
;
break;}
-case 193:
-#line 1573 "asn1p_y.y"
+case 188:
+#line 1543 "asn1p_y.y"
{
asn1p_constraint_t *ct;
ct = asn1p_constraint_new(yylineno);
@@ -2846,8 +2802,8 @@ case 193:
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CSV, yyvsp[-2].a_constr, ct);
;
break;}
-case 194:
-#line 1579 "asn1p_y.y"
+case 189:
+#line 1549 "asn1p_y.y"
{
asn1p_constraint_t *ct;
ct = asn1p_constraint_new(yylineno);
@@ -2857,38 +2813,38 @@ case 194:
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CSV, ct, yyvsp[0].a_constr);
;
break;}
-case 195:
-#line 1590 "asn1p_y.y"
+case 190:
+#line 1560 "asn1p_y.y"
{
yyval.a_constr = yyvsp[0].a_constr;
;
break;}
-case 196:
-#line 1593 "asn1p_y.y"
+case 191:
+#line 1563 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_AEX, yyvsp[0].a_constr, 0);
;
break;}
-case 197:
-#line 1596 "asn1p_y.y"
+case 192:
+#line 1566 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_UNI, yyvsp[-2].a_constr, yyvsp[0].a_constr);
;
break;}
-case 198:
-#line 1599 "asn1p_y.y"
+case 193:
+#line 1569 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_INT, yyvsp[-2].a_constr, yyvsp[0].a_constr);
;
break;}
-case 199:
-#line 1602 "asn1p_y.y"
+case 194:
+#line 1572 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_EXC, yyvsp[-2].a_constr, yyvsp[0].a_constr);
;
break;}
-case 200:
-#line 1608 "asn1p_y.y"
+case 195:
+#line 1578 "asn1p_y.y"
{
int ret;
yyval.a_constr = asn1p_constraint_new(yylineno);
@@ -2898,8 +2854,8 @@ case 200:
checkmem(ret == 0);
;
break;}
-case 201:
-#line 1616 "asn1p_y.y"
+case 196:
+#line 1586 "asn1p_y.y"
{
int ret;
yyval.a_constr = asn1p_constraint_new(yylineno);
@@ -2909,8 +2865,8 @@ case 201:
checkmem(ret == 0);
;
break;}
-case 202:
-#line 1624 "asn1p_y.y"
+case 197:
+#line 1594 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -2918,8 +2874,8 @@ case 202:
yyval.a_constr->value = yyvsp[0].a_value;
;
break;}
-case 203:
-#line 1630 "asn1p_y.y"
+case 198:
+#line 1600 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -2927,8 +2883,8 @@ case 203:
yyval.a_constr->containedSubtype = yyvsp[0].a_value;
;
break;}
-case 204:
-#line 1636 "asn1p_y.y"
+case 199:
+#line 1606 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -2937,8 +2893,8 @@ case 204:
yyval.a_constr->range_stop = yyvsp[0].a_value;
;
break;}
-case 205:
-#line 1643 "asn1p_y.y"
+case 200:
+#line 1613 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -2948,8 +2904,8 @@ case 205:
yyval.a_constr->range_start->type = ATV_MIN;
;
break;}
-case 206:
-#line 1651 "asn1p_y.y"
+case 201:
+#line 1621 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -2959,8 +2915,8 @@ case 206:
yyval.a_constr->range_stop->type = ATV_MAX;
;
break;}
-case 207:
-#line 1659 "asn1p_y.y"
+case 202:
+#line 1629 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -2971,24 +2927,24 @@ case 207:
yyval.a_constr->range_stop->type = ATV_MAX;
;
break;}
-case 208:
-#line 1668 "asn1p_y.y"
+case 203:
+#line 1638 "asn1p_y.y"
{
yyval.a_constr = yyvsp[0].a_constr;
;
break;}
-case 209:
-#line 1671 "asn1p_y.y"
+case 204:
+#line 1641 "asn1p_y.y"
{
yyval.a_constr = yyvsp[0].a_constr;
;
break;}
-case 210:
-#line 1675 "asn1p_y.y"
+case 205:
+#line 1645 "asn1p_y.y"
{ asn1p_lexer_hack_push_opaque_state(); ;
break;}
-case 211:
-#line 1675 "asn1p_y.y"
+case 206:
+#line 1645 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -2998,64 +2954,64 @@ case 211:
yyval.a_constr->value->type = ATV_UNPARSED;
;
break;}
-case 212:
-#line 1686 "asn1p_y.y"
+case 207:
+#line 1656 "asn1p_y.y"
{ yyval.a_ctype = ACT_EL_RANGE; ;
break;}
-case 213:
-#line 1687 "asn1p_y.y"
+case 208:
+#line 1657 "asn1p_y.y"
{ yyval.a_ctype = ACT_EL_RLRANGE; ;
break;}
-case 214:
-#line 1688 "asn1p_y.y"
+case 209:
+#line 1658 "asn1p_y.y"
{ yyval.a_ctype = ACT_EL_LLRANGE; ;
break;}
-case 215:
-#line 1689 "asn1p_y.y"
+case 210:
+#line 1659 "asn1p_y.y"
{ yyval.a_ctype = ACT_EL_ULRANGE; ;
break;}
-case 216:
-#line 1693 "asn1p_y.y"
+case 211:
+#line 1663 "asn1p_y.y"
{
yyval.a_ctype = ACT_CT_SIZE;
;
break;}
-case 217:
-#line 1696 "asn1p_y.y"
+case 212:
+#line 1666 "asn1p_y.y"
{
yyval.a_ctype = ACT_CT_FROM;
;
break;}
-case 218:
-#line 1702 "asn1p_y.y"
+case 213:
+#line 1672 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(0);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_FALSE;
;
break;}
-case 219:
-#line 1707 "asn1p_y.y"
+case 214:
+#line 1677 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(1);
checkmem(yyval.a_value);
yyval.a_value->type = ATV_TRUE;
;
break;}
-case 220:
-#line 1712 "asn1p_y.y"
+case 215:
+#line 1682 "asn1p_y.y"
{
yyval.a_value = yyvsp[0].a_value;
;
break;}
-case 221:
-#line 1715 "asn1p_y.y"
+case 216:
+#line 1685 "asn1p_y.y"
{
yyval.a_value = yyvsp[0].a_value;
;
break;}
-case 222:
-#line 1718 "asn1p_y.y"
+case 217:
+#line 1688 "asn1p_y.y"
{
asn1p_ref_t *ref;
int ret;
@@ -3068,8 +3024,8 @@ case 222:
free(yyvsp[0].tv_str);
;
break;}
-case 223:
-#line 1732 "asn1p_y.y"
+case 218:
+#line 1702 "asn1p_y.y"
{
asn1p_ref_t *ref;
int ret;
@@ -3082,32 +3038,32 @@ case 223:
free(yyvsp[0].tv_str);
;
break;}
-case 224:
-#line 1746 "asn1p_y.y"
+case 219:
+#line 1716 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMP, yyvsp[0].a_constr, 0);
;
break;}
-case 225:
-#line 1749 "asn1p_y.y"
+case 220:
+#line 1719 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMPS, yyvsp[-1].a_constr, 0);
;
break;}
-case 226:
-#line 1755 "asn1p_y.y"
+case 221:
+#line 1725 "asn1p_y.y"
{
yyval.a_constr = yyvsp[0].a_constr;
;
break;}
-case 227:
-#line 1758 "asn1p_y.y"
+case 222:
+#line 1728 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMPS, yyvsp[-2].a_constr, yyvsp[0].a_constr);
;
break;}
-case 228:
-#line 1764 "asn1p_y.y"
+case 223:
+#line 1734 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -3115,8 +3071,8 @@ case 228:
yyval.a_constr->value = asn1p_value_frombuf("...", 3, 0);
;
break;}
-case 229:
-#line 1770 "asn1p_y.y"
+case 224:
+#line 1740 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -3126,46 +3082,46 @@ case 229:
if(yyvsp[-1].a_constr) asn1p_constraint_insert(yyval.a_constr, yyvsp[-1].a_constr);
;
break;}
-case 230:
-#line 1784 "asn1p_y.y"
+case 225:
+#line 1754 "asn1p_y.y"
{ yyval.a_pres = ACPRES_DEFAULT; ;
break;}
-case 231:
-#line 1785 "asn1p_y.y"
+case 226:
+#line 1755 "asn1p_y.y"
{ yyval.a_pres = yyvsp[0].a_pres; ;
break;}
-case 232:
-#line 1789 "asn1p_y.y"
+case 227:
+#line 1759 "asn1p_y.y"
{
yyval.a_pres = ACPRES_PRESENT;
;
break;}
-case 233:
-#line 1792 "asn1p_y.y"
+case 228:
+#line 1762 "asn1p_y.y"
{
yyval.a_pres = ACPRES_ABSENT;
;
break;}
-case 234:
-#line 1795 "asn1p_y.y"
+case 229:
+#line 1765 "asn1p_y.y"
{
yyval.a_pres = ACPRES_OPTIONAL;
;
break;}
-case 235:
-#line 1801 "asn1p_y.y"
+case 230:
+#line 1771 "asn1p_y.y"
{
yyval.a_constr = yyvsp[0].a_constr;
;
break;}
-case 236:
-#line 1804 "asn1p_y.y"
+case 231:
+#line 1774 "asn1p_y.y"
{
yyval.a_constr = yyvsp[0].a_constr;
;
break;}
-case 237:
-#line 1813 "asn1p_y.y"
+case 232:
+#line 1783 "asn1p_y.y"
{
asn1p_ref_t *ref = asn1p_ref_new(yylineno);
asn1p_constraint_t *ct;
@@ -3179,14 +3135,14 @@ case 237:
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CRC, ct, 0);
;
break;}
-case 238:
-#line 1828 "asn1p_y.y"
+case 233:
+#line 1798 "asn1p_y.y"
{
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CRC, yyvsp[-3].a_constr, yyvsp[-1].a_constr);
;
break;}
-case 239:
-#line 1834 "asn1p_y.y"
+case 234:
+#line 1804 "asn1p_y.y"
{
yyval.a_constr = asn1p_constraint_new(yylineno);
checkmem(yyval.a_constr);
@@ -3194,8 +3150,8 @@ case 239:
yyval.a_constr->value = asn1p_value_fromref(yyvsp[0].a_ref, 0);
;
break;}
-case 240:
-#line 1840 "asn1p_y.y"
+case 235:
+#line 1810 "asn1p_y.y"
{
asn1p_constraint_t *ct;
ct = asn1p_constraint_new(yylineno);
@@ -3205,8 +3161,8 @@ case 240:
CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CSV, yyvsp[-2].a_constr, ct);
;
break;}
-case 241:
-#line 1854 "asn1p_y.y"
+case 236:
+#line 1824 "asn1p_y.y"
{
char *p = malloc(strlen(yyvsp[0].tv_str) + 2);
int ret;
@@ -3219,8 +3175,8 @@ case 241:
free(yyvsp[0].tv_str);
;
break;}
-case 242:
-#line 1865 "asn1p_y.y"
+case 237:
+#line 1835 "asn1p_y.y"
{
char *p = malloc(strlen(yyvsp[0].tv_str) + 3);
int ret;
@@ -3234,14 +3190,14 @@ case 242:
free(yyvsp[0].tv_str);
;
break;}
-case 243:
-#line 1881 "asn1p_y.y"
+case 238:
+#line 1851 "asn1p_y.y"
{
yyval.tv_str = yyvsp[0].tv_str;
;
break;}
-case 244:
-#line 1884 "asn1p_y.y"
+case 239:
+#line 1854 "asn1p_y.y"
{
int l1 = strlen(yyvsp[-2].tv_str);
int l3 = strlen(yyvsp[0].tv_str);
@@ -3252,61 +3208,61 @@ case 244:
yyval.tv_str[l1 + 1 + l3] = '\0';
;
break;}
-case 245:
-#line 1902 "asn1p_y.y"
+case 240:
+#line 1872 "asn1p_y.y"
{
yyval.a_marker.flags = EM_NOMARK;
yyval.a_marker.default_value = 0;
;
break;}
-case 246:
-#line 1906 "asn1p_y.y"
+case 241:
+#line 1876 "asn1p_y.y"
{ yyval.a_marker = yyvsp[0].a_marker; ;
break;}
-case 247:
-#line 1910 "asn1p_y.y"
+case 242:
+#line 1880 "asn1p_y.y"
{
yyval.a_marker.flags = EM_OPTIONAL;
yyval.a_marker.default_value = 0;
;
break;}
-case 248:
-#line 1914 "asn1p_y.y"
+case 243:
+#line 1884 "asn1p_y.y"
{
yyval.a_marker.flags = EM_DEFAULT;
yyval.a_marker.default_value = yyvsp[0].a_value;
;
break;}
-case 249:
-#line 1937 "asn1p_y.y"
+case 244:
+#line 1907 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
;
break;}
-case 250:
-#line 1941 "asn1p_y.y"
+case 245:
+#line 1911 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-1].a_expr;
;
break;}
-case 251:
-#line 1947 "asn1p_y.y"
+case 246:
+#line 1917 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 252:
-#line 1952 "asn1p_y.y"
+case 247:
+#line 1922 "asn1p_y.y"
{
yyval.a_expr = yyvsp[-2].a_expr;
asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr);
;
break;}
-case 253:
-#line 1959 "asn1p_y.y"
+case 248:
+#line 1929 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -3315,8 +3271,8 @@ case 253:
yyval.a_expr->Identifier = yyvsp[0].tv_str;
;
break;}
-case 254:
-#line 1966 "asn1p_y.y"
+case 249:
+#line 1936 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -3326,8 +3282,8 @@ case 254:
yyval.a_expr->value = yyvsp[-1].a_value;
;
break;}
-case 255:
-#line 1974 "asn1p_y.y"
+case 250:
+#line 1944 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -3337,8 +3293,8 @@ case 255:
yyval.a_expr->value = yyvsp[-1].a_value;
;
break;}
-case 256:
-#line 1982 "asn1p_y.y"
+case 251:
+#line 1952 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -3347,8 +3303,8 @@ case 256:
yyval.a_expr->value = yyvsp[0].a_value;
;
break;}
-case 257:
-#line 1989 "asn1p_y.y"
+case 252:
+#line 1959 "asn1p_y.y"
{
yyval.a_expr = asn1p_expr_new(yylineno);
checkmem(yyval.a_expr);
@@ -3358,103 +3314,103 @@ case 257:
yyval.a_expr->meta_type = AMT_VALUE;
;
break;}
-case 258:
-#line 2000 "asn1p_y.y"
+case 253:
+#line 1970 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int);
checkmem(yyval.a_value);
;
break;}
-case 259:
-#line 2004 "asn1p_y.y"
+case 254:
+#line 1974 "asn1p_y.y"
{
yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int);
checkmem(yyval.a_value);
;
break;}
-case 260:
-#line 2035 "asn1p_y.y"
+case 255:
+#line 2005 "asn1p_y.y"
{ memset(&yyval.a_tag, 0, sizeof(yyval.a_tag)); ;
break;}
-case 261:
-#line 2036 "asn1p_y.y"
+case 256:
+#line 2006 "asn1p_y.y"
{ yyval.a_tag = yyvsp[0].a_tag; ;
break;}
-case 262:
-#line 2040 "asn1p_y.y"
+case 257:
+#line 2010 "asn1p_y.y"
{
yyval.a_tag = yyvsp[-1].a_tag;
yyval.a_tag.tag_mode = yyvsp[0].a_tag.tag_mode;
;
break;}
-case 263:
-#line 2047 "asn1p_y.y"
+case 258:
+#line 2017 "asn1p_y.y"
{
yyval.a_tag = yyvsp[-2].a_tag;
yyval.a_tag.tag_value = yyvsp[-1].a_int;
;
break;}
-case 264:
-#line 2053 "asn1p_y.y"
+case 259:
+#line 2023 "asn1p_y.y"
{ yyval.a_tag.tag_class = TC_CONTEXT_SPECIFIC; ;
break;}
-case 265:
-#line 2054 "asn1p_y.y"
+case 260:
+#line 2024 "asn1p_y.y"
{ yyval.a_tag.tag_class = TC_UNIVERSAL; ;
break;}
-case 266:
-#line 2055 "asn1p_y.y"
+case 261:
+#line 2025 "asn1p_y.y"
{ yyval.a_tag.tag_class = TC_APPLICATION; ;
break;}
-case 267:
-#line 2056 "asn1p_y.y"
+case 262:
+#line 2026 "asn1p_y.y"
{ yyval.a_tag.tag_class = TC_PRIVATE; ;
break;}
-case 268:
-#line 2060 "asn1p_y.y"
+case 263:
+#line 2030 "asn1p_y.y"
{ yyval.a_tag.tag_mode = TM_DEFAULT; ;
break;}
-case 269:
-#line 2061 "asn1p_y.y"
+case 264:
+#line 2031 "asn1p_y.y"
{ yyval.a_tag.tag_mode = TM_IMPLICIT; ;
break;}
-case 270:
-#line 2062 "asn1p_y.y"
+case 265:
+#line 2032 "asn1p_y.y"
{ yyval.a_tag.tag_mode = TM_EXPLICIT; ;
break;}
-case 271:
-#line 2066 "asn1p_y.y"
+case 266:
+#line 2036 "asn1p_y.y"
{
checkmem(yyvsp[0].tv_str);
yyval.tv_str = yyvsp[0].tv_str;
;
break;}
-case 272:
-#line 2070 "asn1p_y.y"
+case 267:
+#line 2040 "asn1p_y.y"
{
checkmem(yyvsp[0].tv_str);
yyval.tv_str = yyvsp[0].tv_str;
;
break;}
-case 273:
-#line 2078 "asn1p_y.y"
+case 268:
+#line 2048 "asn1p_y.y"
{
checkmem(yyvsp[0].tv_str);
yyval.tv_str = yyvsp[0].tv_str;
;
break;}
-case 274:
-#line 2085 "asn1p_y.y"
+case 269:
+#line 2055 "asn1p_y.y"
{ yyval.tv_str = 0; ;
break;}
-case 275:
-#line 2086 "asn1p_y.y"
+case 270:
+#line 2056 "asn1p_y.y"
{
yyval.tv_str = yyvsp[0].tv_str;
;
break;}
-case 276:
-#line 2091 "asn1p_y.y"
+case 271:
+#line 2061 "asn1p_y.y"
{
checkmem(yyvsp[0].tv_str);
yyval.tv_str = yyvsp[0].tv_str;
@@ -3682,7 +3638,7 @@ yyerrhandle:
}
return 1;
}
-#line 2097 "asn1p_y.y"
+#line 2067 "asn1p_y.y"
diff --git a/libasn1parser/asn1p_y.y b/libasn1parser/asn1p_y.y
index a4842e250581f6a6289b60678a4d09df4b4cb6bf..da06b4cf39032c7ad279e4cfac903f0b928fe819 100644
--- a/libasn1parser/asn1p_y.y
+++ b/libasn1parser/asn1p_y.y
@@ -234,9 +234,6 @@ static asn1p_value_t *
%type <a_expr> DefinedTypeRef
%type <a_expr> ValueSetDefinition /* Val INTEGER ::= {1|2} */
%type <a_expr> ValueDefinition /* val INTEGER ::= 1*/
-%type <a_expr> optValueSetBody
-%type <a_expr> ValueSetBody
-%type <a_expr> ValueSetElement
%type <a_value> Value
%type <a_value> DefinedValue
%type <a_value> SignedNumber
@@ -686,12 +683,13 @@ ExportsElement:
ValueSetDefinition:
- TypeRefName DefinedTypeRef TOK_PPEQ '{' optValueSetBody '}' {
+ TypeRefName DefinedTypeRef TOK_PPEQ
+ '{' { asn1p_lexer_hack_push_opaque_state(); } Opaque /* '}' */ {
$$ = $2;
assert($$->Identifier == 0);
$$->Identifier = $1;
$$->meta_type = AMT_VALUESET;
- // take care of optValueSetBody
+ // take care of ValueSet body
}
;
@@ -711,40 +709,12 @@ DefinedTypeRef:
}
;
-optValueSetBody:
- { }
- | ValueSetBody {
- }
- ;
-
-/*
- * X.680 does not permit ElementSetSpecs starting with ellipsis,
- * i.e. (..., A, B). This is very strange: the ElementSetSpecs is used
- * inside ValueSet, and ValueSets "in the wild" tend to have the first
- * ellipsis.
- */
-ValueSetBody:
- ValueSetElement {
- }
- | ValueSetBody ',' ValueSetElement {
- }
- ;
-
-ValueSetElement:
- TOK_ThreeDots {
- }
- | ElementSetSpec {
- }
- ;
-
-
/*
* Data Type Reference.
* === EXAMPLE ===
* Type3 ::= CHOICE { a Type1, b Type 2 }
* === EOF ===
*/
-
DataTypeReference:
/*
* Optionally tagged type definition.