diff options
Diffstat (limited to 'libasn1parser/asn1p_y.c')
| -rw-r--r-- | libasn1parser/asn1p_y.c | 1770 |
1 files changed, 894 insertions, 876 deletions
diff --git a/libasn1parser/asn1p_y.c b/libasn1parser/asn1p_y.c index 04b21053..f74538fb 100644 --- a/libasn1parser/asn1p_y.c +++ b/libasn1parser/asn1p_y.c @@ -139,6 +139,13 @@ void asn1p_lexer_hack_push_encoding_control(void); extern int asn1p_lineno; /* + * Process modifiers as <asn1c:pointer> + */ +extern int asn1p_as_pointer; +static asn1p_expr_t *asn1p_last_type; +static void apply_nonstd_mods(void); + +/* * This temporary variable is used to solve the shortcomings of 1-lookahead * parser. */ @@ -172,7 +179,7 @@ static void _fixup_anonymous_identifier(asn1p_expr_t *expr); } while(0) -#line 67 "asn1p_y.y" +#line 74 "asn1p_y.y" typedef union { asn1p_t *a_grammar; asn1p_module_flags_e a_module_flags; @@ -216,11 +223,11 @@ typedef union { -#define YYFINAL 429 +#define YYFINAL 434 #define YYFLAG -32768 #define YYNTBASE 118 -#define YYTRANSLATE(x) ((unsigned)(x) <= 356 ? yytranslate[x] : 221) +#define YYTRANSLATE(x) ((unsigned)(x) <= 356 ? yytranslate[x] : 226) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -273,138 +280,139 @@ static const short yyprhs[] = { 0, 205, 207, 209, 210, 212, 214, 218, 222, 226, 228, 231, 233, 237, 240, 242, 244, 250, 251, 253, 255, 259, 262, 267, 272, 273, 275, 276, 283, 285, 288, - 290, 292, 294, 298, 302, 306, 308, 313, 318, 323, - 330, 337, 339, 344, 349, 351, 355, 357, 361, 365, - 369, 371, 375, 377, 381, 383, 385, 387, 389, 394, - 398, 399, 403, 405, 407, 409, 411, 413, 415, 417, - 419, 421, 425, 427, 429, 431, 433, 436, 438, 440, - 442, 444, 447, 450, 452, 454, 457, 460, 462, 464, - 466, 468, 470, 473, 475, 478, 480, 482, 484, 486, + 290, 292, 294, 298, 302, 306, 307, 310, 312, 313, + 319, 320, 326, 327, 333, 340, 347, 349, 354, 359, + 361, 365, 367, 371, 375, 379, 381, 385, 387, 391, + 393, 395, 397, 399, 404, 408, 409, 413, 415, 417, + 419, 421, 423, 425, 427, 429, 431, 435, 437, 439, + 441, 443, 446, 448, 450, 452, 454, 457, 460, 462, + 464, 467, 470, 472, 474, 476, 478, 480, 483, 485, 488, 490, 492, 494, 496, 498, 500, 502, 504, 506, - 508, 510, 512, 514, 516, 517, 519, 521, 526, 530, - 535, 537, 541, 547, 549, 553, 557, 561, 565, 570, - 574, 576, 578, 582, 586, 590, 594, 596, 598, 599, - 605, 607, 610, 613, 617, 619, 621, 623, 625, 627, - 629, 631, 633, 637, 643, 645, 649, 651, 655, 656, - 658, 660, 662, 664, 666, 668, 672, 677, 679, 683, - 686, 690, 692, 696, 697, 699, 701, 704, 707, 711, - 713, 717, 719, 724, 729, 731, 733, 735, 737, 738, - 740, 743, 748, 749, 751, 753, 755, 756, 758, 760, - 762, 764, 766, 767, 769 + 508, 510, 512, 514, 516, 518, 520, 522, 524, 526, + 527, 529, 531, 536, 540, 545, 547, 551, 557, 559, + 563, 567, 571, 575, 580, 584, 586, 588, 592, 596, + 600, 604, 606, 608, 609, 615, 617, 620, 623, 627, + 629, 631, 633, 635, 637, 639, 641, 643, 647, 653, + 655, 659, 661, 665, 666, 668, 670, 672, 674, 676, + 678, 682, 687, 689, 693, 696, 700, 702, 706, 707, + 709, 711, 714, 717, 721, 723, 727, 729, 734, 739, + 741, 743, 745, 747, 748, 750, 753, 758, 759, 761, + 763, 765, 766, 768, 770, 772, 774, 776, 777, 779 }; static const short yyrhs[] = { 119, - 0, 120, 0, 119, 120, 0, 217, 121, 36, 125, + 0, 120, 0, 119, 120, 0, 222, 121, 36, 125, 3, 23, 128, 41, 0, 0, 122, 0, 105, 123, 106, 0, 105, 106, 0, 124, 0, 123, 124, 0, - 220, 0, 220, 107, 9, 108, 0, 9, 0, 0, + 225, 0, 225, 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, 138, 0, 144, 0, 171, 0, 141, 0, - 0, 40, 14, 131, 0, 180, 0, 56, 133, 109, + 132, 0, 138, 0, 144, 0, 176, 0, 141, 0, + 0, 40, 14, 131, 0, 185, 0, 56, 133, 109, 0, 56, 48, 0, 135, 0, 133, 135, 0, 0, - 122, 0, 136, 48, 217, 134, 0, 137, 0, 136, - 110, 137, 0, 217, 0, 217, 105, 106, 0, 220, + 122, 0, 136, 48, 222, 134, 0, 137, 0, 136, + 110, 137, 0, 222, 0, 222, 105, 106, 0, 225, 0, 44, 139, 109, 0, 44, 19, 109, 0, 44, - 109, 0, 140, 0, 139, 110, 140, 0, 217, 0, - 217, 105, 106, 0, 220, 0, 0, 217, 143, 3, - 105, 142, 176, 0, 166, 0, 177, 0, 217, 3, - 212, 89, 0, 217, 3, 164, 0, 217, 3, 154, - 0, 217, 105, 145, 106, 3, 164, 0, 146, 0, - 145, 110, 146, 0, 217, 0, 217, 111, 220, 0, - 217, 111, 217, 0, 177, 111, 220, 0, 148, 0, - 147, 110, 148, 0, 164, 0, 220, 0, 0, 150, - 0, 151, 0, 150, 110, 151, 0, 220, 164, 206, - 0, 32, 70, 164, 0, 163, 0, 164, 206, 0, - 153, 0, 152, 110, 153, 0, 220, 164, 0, 163, + 109, 0, 140, 0, 139, 110, 140, 0, 222, 0, + 222, 105, 106, 0, 225, 0, 0, 222, 143, 3, + 105, 142, 181, 0, 171, 0, 182, 0, 222, 3, + 217, 89, 0, 222, 3, 164, 0, 222, 3, 154, + 0, 222, 105, 145, 106, 3, 164, 0, 146, 0, + 145, 110, 146, 0, 222, 0, 222, 111, 225, 0, + 222, 111, 222, 0, 182, 111, 225, 0, 148, 0, + 147, 110, 148, 0, 164, 0, 225, 0, 0, 150, + 0, 151, 0, 150, 110, 151, 0, 225, 164, 211, + 0, 32, 70, 164, 0, 163, 0, 164, 211, 0, + 153, 0, 152, 110, 153, 0, 225, 164, 0, 163, 0, 164, 0, 30, 105, 156, 106, 158, 0, 0, - 90, 0, 157, 0, 156, 110, 157, 0, 169, 206, - 0, 169, 164, 155, 206, 0, 169, 169, 155, 206, + 90, 0, 157, 0, 156, 110, 157, 0, 174, 211, + 0, 174, 164, 155, 211, 0, 174, 174, 155, 211, 0, 0, 159, 0, 0, 97, 84, 105, 160, 161, - 106, 0, 162, 0, 161, 162, 0, 4, 0, 169, - 0, 104, 0, 104, 112, 174, 0, 104, 112, 211, - 0, 212, 165, 184, 0, 179, 0, 29, 105, 152, - 106, 0, 80, 105, 149, 106, 0, 81, 105, 149, - 106, 0, 80, 184, 70, 219, 212, 165, 0, 81, - 184, 70, 219, 212, 165, 0, 20, 0, 20, 37, - 27, 220, 0, 217, 105, 147, 106, 0, 166, 0, - 58, 70, 166, 0, 13, 0, 13, 113, 217, 0, - 218, 113, 217, 0, 13, 113, 220, 0, 218, 0, - 218, 113, 167, 0, 168, 0, 167, 113, 168, 0, - 170, 0, 170, 0, 15, 0, 16, 0, 220, 143, - 3, 172, 0, 220, 111, 172, 0, 0, 105, 173, - 176, 0, 65, 0, 47, 0, 88, 0, 5, 0, - 7, 0, 175, 0, 211, 0, 174, 0, 220, 0, - 217, 113, 220, 0, 6, 0, 10, 0, 11, 0, - 4, 0, 176, 4, 0, 26, 0, 65, 0, 78, - 0, 178, 0, 69, 83, 0, 67, 53, 0, 79, + 106, 0, 162, 0, 161, 162, 0, 4, 0, 174, + 0, 104, 0, 104, 112, 179, 0, 104, 112, 216, + 0, 217, 165, 189, 0, 0, 166, 167, 0, 184, + 0, 0, 29, 105, 152, 168, 106, 0, 0, 80, + 105, 149, 169, 106, 0, 0, 81, 105, 149, 170, + 106, 0, 80, 189, 70, 224, 217, 165, 0, 81, + 189, 70, 224, 217, 165, 0, 20, 0, 20, 37, + 27, 225, 0, 222, 105, 147, 106, 0, 171, 0, + 58, 70, 171, 0, 13, 0, 13, 113, 222, 0, + 223, 113, 222, 0, 13, 113, 225, 0, 223, 0, + 223, 113, 172, 0, 173, 0, 172, 113, 173, 0, + 175, 0, 175, 0, 15, 0, 16, 0, 225, 143, + 3, 177, 0, 225, 111, 177, 0, 0, 105, 178, + 181, 0, 65, 0, 47, 0, 88, 0, 5, 0, + 7, 0, 180, 0, 216, 0, 179, 0, 225, 0, + 222, 113, 225, 0, 6, 0, 10, 0, 11, 0, + 4, 0, 181, 4, 0, 26, 0, 65, 0, 78, + 0, 183, 0, 69, 83, 0, 67, 53, 0, 79, 0, 46, 0, 38, 73, 0, 28, 83, 0, 93, - 0, 49, 0, 180, 0, 60, 0, 42, 0, 24, - 83, 0, 177, 0, 178, 208, 0, 25, 0, 50, + 0, 49, 0, 185, 0, 60, 0, 42, 0, 24, + 83, 0, 182, 0, 183, 213, 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, 185, 0, 186, 0, - 82, 107, 187, 108, 0, 107, 187, 108, 0, 186, - 107, 187, 108, 0, 188, 0, 188, 110, 104, 0, - 188, 110, 104, 110, 188, 0, 189, 0, 19, 98, - 189, 0, 188, 181, 189, 0, 188, 182, 189, 0, - 189, 183, 189, 0, 192, 107, 187, 108, 0, 107, - 187, 108, 0, 193, 0, 194, 0, 193, 191, 193, - 0, 63, 191, 193, 0, 193, 191, 62, 0, 63, - 191, 62, 0, 200, 0, 195, 0, 0, 33, 27, - 105, 190, 176, 0, 103, 0, 103, 114, 0, 114, + 0, 100, 0, 98, 0, 0, 190, 0, 191, 0, + 82, 107, 192, 108, 0, 107, 192, 108, 0, 191, + 107, 192, 108, 0, 193, 0, 193, 110, 104, 0, + 193, 110, 104, 110, 193, 0, 194, 0, 19, 98, + 194, 0, 193, 186, 194, 0, 193, 187, 194, 0, + 194, 188, 194, 0, 197, 107, 192, 108, 0, 107, + 192, 108, 0, 198, 0, 199, 0, 198, 196, 198, + 0, 63, 196, 198, 0, 198, 196, 62, 0, 63, + 196, 62, 0, 205, 0, 200, 0, 0, 33, 27, + 105, 195, 181, 0, 103, 0, 103, 114, 0, 114, 103, 0, 114, 103, 114, 0, 82, 0, 48, 0, - 47, 0, 88, 0, 211, 0, 175, 0, 220, 0, - 217, 0, 97, 31, 186, 0, 97, 32, 105, 196, - 106, 0, 197, 0, 196, 110, 197, 0, 104, 0, - 220, 184, 198, 0, 0, 199, 0, 75, 0, 17, - 0, 71, 0, 201, 0, 202, 0, 105, 217, 106, - 0, 201, 105, 203, 106, 0, 204, 0, 203, 110, - 204, 0, 115, 205, 0, 115, 113, 205, 0, 220, - 0, 205, 113, 220, 0, 0, 207, 0, 71, 0, - 35, 172, 0, 105, 106, 0, 105, 209, 106, 0, - 210, 0, 209, 110, 210, 0, 220, 0, 220, 107, - 211, 108, 0, 220, 107, 174, 108, 0, 211, 0, - 104, 0, 9, 0, 12, 0, 0, 213, 0, 214, - 216, 0, 116, 215, 9, 117, 0, 0, 91, 0, + 47, 0, 88, 0, 216, 0, 180, 0, 225, 0, + 222, 0, 97, 31, 191, 0, 97, 32, 105, 201, + 106, 0, 202, 0, 201, 110, 202, 0, 104, 0, + 225, 189, 203, 0, 0, 204, 0, 75, 0, 17, + 0, 71, 0, 206, 0, 207, 0, 105, 222, 106, + 0, 206, 105, 208, 106, 0, 209, 0, 208, 110, + 209, 0, 115, 210, 0, 115, 113, 210, 0, 225, + 0, 210, 113, 225, 0, 0, 212, 0, 71, 0, + 35, 177, 0, 105, 106, 0, 105, 214, 106, 0, + 215, 0, 214, 110, 215, 0, 225, 0, 225, 107, + 216, 108, 0, 225, 107, 179, 108, 0, 216, 0, + 104, 0, 9, 0, 12, 0, 0, 218, 0, 219, + 221, 0, 116, 220, 9, 117, 0, 0, 91, 0, 21, 0, 77, 0, 0, 54, 0, 43, 0, 13, - 0, 14, 0, 14, 0, 0, 220, 0, 8, 0 + 0, 14, 0, 14, 0, 0, 225, 0, 8, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 313, 319, 325, 341, 366, 368, 371, 375, 380, 387, - 395, 400, 404, 413, 415, 423, 427, 435, 439, 442, - 445, 449, 469, 471, 479, 483, 515, 519, 528, 535, - 548, 555, 557, 569, 582, 593, 598, 604, 610, 612, - 615, 626, 632, 638, 645, 651, 659, 663, 666, 673, - 679, 685, 692, 698, 707, 709, 718, 726, 740, 752, - 758, 774, 783, 793, 803, 808, 815, 822, 832, 838, - 844, 848, 871, 873, 875, 881, 887, 894, 901, 904, - 911, 917, 923, 929, 932, 938, 948, 950, 953, 961, - 967, 976, 982, 999, 1001, 1006, 1010, 1015, 1020, 1026, - 1030, 1041, 1050, 1059, 1070, 1092, 1096, 1102, 1108, 1114, - 1124, 1134, 1140, 1154, 1178, 1185, 1199, 1208, 1218, 1228, - 1238, 1246, 1267, 1276, 1285, 1286, 1288, 1295, 1307, 1317, - 1325, 1325, 1330, 1335, 1340, 1345, 1349, 1353, 1356, 1359, - 1364, 1376, 1393, 1398, 1403, 1436, 1446, 1460, 1462, 1463, - 1464, 1465, 1466, 1467, 1468, 1469, 1470, 1471, 1472, 1473, - 1479, 1481, 1482, 1485, 1492, 1504, 1506, 1510, 1514, 1515, - 1516, 1517, 1518, 1522, 1523, 1524, 1525, 1529, 1530, 1537, - 1537, 1538, 1538, 1539, 1541, 1543, 1548, 1552, 1561, 1565, - 1570, 1574, 1580, 1590, 1594, 1597, 1600, 1603, 1608, 1617, - 1625, 1631, 1637, 1644, 1652, 1660, 1669, 1672, 1675, 1676, - 1686, 1688, 1689, 1690, 1693, 1697, 1702, 1708, 1713, 1716, - 1719, 1732, 1746, 1750, 1755, 1759, 1764, 1771, 1784, 1786, - 1789, 1793, 1796, 1801, 1805, 1813, 1828, 1834, 1841, 1854, - 1866, 1881, 1885, 1902, 1907, 1910, 1915, 1937, 1942, 1947, - 1953, 1959, 1967, 1975, 1983, 1990, 2000, 2005, 2035, 2037, - 2040, 2047, 2053, 2055, 2056, 2057, 2060, 2062, 2063, 2066, - 2071, 2078, 2085, 2087, 2092 + 321, 327, 333, 349, 374, 376, 379, 383, 388, 395, + 403, 408, 412, 421, 423, 431, 435, 443, 447, 450, + 453, 457, 477, 479, 487, 491, 523, 527, 536, 543, + 556, 563, 565, 577, 590, 601, 606, 612, 618, 620, + 623, 634, 640, 646, 653, 659, 667, 671, 674, 681, + 687, 693, 700, 706, 715, 717, 726, 734, 748, 760, + 766, 782, 791, 801, 811, 816, 823, 830, 840, 846, + 852, 856, 879, 881, 883, 889, 895, 902, 909, 912, + 919, 925, 931, 937, 940, 946, 956, 958, 961, 969, + 975, 984, 990, 1007, 1009, 1014, 1018, 1023, 1028, 1034, + 1038, 1049, 1058, 1067, 1078, 1101, 1102, 1106, 1110, 1110, + 1116, 1116, 1122, 1122, 1128, 1138, 1148, 1154, 1168, 1192, + 1199, 1213, 1222, 1232, 1242, 1252, 1260, 1281, 1290, 1299, + 1300, 1302, 1309, 1321, 1331, 1339, 1339, 1344, 1349, 1354, + 1359, 1363, 1367, 1370, 1373, 1378, 1390, 1407, 1412, 1417, + 1450, 1460, 1474, 1476, 1477, 1478, 1479, 1480, 1481, 1482, + 1483, 1484, 1485, 1486, 1487, 1493, 1495, 1496, 1499, 1506, + 1518, 1520, 1524, 1528, 1529, 1530, 1531, 1532, 1536, 1537, + 1538, 1539, 1543, 1544, 1551, 1551, 1552, 1552, 1553, 1555, + 1557, 1562, 1566, 1575, 1579, 1584, 1588, 1594, 1604, 1608, + 1611, 1614, 1617, 1622, 1631, 1639, 1645, 1651, 1658, 1666, + 1674, 1683, 1686, 1689, 1690, 1700, 1702, 1703, 1704, 1707, + 1711, 1716, 1722, 1727, 1730, 1733, 1746, 1760, 1764, 1769, + 1773, 1778, 1785, 1798, 1800, 1803, 1807, 1810, 1815, 1819, + 1827, 1842, 1848, 1855, 1868, 1880, 1895, 1899, 1916, 1921, + 1924, 1929, 1951, 1956, 1961, 1967, 1973, 1981, 1989, 1997, + 2004, 2014, 2019, 2049, 2051, 2054, 2061, 2067, 2069, 2070, + 2071, 2074, 2076, 2077, 2080, 2085, 2092, 2099, 2101, 2106 }; #endif @@ -442,18 +450,19 @@ static const char * const yytname[] = { "$","error","$undefined.","TOK_PPEQ", "optComponentTypeLists","ComponentTypeLists","ComponentType","AlternativeTypeLists", "AlternativeType","ClassDeclaration","optUnique","ClassFieldList","ClassField", "optWithSyntax","WithSyntax","@3","WithSyntaxFormat","WithSyntaxFormatToken", -"ExtensionAndException","Type","TypeDeclaration","ComplexTypeReference","ComplexTypeReferenceAmpList", -"ComplexTypeReferenceElement","ClassFieldIdentifier","ClassFieldName","ValueDefinition", -"Value","@4","DefinedValue","RestrictedCharacterStringValue","Opaque","BasicTypeId", -"BasicTypeId_UniverationCompatible","BasicType","BasicString","Union","Intersection", -"Except","optConstraints","Constraints","SetOfConstraints","ElementSetSpecs", -"ElementSetSpec","ConstraintSubtypeElement","@5","ConstraintRangeSpec","ConstraintSpec", -"SingleValue","ContainedSubtype","InnerTypeConstraint","WithComponentsList", -"WithComponentsElement","optPresenceConstraint","PresenceConstraint","TableConstraint", -"SimpleTableConstraint","ComponentRelationConstraint","AtNotationList","AtNotationElement", -"ComponentIdList","optMarker","Marker","UniverationDefinition","UniverationList", -"UniverationElement","SignedNumber","optTag","Tag","TagTypeValue","TagClass", -"TagPlicit","TypeRefName","ObjectClassReference","optIdentifier","Identifier", NULL +"ExtensionAndException","Type","TypeDeclaration","@4","TypeDeclarationSet","@5", +"@6","@7","ComplexTypeReference","ComplexTypeReferenceAmpList","ComplexTypeReferenceElement", +"ClassFieldIdentifier","ClassFieldName","ValueDefinition","Value","@8","DefinedValue", +"RestrictedCharacterStringValue","Opaque","BasicTypeId","BasicTypeId_UniverationCompatible", +"BasicType","BasicString","Union","Intersection","Except","optConstraints","Constraints", +"SetOfConstraints","ElementSetSpecs","ElementSetSpec","ConstraintSubtypeElement", +"@9","ConstraintRangeSpec","ConstraintSpec","SingleValue","ContainedSubtype", +"InnerTypeConstraint","WithComponentsList","WithComponentsElement","optPresenceConstraint", +"PresenceConstraint","TableConstraint","SimpleTableConstraint","ComponentRelationConstraint", +"AtNotationList","AtNotationElement","ComponentIdList","optMarker","Marker", +"UniverationDefinition","UniverationList","UniverationElement","SignedNumber", +"optTag","Tag","TagTypeValue","TagClass","TagPlicit","TypeRefName","ObjectClassReference", +"optIdentifier","Identifier", NULL }; #endif @@ -468,24 +477,24 @@ static const short yyr1[] = { 0, 148, 148, 149, 149, 150, 150, 151, 151, 151, 151, 152, 152, 153, 153, 153, 154, 155, 155, 156, 156, 157, 157, 157, 158, 158, 160, 159, 161, 161, 162, - 162, 163, 163, 163, 164, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 166, 166, 166, 166, - 166, 166, 167, 167, 168, 169, 170, 170, 171, 172, - 173, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 174, 174, 175, 175, 175, 176, 176, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 178, 178, 178, 179, 179, 180, 180, 180, 180, 180, - 180, 180, 180, 180, 180, 180, 180, 180, 180, 181, - 181, 182, 182, 183, 184, 184, 185, 185, 186, 186, - 187, 187, 187, 188, 188, 188, 188, 188, 189, 189, - 189, 189, 189, 189, 189, 189, 189, 189, 190, 189, - 191, 191, 191, 191, 192, 192, 193, 193, 193, 193, - 193, 194, 195, 195, 196, 196, 197, 197, 198, 198, - 199, 199, 199, 200, 200, 201, 202, 203, 203, 204, - 204, 205, 205, 206, 206, 207, 207, 208, 208, 209, - 209, 210, 210, 210, 210, 210, 211, 211, 212, 212, - 213, 214, 215, 215, 215, 215, 216, 216, 216, 217, - 217, 218, 219, 219, 220 + 162, 163, 163, 163, 164, 166, 165, 167, 168, 167, + 169, 167, 170, 167, 167, 167, 167, 167, 167, 167, + 167, 171, 171, 171, 171, 171, 171, 172, 172, 173, + 174, 175, 175, 176, 177, 178, 177, 177, 177, 177, + 177, 177, 177, 177, 177, 179, 179, 180, 180, 180, + 181, 181, 182, 182, 182, 182, 182, 182, 182, 182, + 182, 182, 182, 182, 182, 183, 183, 183, 184, 184, + 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 186, 186, 187, 187, 188, 189, + 189, 190, 190, 191, 191, 192, 192, 192, 193, 193, + 193, 193, 193, 194, 194, 194, 194, 194, 194, 194, + 194, 194, 194, 195, 194, 196, 196, 196, 196, 197, + 197, 198, 198, 198, 198, 198, 199, 200, 200, 201, + 201, 202, 202, 203, 203, 204, 204, 204, 205, 205, + 206, 207, 208, 208, 209, 209, 210, 210, 211, 211, + 212, 212, 213, 213, 214, 214, 215, 215, 215, 215, + 215, 216, 216, 217, 217, 218, 219, 220, 220, 220, + 220, 221, 221, 221, 222, 222, 223, 224, 224, 225 }; static const short yyr2[] = { 0, @@ -499,336 +508,306 @@ static const short yyr2[] = { 0, 1, 1, 0, 1, 1, 3, 3, 3, 1, 2, 1, 3, 2, 1, 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, 3, 3, 3, 0, 2, 1, 0, 5, + 0, 5, 0, 5, 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, 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 + 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 }; static const short yydefact[] = { 0, - 270, 271, 1, 2, 5, 3, 0, 0, 6, 275, + 275, 276, 1, 2, 5, 3, 0, 0, 6, 280, 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, 166, 0, 0, - 167, 168, 169, 0, 170, 171, 179, 172, 173, 174, - 175, 176, 177, 178, 0, 24, 25, 27, 28, 31, + 18, 21, 19, 0, 17, 12, 23, 171, 0, 0, + 172, 173, 174, 0, 175, 176, 184, 177, 178, 179, + 180, 181, 182, 183, 0, 24, 25, 27, 28, 31, 29, 30, 34, 0, 0, 32, 0, 49, 0, 50, 52, 54, 36, 0, 37, 0, 42, 44, 46, 4, - 26, 259, 117, 272, 0, 148, 0, 0, 162, 155, - 159, 161, 149, 0, 0, 150, 154, 158, 0, 0, - 57, 58, 151, 160, 121, 0, 33, 48, 47, 0, - 0, 35, 38, 0, 0, 0, 0, 263, 61, 60, - 0, 260, 267, 0, 163, 157, 156, 153, 152, 0, + 26, 264, 122, 277, 0, 153, 0, 0, 167, 160, + 164, 166, 154, 0, 0, 155, 159, 163, 0, 0, + 57, 58, 156, 165, 126, 0, 33, 48, 47, 0, + 0, 35, 38, 0, 0, 0, 0, 268, 61, 60, + 106, 265, 272, 0, 168, 162, 161, 158, 157, 0, 63, 0, 65, 0, 0, 0, 51, 53, 39, 43, - 45, 0, 265, 266, 264, 0, 117, 272, 112, 0, - 0, 185, 185, 59, 185, 115, 164, 151, 106, 0, - 269, 268, 261, 118, 120, 0, 0, 0, 0, 55, - 127, 128, 122, 123, 125, 119, 136, 143, 137, 257, - 144, 145, 258, 134, 133, 135, 131, 129, 140, 138, - 139, 0, 141, 40, 41, 0, 89, 259, 126, 0, - 0, 259, 0, 0, 259, 0, 0, 186, 187, 259, - 0, 105, 0, 165, 259, 259, 64, 68, 67, 66, - 0, 0, 0, 0, 0, 94, 0, 0, 246, 87, - 87, 91, 245, 0, 262, 0, 102, 0, 81, 84, - 85, 259, 116, 0, 0, 0, 74, 75, 79, 244, - 259, 0, 0, 217, 216, 0, 215, 218, 0, 0, - 0, 220, 0, 191, 194, 0, 201, 202, 208, 207, - 234, 235, 219, 222, 221, 273, 0, 0, 273, 256, - 248, 0, 250, 255, 252, 0, 69, 71, 72, 62, - 146, 56, 124, 132, 142, 130, 0, 86, 95, 90, - 247, 88, 244, 244, 113, 0, 107, 259, 83, 0, - 259, 108, 259, 80, 244, 0, 0, 211, 0, 0, - 0, 0, 0, 0, 189, 182, 183, 180, 181, 0, - 0, 0, 184, 0, 0, 0, 0, 259, 274, 0, - 109, 259, 249, 0, 0, 114, 259, 147, 0, 92, - 93, 103, 104, 141, 82, 188, 78, 76, 77, 195, - 209, 212, 213, 206, 204, 223, 0, 236, 200, 192, - 196, 197, 198, 0, 205, 203, 0, 0, 238, 0, - 190, 0, 251, 0, 0, 70, 96, 0, 214, 227, - 0, 225, 185, 0, 199, 0, 240, 242, 237, 0, - 110, 111, 254, 253, 0, 210, 224, 0, 229, 193, - 241, 0, 239, 100, 0, 98, 101, 226, 232, 233, - 231, 228, 230, 243, 97, 99, 0, 0, 0 + 45, 0, 270, 271, 269, 0, 59, 190, 0, 274, + 273, 266, 123, 125, 0, 0, 0, 0, 55, 132, + 133, 127, 128, 130, 124, 141, 148, 142, 262, 149, + 150, 263, 139, 138, 140, 136, 134, 145, 143, 144, + 0, 146, 40, 41, 0, 89, 264, 131, 0, 0, + 0, 105, 191, 192, 122, 277, 117, 0, 0, 190, + 190, 107, 120, 169, 156, 108, 0, 264, 64, 68, + 67, 66, 0, 0, 0, 0, 0, 94, 0, 0, + 251, 87, 87, 91, 250, 106, 267, 0, 0, 0, + 222, 221, 0, 220, 223, 0, 0, 0, 225, 0, + 196, 199, 0, 206, 207, 213, 212, 239, 240, 224, + 227, 226, 0, 0, 264, 0, 264, 0, 264, 0, + 0, 170, 264, 62, 151, 56, 129, 137, 147, 135, + 0, 86, 95, 90, 252, 88, 249, 249, 0, 0, + 0, 216, 0, 0, 0, 0, 0, 0, 194, 187, + 188, 185, 186, 0, 0, 0, 189, 0, 0, 0, + 0, 0, 0, 102, 109, 81, 84, 85, 264, 121, + 0, 111, 74, 75, 79, 249, 264, 278, 113, 278, + 261, 253, 0, 255, 260, 257, 0, 69, 71, 72, + 152, 0, 92, 93, 193, 200, 214, 217, 218, 211, + 209, 228, 0, 241, 205, 197, 201, 202, 203, 0, + 210, 208, 0, 0, 243, 195, 118, 0, 264, 0, + 83, 264, 0, 264, 80, 249, 264, 279, 0, 264, + 254, 0, 0, 119, 264, 96, 0, 219, 232, 0, + 230, 190, 0, 204, 0, 245, 247, 242, 0, 103, + 104, 146, 82, 110, 78, 112, 76, 77, 106, 114, + 106, 256, 0, 0, 70, 0, 215, 229, 0, 234, + 198, 246, 0, 244, 115, 116, 259, 258, 100, 0, + 98, 101, 231, 237, 238, 236, 233, 235, 248, 97, + 99, 0, 0, 0 }; -static const short yydefgoto[] = { 427, +static const short yydefgoto[] = { 432, 3, 4, 8, 9, 13, 14, 25, 26, 27, 55, - 56, 57, 107, 58, 74, 195, 75, 76, 77, 59, - 69, 70, 60, 221, 100, 61, 130, 131, 286, 287, - 246, 247, 248, 238, 239, 119, 303, 196, 197, 298, - 299, 405, 415, 416, 249, 250, 155, 156, 173, 174, - 198, 199, 62, 188, 223, 189, 262, 292, 157, 103, - 159, 104, 331, 332, 334, 207, 208, 209, 263, 264, - 265, 388, 320, 266, 267, 268, 269, 391, 392, 422, - 423, 270, 271, 272, 378, 379, 397, 232, 233, 214, - 282, 283, 273, 234, 122, 123, 146, 163, 274, 105, - 338, 275 + 56, 57, 107, 58, 74, 184, 75, 76, 77, 59, + 69, 70, 60, 213, 100, 61, 130, 131, 327, 328, + 312, 313, 314, 305, 306, 119, 277, 185, 186, 272, + 273, 406, 420, 421, 315, 316, 148, 149, 202, 360, + 363, 369, 101, 162, 163, 187, 188, 62, 177, 215, + 178, 239, 266, 102, 103, 206, 104, 295, 296, 298, + 192, 193, 194, 240, 241, 242, 377, 284, 243, 244, + 245, 246, 380, 381, 427, 428, 247, 248, 249, 354, + 355, 386, 224, 225, 262, 323, 324, 250, 226, 122, + 123, 146, 152, 251, 105, 367, 252 }; -static const short yypact[] = { 72, --32768,-32768, 72,-32768, -69,-32768, 36, 58,-32768,-32768, --32768,-32768, 60,-32768, -48, 137,-32768,-32768, 32, 79, - 69, 74, 142, 106, 162, 137,-32768, 116,-32768,-32768, --32768,-32768,-32768, 218,-32768,-32768, 508,-32768, 232, 38, --32768,-32768,-32768, 127,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768, 208, 508,-32768,-32768,-32768,-32768, --32768,-32768,-32768, 358, 737,-32768, 156,-32768, 95,-32768, - 168,-32768,-32768, 47,-32768, -10,-32768, 169,-32768,-32768, --32768, 23, 174,-32768, 205,-32768, 212, 224,-32768,-32768, --32768,-32768,-32768, 243, 215,-32768,-32768,-32768, 812, 297, --32768,-32768,-32768,-32768, 189, 300,-32768,-32768,-32768, 223, - 198,-32768,-32768, 72, 223, 201, 203, 6,-32768,-32768, - 585,-32768, 48, 223,-32768,-32768,-32768,-32768,-32768, 62, --32768, 200, 202, 204, 263, 466,-32768,-32768, -69,-32768, --32768, 199,-32768,-32768,-32768, 301, -40, 207, 277, 210, - 247, 66, 76,-32768, -18,-32768,-32768, 213,-32768, 217, --32768,-32768,-32768,-32768,-32768, 316, 812, 312, 223,-32768, --32768,-32768, 216,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +static const short yypact[] = { 194, +-32768,-32768, 194,-32768, -46,-32768, 47, 35,-32768,-32768, +-32768,-32768, 55,-32768, -34, 133,-32768,-32768, 69, 34, + 14, 26, 71, 53, 170, 133,-32768, 80,-32768,-32768, +-32768,-32768,-32768, 167,-32768,-32768, 422,-32768, 208, 4, +-32768,-32768,-32768, 66,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768, 188, 422,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 347, 574,-32768, 126,-32768, 49,-32768, + 138,-32768,-32768, 33,-32768, -21,-32768, 146,-32768,-32768, +-32768, -17, 140,-32768, 190,-32768, 199, 204,-32768,-32768, +-32768,-32768,-32768, 232, 203,-32768,-32768,-32768, 649, 285, +-32768,-32768,-32768,-32768, 176, 289,-32768,-32768,-32768, 198, + 189,-32768,-32768, 194, 198, 191, 200, 5,-32768,-32768, + 215,-32768, -18, 198,-32768,-32768,-32768,-32768,-32768, 28, +-32768, 195, 196, 205, 256, 312,-32768,-32768, -46,-32768, +-32768, 260,-32768,-32768,-32768, 299,-32768, -10, 499,-32768, +-32768,-32768,-32768,-32768, 306, 649, 304, 198,-32768,-32768, +-32768, 202,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 214, 217,-32768,-32768, 65,-32768, 27,-32768, 212, 209, + 186,-32768,-32768, 223, 67, 226, 295, 229, 265, -22, + -13,-32768,-32768,-32768, 233,-32768, 236, 221,-32768,-32768, +-32768,-32768, 336, 260, 336, 304, 312, 245, 260, 312, +-32768, 253, 253,-32768,-32768,-32768,-32768, 186, 246, 318, +-32768,-32768, 90,-32768,-32768, 235, 194, 186,-32768, 239, + 145, 255, 242, 90,-32768,-32768,-32768, 249,-32768,-32768, +-32768,-32768, 186, 328, 7, 266, 3, 292, 3, 293, + 42,-32768, 2,-32768,-32768, 360,-32768, 360,-32768,-32768, + 283,-32768,-32768,-32768,-32768,-32768, -1, -1, 261, 251, + 269, 262, 267, 154, 273, 276, 277, 274,-32768,-32768, +-32768,-32768,-32768, 280, 251, 251,-32768, 251, 186, 448, + 271, 279, 304, 278, 281,-32768,-32768,-32768, 221,-32768, + 322,-32768, 291,-32768,-32768, -1, 221, 304,-32768, 304, +-32768,-32768, 75,-32768,-32768, 288, 108,-32768,-32768,-32768, +-32768, 298,-32768,-32768,-32768,-32768,-32768,-32768, 290,-32768, +-32768, 223, 11,-32768,-32768, 300,-32768,-32768,-32768, 297, +-32768,-32768, 8, 111,-32768,-32768,-32768, 218, 7, 282, +-32768, 221, 303, 6,-32768, -1, 221,-32768, 305, 221, +-32768, 36, 218,-32768, 2,-32768, 336,-32768,-32768, 114, +-32768, -10, 186,-32768, 304, 307,-32768,-32768, 271,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768, 220, 221,-32768,-32768, 101,-32768, 27,-32768, 206, - 298, 11, 219, 227, 0, 242, 256,-32768, 228, 0, - 257,-32768, 17,-32768, 12, 225,-32768,-32768,-32768,-32768, - 324, 199, 324, 312, 466, 234, 199, 466,-32768, 252, - 252,-32768,-32768, 662,-32768, 312, 231, 110,-32768,-32768, --32768, 225,-32768, 242, 275, 238, 236,-32768,-32768, 21, - 225, 250, 323,-32768,-32768, -2,-32768,-32768, 226, 72, - 242,-32768, 244, 100, 253, 246, -2,-32768,-32768,-32768, - 249,-32768,-32768,-32768,-32768, 312, 242, 251, 312,-32768, --32768, 124,-32768,-32768, 258, 133,-32768,-32768,-32768,-32768, --32768, 352,-32768, 352,-32768,-32768, 279,-32768,-32768,-32768, --32768,-32768, 21, 21,-32768, 214,-32768, 11,-32768, 259, - 225,-32768, 3,-32768, 21, 456, 254, 255, 261, 178, - 266, 269, 260, 267,-32768,-32768,-32768,-32768,-32768, 264, - 456, 456,-32768, 456, 242, 274, 262, 225,-32768, 268, --32768, 225,-32768, 63, 214,-32768, 12,-32768, 273,-32768, +-32768,-32768, 310, 311,-32768, 187, 360,-32768, 11, 15, + 201, 307, 304,-32768,-32768,-32768,-32768,-32768,-32768, 24, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768, 265,-32768,-32768, 228, 40,-32768,-32768, 248, --32768,-32768,-32768, 272,-32768,-32768, 9, 158,-32768, 662, --32768, 662,-32768, 280, 283,-32768,-32768, 324,-32768,-32768, - 161,-32768, -18, 242,-32768, 312, 281,-32768,-32768, 262, --32768,-32768,-32768,-32768, 148, 352,-32768, 40, 5, 192, - 281, 312,-32768,-32768, 24,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 381, 385,-32768 +-32768, 421, 424,-32768 }; static const short yypgoto[] = {-32768, --32768, 384,-32768, 276,-32768, 380,-32768,-32768, 369,-32768, --32768, 341,-32768,-32768,-32768,-32768, 325,-32768, 287,-32768, --32768, 288,-32768,-32768, 338,-32768,-32768, 239,-32768, 64, - 211,-32768, 99,-32768, 105,-32768, 183,-32768, 190,-32768, --32768,-32768,-32768, 1, -190, -66, -303, -50,-32768, 209, - -196, -117,-32768, -71,-32768, -275, -115, -218, -41, -120, --32768, 26,-32768,-32768,-32768, -146,-32768, 107, -166, 28, - -138,-32768, 153,-32768, -246,-32768,-32768,-32768, 22,-32768, --32768,-32768,-32768,-32768,-32768, 29, 37, -216,-32768,-32768, --32768, 88, -132, -79,-32768,-32768,-32768,-32768, 10,-32768, - 159, -7 +-32768, 419,-32768, 294,-32768, 414,-32768,-32768, 402,-32768, +-32768, 373,-32768,-32768,-32768,-32768, 357,-32768, 323,-32768, +-32768, 327,-32768,-32768, 379,-32768,-32768, 308,-32768, 70, + 192,-32768, 82,-32768, 89,-32768, 227,-32768, 230,-32768, +-32768,-32768,-32768, 41, -235, -81, -370,-32768,-32768,-32768, +-32768,-32768, -140,-32768, 241, -183, -113,-32768, -115,-32768, + -292, -68, -210, -24, 314,-32768, 20,-32768,-32768,-32768, + -193,-32768, 168, -84, 84, -112,-32768, 224,-32768, -196, +-32768,-32768,-32768, 56,-32768,-32768,-32768,-32768,-32768,-32768, + 81, 86, -225,-32768,-32768,-32768, 97, -133, -80,-32768, +-32768,-32768,-32768, 21,-32768, 155, -7 }; -#define YYLAST 908 +#define YYLAST 745 static const short yytable[] = { 15, - 158, 231, 121, 191, 294, 15, 211, 10, 212, 5, - 10, 240, 5, 101, 101, 120, 10, 175, 10, 10, - 190, 419, 102, 102, 10, 180, 143, 414, 183, 65, - 352, 245, 72, 314, 245, 7, 79, 114, 171, 172, - 28, 171, 172, 10, 11, 10, 64, 10, 65, 71, - 1, 2, 117, 78, 10, 228, 67, 132, 19, 1, - 2, 228, 63, 204, -270, 64, 79, 10, 11, 384, - 10, 180, 124, 365, 183, 420, 401, 310, 402, 421, - 284, 63, 144, 78, 1, 2, 350, 351, 206, 376, - 161, 229, 191, 16, 324, 191, 145, 229, 359, 115, - 318, 162, 72, 237, 175, -73, 237, 79, 133, 190, - 340, 319, 190, 158, 237, 118, 165, 240, 118, 71, - 280, 396, 281, 139, 78, 132, 118, 118, 193, 425, - 160, 230, -244, 164, 10, 241, -244, 29, 118, 1, - 2, 12, 118, 390, 176, 192, 68, 204, 288, 290, - 20, 414, 243, 296, 30, 112, 301, 204, 21, 31, - 218, 220, 171, 172, 34, 17, 280, 166, 374, 406, - 205, 167, 206, 353, 73, 309, 133, 360, 219, 22, - 210, 23, 206, 178, 315, 10, 180, 181, 182, 183, - 24, 33, 371, 372, 242, 373, 32, 251, 326, 327, - 328, 329, 251, 109, 110, 285, 226, 289, 417, 330, - 227, 284, 385, 171, 172, 307, 295, 193, 417, 308, - 193, 10, 180, 36, 254, 183, 1, 2, 305, 343, - 10, 83, 84, 344, 192, 1, 2, 192, 346, 364, - 37, 241, 347, 160, 357, 66, 409, 178, 80, 10, - 180, 181, 182, 183, 1, 2, 321, 322, 380, 158, - 252, 158, 382, 399, 108, 258, 407, 400, 339, 323, - 408, 339, 111, 116, 253, 1, 2, 171, 172, 178, - 288, 10, 180, 181, 182, 183, 124, 125, 254, 255, - 326, 327, 328, 329, 126, 128, 127, 129, 354, 134, - 242, 135, 136, 138, 256, 251, 141, 142, 170, 200, - 168, -271, 169, 201, 202, 192, 203, 213, 216, 10, - 254, 215, 235, 257, 236, 276, 279, 291, 222, 258, - 297, 225, 224, 244, 277, 375, 285, 354, 259, 289, - 118, 302, 306, 312, 311, 313, 260, 316, 261, 317, - 333, 325, 335, 337, 192, 348, 341, 394, 361, 393, - 82, 258, 349, 363, 345, 368, 356, 370, 362, 398, - 83, 84, 206, 367, 369, 381, 377, 387, 389, 395, - 428, 85, 38, 86, 429, 87, 6, 403, 398, 160, - 404, 160, 18, 412, 35, 88, 81, 137, 113, 89, - 393, 140, 106, 90, 424, 217, 91, 41, 42, 43, - 386, 358, 355, 304, 194, 426, 300, 92, 45, 336, - 278, 410, 93, 46, 94, 47, 95, 366, 413, 418, - 293, 383, 411, 48, 0, 96, 97, 342, 0, 0, - 0, 0, 49, 0, 50, 0, 0, 0, 0, 51, - 98, 52, 53, 54, 0, 0, 0, 0, 0, 0, - 0, 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, 253, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 254, 255, 0, 0, 0, 0, 0, 0, - 0, 0, 184, 0, 0, 10, 0, 0, 256, 0, - 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, - 185, 0, 38, 0, 0, 0, 0, 257, 0, 0, - 0, 0, 0, 258, 0, 0, 0, 39, 0, 0, - 0, 40, 259, 186, 0, 0, 0, 41, 42, 43, - 260, 0, 261, 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, 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 + 120, 121, 180, 223, 268, 15, 258, 260, 203, 10, + 10, 10, 117, 10, 10, 10, 1, 2, 10, 307, + 5, 164, 67, 5, 150, 143, 114, 419, 415, 65, + 416, 424, 72, 220, 311, 151, 79, 311, 160, 161, + 10, 160, 161, 10, 169, 1, 2, 172, 65, 10, + 169, 333, 334, 172, 10, 11, 63, 64, 7, 190, + 71, 220, 10, 11, 78, 390, 79, 179, 190, 221, + 16, 190, 19, 10, 132, 63, 64, 28, 1, 2, + 403, 144, 257, 180, 191, 425, 180, 341, 115, 426, + 365, 259, 29, 191, 78, 145, 191, 221, 118, 30, + 164, 270, 72, 352, 275, 222, 304, 79, -73, 304, + 304, 31, 68, 73, 379, 310, 154, 118, 118, 133, + 385, 118, 118, 307, 204, 32, 264, 325, 182, 430, + 71, 132, -249, 155, 139, 78, -249, 156, 33, 321, + 398, 112, 118, 279, 153, 321, 20, 322, 179, 210, + 212, 179, 12, 288, 21, 165, 181, 109, 110, 167, + 17, 10, 169, 170, 171, 172, 407, 336, 302, 207, + 218, -275, 34, 308, 219, 22, 133, 23, 211, 124, + 371, 329, 347, 348, 372, 349, 24, 36, 410, 37, + 419, 167, 282, 10, 169, 170, 171, 172, 1, 2, + 231, 160, 161, 283, 229, 10, 1, 2, 269, 182, + 1, 2, 182, 374, 350, 340, 388, 375, 230, 408, + 389, 66, 422, 409, 391, 10, 169, 361, 80, 172, + 1, 2, 231, 232, 108, 366, 422, 181, 325, 404, + 181, 235, 111, 290, 291, 292, 293, 309, 233, 317, + 116, 317, 124, 326, 294, 330, 167, 287, 10, 169, + 170, 171, 172, 1, 2, 285, 286, 234, 1, 2, + 160, 161, 125, 235, 160, 161, 127, 308, 83, 84, + 395, 126, 236, 230, 128, 129, 399, 134, 135, 401, + 237, 136, 238, 329, 138, 357, 141, 231, 232, 290, + 291, 292, 293, 147, 142, 157, 158, 189, 208, 159, + 368, 10, 368, 233, 214, 228, 166, 167, 168, 10, + 169, 170, 171, 172, 1, 2, 216, 217, 227, 253, + -276, 254, 234, 255, 256, 382, 118, 261, 235, 265, + 263, 271, 276, 280, 281, 387, 289, 236, 299, 82, + 392, 309, 297, 301, 303, 237, 317, 238, 173, 83, + 84, 318, 320, 331, 326, 392, 332, 330, 335, 339, + 85, 38, 86, 337, 87, 338, 174, 387, 181, 191, + 343, 345, 344, 346, 88, 353, 356, 394, 89, 358, + 359, 362, 90, 181, 373, 91, 41, 42, 43, 175, + 364, 382, 376, 378, 384, 429, 92, 45, 396, 383, + 400, 93, 46, 94, 47, 95, 176, 417, 418, 413, + 433, 6, 48, 434, 96, 97, 18, 35, 81, 10, + 113, 49, 183, 50, 1, 2, 137, 140, 51, 98, + 52, 53, 54, 106, 405, 397, 38, 393, 274, 278, + 319, 99, 342, 167, 267, 10, 169, 170, 171, 172, + 431, 39, 205, 209, 423, 40, 411, 300, 402, 414, + 412, 41, 42, 43, 370, 0, 0, 44, 0, 0, + 0, 0, 45, 0, 0, 0, 0, 46, 0, 47, + 0, 0, 0, 0, 231, 0, 0, 48, 0, 0, + 0, 0, 0, 0, 0, 0, 49, 0, 50, 351, + 0, 195, 196, 51, 0, 52, 53, 54, 197, 0, + 0, 0, 85, 38, 86, 0, 87, 198, 0, 0, + 0, 0, 0, 0, 0, 235, 88, 0, 0, 0, + 89, 0, 0, 0, 90, 0, 0, 91, 41, 42, + 43, 0, 0, 0, 0, 0, 199, 0, 92, 45, + 0, 0, 0, 93, 46, 94, 47, 95, 0, 0, + 0, 0, 0, 0, 48, 0, 96, 97, 200, 201, + 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, 198, 82, 136, 223, 13, 153, 8, 155, 0, - 8, 202, 3, 64, 65, 82, 8, 135, 8, 8, - 136, 17, 64, 65, 8, 9, 21, 4, 12, 37, - 306, 32, 40, 250, 32, 105, 44, 48, 15, 16, - 9, 15, 16, 8, 9, 8, 37, 8, 56, 40, - 13, 14, 30, 44, 8, 35, 19, 99, 107, 13, - 14, 35, 37, 82, 105, 56, 74, 8, 9, 345, - 8, 9, 113, 320, 12, 71, 380, 244, 382, 75, - 213, 56, 77, 74, 13, 14, 303, 304, 107, 336, - 43, 71, 225, 36, 261, 228, 91, 71, 315, 110, - 103, 54, 110, 104, 222, 106, 104, 115, 99, 225, - 277, 114, 228, 234, 104, 116, 124, 308, 116, 110, - 104, 113, 106, 114, 115, 167, 116, 116, 136, 106, - 121, 198, 106, 124, 8, 202, 110, 59, 116, 13, - 14, 106, 116, 104, 135, 136, 109, 82, 215, 216, - 14, 4, 203, 225, 86, 109, 228, 82, 22, 86, - 168, 169, 15, 16, 3, 106, 104, 106, 335, 388, - 105, 110, 107, 306, 48, 242, 167, 316, 169, 43, - 105, 45, 107, 6, 251, 8, 9, 10, 11, 12, - 54, 86, 331, 332, 202, 334, 55, 205, 99, 100, - 101, 102, 210, 109, 110, 213, 106, 215, 405, 110, - 110, 344, 345, 15, 16, 106, 224, 225, 415, 110, - 228, 8, 9, 108, 47, 12, 13, 14, 236, 106, - 8, 13, 14, 110, 225, 13, 14, 228, 106, 62, - 23, 308, 110, 234, 311, 14, 393, 6, 41, 8, - 9, 10, 11, 12, 13, 14, 31, 32, 338, 380, - 19, 382, 342, 106, 109, 88, 106, 110, 276, 260, - 110, 279, 105, 105, 33, 13, 14, 15, 16, 6, - 347, 8, 9, 10, 11, 12, 113, 83, 47, 48, - 99, 100, 101, 102, 83, 53, 73, 83, 306, 3, - 308, 113, 3, 106, 63, 313, 106, 105, 105, 9, - 111, 105, 111, 37, 105, 306, 70, 105, 3, 8, - 47, 105, 117, 82, 27, 70, 70, 4, 113, 88, - 97, 111, 113, 107, 107, 62, 344, 345, 97, 347, - 116, 90, 112, 106, 70, 110, 105, 98, 107, 27, - 98, 108, 107, 105, 345, 4, 106, 110, 105, 367, - 3, 88, 84, 103, 107, 106, 108, 104, 114, 377, - 13, 14, 107, 105, 108, 108, 115, 105, 114, 108, - 0, 24, 25, 26, 0, 28, 3, 108, 396, 380, - 108, 382, 13, 113, 26, 38, 56, 110, 74, 42, - 408, 115, 65, 46, 412, 167, 49, 50, 51, 52, - 347, 313, 308, 231, 139, 415, 227, 60, 61, 267, - 210, 394, 65, 66, 67, 68, 69, 321, 400, 408, - 222, 344, 396, 76, -1, 78, 79, 279, -1, -1, - -1, -1, 85, -1, 87, -1, -1, -1, -1, 92, - 93, 94, 95, 96, -1, -1, -1, -1, -1, -1, - -1, 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, -1, -1, -1, -1, -1, - -1, -1, 47, 48, -1, -1, -1, -1, -1, -1, - -1, -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, -1, 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, -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 + 82, 82, 136, 187, 215, 13, 200, 201, 149, 8, + 8, 8, 30, 8, 8, 8, 13, 14, 8, 255, + 0, 135, 19, 3, 43, 21, 48, 4, 399, 37, + 401, 17, 40, 35, 32, 54, 44, 32, 15, 16, + 8, 15, 16, 8, 9, 13, 14, 12, 56, 8, + 9, 277, 278, 12, 8, 9, 37, 37, 105, 82, + 40, 35, 8, 9, 44, 358, 74, 136, 82, 71, + 36, 82, 107, 8, 99, 56, 56, 9, 13, 14, + 373, 77, 105, 217, 107, 71, 220, 284, 110, 75, + 316, 105, 59, 107, 74, 91, 107, 71, 116, 86, + 214, 217, 110, 300, 220, 187, 104, 115, 106, 104, + 104, 86, 109, 48, 104, 256, 124, 116, 116, 99, + 113, 116, 116, 359, 149, 55, 208, 261, 136, 106, + 110, 156, 106, 106, 114, 115, 110, 110, 86, 104, + 366, 109, 116, 228, 124, 104, 14, 106, 217, 157, + 158, 220, 106, 238, 22, 135, 136, 109, 110, 6, + 106, 8, 9, 10, 11, 12, 377, 280, 253, 149, + 106, 105, 3, 255, 110, 43, 156, 45, 158, 113, + 106, 263, 295, 296, 110, 298, 54, 108, 382, 23, + 4, 6, 103, 8, 9, 10, 11, 12, 13, 14, + 47, 15, 16, 114, 19, 8, 13, 14, 216, 217, + 13, 14, 220, 106, 299, 62, 106, 110, 33, 106, + 110, 14, 406, 110, 358, 8, 9, 309, 41, 12, + 13, 14, 47, 48, 109, 317, 420, 217, 372, 373, + 220, 88, 105, 99, 100, 101, 102, 255, 63, 257, + 105, 259, 113, 261, 110, 263, 6, 237, 8, 9, + 10, 11, 12, 13, 14, 31, 32, 82, 13, 14, + 15, 16, 83, 88, 15, 16, 73, 359, 13, 14, + 362, 83, 97, 33, 53, 83, 367, 3, 113, 370, + 105, 3, 107, 375, 106, 303, 106, 47, 48, 99, + 100, 101, 102, 89, 105, 111, 111, 9, 3, 105, + 318, 8, 320, 63, 113, 107, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 113, 111, 117, 107, + 105, 37, 82, 105, 70, 343, 116, 105, 88, 4, + 105, 97, 90, 98, 27, 353, 108, 97, 107, 3, + 358, 359, 98, 105, 27, 105, 364, 107, 47, 13, + 14, 70, 70, 4, 372, 373, 84, 375, 108, 103, + 24, 25, 26, 105, 28, 114, 65, 385, 358, 107, + 105, 108, 106, 104, 38, 115, 108, 106, 42, 112, + 110, 70, 46, 373, 107, 49, 50, 51, 52, 88, + 110, 409, 105, 114, 108, 413, 60, 61, 106, 110, + 106, 65, 66, 67, 68, 69, 105, 108, 108, 113, + 0, 3, 76, 0, 78, 79, 13, 26, 56, 8, + 74, 85, 139, 87, 13, 14, 110, 115, 92, 93, + 94, 95, 96, 65, 375, 364, 25, 359, 219, 223, + 259, 105, 285, 6, 214, 8, 9, 10, 11, 12, + 420, 40, 149, 156, 409, 44, 383, 244, 372, 389, + 385, 50, 51, 52, 320, -1, -1, 56, -1, -1, + -1, -1, 61, -1, -1, -1, -1, 66, -1, 68, + -1, -1, -1, -1, 47, -1, -1, 76, -1, -1, + -1, -1, -1, -1, -1, -1, 85, -1, 87, 62, + -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, 88, 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" @@ -1374,13 +1353,13 @@ yyreduce: switch (yyn) { case 1: -#line 314 "asn1p_y.y" +#line 322 "asn1p_y.y" { *(void **)param = yyvsp[0].a_grammar; ; break;} case 2: -#line 320 "asn1p_y.y" +#line 328 "asn1p_y.y" { yyval.a_grammar = asn1p_new(); checkmem(yyval.a_grammar); @@ -1388,14 +1367,14 @@ case 2: ; break;} case 3: -#line 325 "asn1p_y.y" +#line 333 "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 346 "asn1p_y.y" +#line 354 "asn1p_y.y" { if(yyvsp[-1].a_module) { @@ -1412,27 +1391,27 @@ case 4: ; break;} case 5: -#line 367 "asn1p_y.y" +#line 375 "asn1p_y.y" { yyval.a_oid = 0; ; break;} case 6: -#line 368 "asn1p_y.y" +#line 376 "asn1p_y.y" { yyval.a_oid = yyvsp[0].a_oid; ; break;} case 7: -#line 372 "asn1p_y.y" +#line 380 "asn1p_y.y" { yyval.a_oid = yyvsp[-1].a_oid; ; break;} case 8: -#line 375 "asn1p_y.y" +#line 383 "asn1p_y.y" { yyval.a_oid = 0; ; break;} case 9: -#line 381 "asn1p_y.y" +#line 389 "asn1p_y.y" { yyval.a_oid = asn1p_oid_new(); asn1p_oid_add_arc(yyval.a_oid, &yyvsp[0].a_oid_arc); @@ -1441,7 +1420,7 @@ case 9: ; break;} case 10: -#line 387 "asn1p_y.y" +#line 395 "asn1p_y.y" { yyval.a_oid = yyvsp[-1].a_oid; asn1p_oid_add_arc(yyval.a_oid, &yyvsp[0].a_oid_arc); @@ -1450,74 +1429,74 @@ case 10: ; break;} case 11: -#line 396 "asn1p_y.y" +#line 404 "asn1p_y.y" { /* iso */ yyval.a_oid_arc.name = yyvsp[0].tv_str; yyval.a_oid_arc.number = -1; ; break;} case 12: -#line 400 "asn1p_y.y" +#line 408 "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 404 "asn1p_y.y" +#line 412 "asn1p_y.y" { /* 1 */ yyval.a_oid_arc.name = 0; yyval.a_oid_arc.number = yyvsp[0].a_int; ; break;} case 14: -#line 414 "asn1p_y.y" +#line 422 "asn1p_y.y" { yyval.a_module_flags = MSF_NOFLAGS; ; break;} case 15: -#line 415 "asn1p_y.y" +#line 423 "asn1p_y.y" { yyval.a_module_flags = yyvsp[0].a_module_flags; ; break;} case 16: -#line 424 "asn1p_y.y" +#line 432 "asn1p_y.y" { yyval.a_module_flags = yyvsp[0].a_module_flags; ; break;} case 17: -#line 427 "asn1p_y.y" +#line 435 "asn1p_y.y" { yyval.a_module_flags = yyvsp[-1].a_module_flags | yyvsp[0].a_module_flags; ; break;} case 18: -#line 436 "asn1p_y.y" +#line 444 "asn1p_y.y" { yyval.a_module_flags = MSF_EXPLICIT_TAGS; ; break;} case 19: -#line 439 "asn1p_y.y" +#line 447 "asn1p_y.y" { yyval.a_module_flags = MSF_IMPLICIT_TAGS; ; break;} case 20: -#line 442 "asn1p_y.y" +#line 450 "asn1p_y.y" { yyval.a_module_flags = MSF_AUTOMATIC_TAGS; ; break;} case 21: -#line 445 "asn1p_y.y" +#line 453 "asn1p_y.y" { yyval.a_module_flags = MSF_EXTENSIBILITY_IMPLIED; ; break;} case 22: -#line 449 "asn1p_y.y" +#line 457 "asn1p_y.y" { /* X.680Amd1 specifies TAG and XER */ if(strcmp(yyvsp[-1].tv_str, "TAG") == 0) { @@ -1535,23 +1514,23 @@ case 22: ; break;} case 23: -#line 470 "asn1p_y.y" +#line 478 "asn1p_y.y" { yyval.a_module = 0; ; break;} case 24: -#line 471 "asn1p_y.y" +#line 479 "asn1p_y.y" { yyval.a_module = yyvsp[0].a_module; ; break;} case 25: -#line 480 "asn1p_y.y" +#line 488 "asn1p_y.y" { yyval.a_module = yyvsp[0].a_module; ; break;} case 26: -#line 483 "asn1p_y.y" +#line 491 "asn1p_y.y" { yyval.a_module = yyvsp[-1].a_module; @@ -1581,13 +1560,13 @@ case 26: ; break;} case 27: -#line 516 "asn1p_y.y" +#line 524 "asn1p_y.y" { yyval.a_module = yyvsp[0].a_module; ; break;} case 28: -#line 519 "asn1p_y.y" +#line 527 "asn1p_y.y" { yyval.a_module = asn1p_module_new(); checkmem(yyval.a_module); @@ -1599,7 +1578,7 @@ case 28: ; break;} case 29: -#line 528 "asn1p_y.y" +#line 536 "asn1p_y.y" { yyval.a_module = asn1p_module_new(); checkmem(yyval.a_module); @@ -1609,7 +1588,7 @@ case 29: ; break;} case 30: -#line 535 "asn1p_y.y" +#line 543 "asn1p_y.y" { yyval.a_module = asn1p_module_new(); checkmem(yyval.a_module); @@ -1619,7 +1598,7 @@ case 30: ; break;} case 31: -#line 548 "asn1p_y.y" +#line 556 "asn1p_y.y" { yyval.a_module = asn1p_module_new(); checkmem(yyval.a_module); @@ -1629,11 +1608,11 @@ case 31: ; break;} case 32: -#line 556 "asn1p_y.y" +#line 564 "asn1p_y.y" { asn1p_lexer_hack_push_encoding_control(); ; break;} case 33: -#line 557 "asn1p_y.y" +#line 565 "asn1p_y.y" { fprintf(stderr, "WARNING: ENCODING-CONTROL %s " @@ -1644,7 +1623,7 @@ case 33: ; break;} case 34: -#line 569 "asn1p_y.y" +#line 577 "asn1p_y.y" { return yyerror( "Attempt to redefine a standard basic type, " @@ -1653,7 +1632,7 @@ case 34: ; break;} case 35: -#line 583 "asn1p_y.y" +#line 591 "asn1p_y.y" { if(!saved_aid && 0) return yyerror("Unterminated IMPORTS FROM, " @@ -1663,13 +1642,13 @@ case 35: ; break;} case 36: -#line 593 "asn1p_y.y" +#line 601 "asn1p_y.y" { return yyerror("Empty IMPORTS list"); ; break;} case 37: -#line 599 "asn1p_y.y" +#line 607 "asn1p_y.y" { yyval.a_module = asn1p_module_new(); checkmem(yyval.a_module); @@ -1677,22 +1656,22 @@ case 37: ; break;} case 38: -#line 604 "asn1p_y.y" +#line 612 "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 611 "asn1p_y.y" +#line 619 "asn1p_y.y" { memset(&yyval.a_aid, 0, sizeof(yyval.a_aid)); ; break;} case 40: -#line 612 "asn1p_y.y" +#line 620 "asn1p_y.y" { yyval.a_aid.oid = yyvsp[0].a_oid; ; break;} case 41: -#line 616 "asn1p_y.y" +#line 624 "asn1p_y.y" { yyval.a_xports = yyvsp[-3].a_xports; yyval.a_xports->fromModuleName = yyvsp[-1].tv_str; @@ -1703,7 +1682,7 @@ case 41: ; break;} case 42: -#line 627 "asn1p_y.y" +#line 635 "asn1p_y.y" { yyval.a_xports = asn1p_xports_new(); checkmem(yyval.a_xports); @@ -1711,14 +1690,14 @@ case 42: ; break;} case 43: -#line 632 "asn1p_y.y" +#line 640 "asn1p_y.y" { yyval.a_xports = yyvsp[-2].a_xports; TQ_ADD(&(yyval.a_xports->members), yyvsp[0].a_expr, next); ; break;} case 44: -#line 639 "asn1p_y.y" +#line 647 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1727,7 +1706,7 @@ case 44: ; break;} case 45: -#line 645 "asn1p_y.y" +#line 653 "asn1p_y.y" { /* Completely equivalent to above */ yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1736,7 +1715,7 @@ case 45: ; break;} case 46: -#line 651 "asn1p_y.y" +#line 659 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1745,19 +1724,19 @@ case 46: ; break;} case 47: -#line 660 "asn1p_y.y" +#line 668 "asn1p_y.y" { yyval.a_xports = yyvsp[-1].a_xports; ; break;} case 48: -#line 663 "asn1p_y.y" +#line 671 "asn1p_y.y" { yyval.a_xports = 0; ; break;} case 49: -#line 666 "asn1p_y.y" +#line 674 "asn1p_y.y" { /* Empty EXPORTS clause effectively prohibits export. */ yyval.a_xports = asn1p_xports_new(); @@ -1765,7 +1744,7 @@ case 49: ; break;} case 50: -#line 674 "asn1p_y.y" +#line 682 "asn1p_y.y" { yyval.a_xports = asn1p_xports_new(); assert(yyval.a_xports); @@ -1773,14 +1752,14 @@ case 50: ; break;} case 51: -#line 679 "asn1p_y.y" +#line 687 "asn1p_y.y" { yyval.a_xports = yyvsp[-2].a_xports; TQ_ADD(&(yyval.a_xports->members), yyvsp[0].a_expr, next); ; break;} case 52: -#line 686 "asn1p_y.y" +#line 694 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1789,7 +1768,7 @@ case 52: ; break;} case 53: -#line 692 "asn1p_y.y" +#line 700 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1798,7 +1777,7 @@ case 53: ; break;} case 54: -#line 698 "asn1p_y.y" +#line 706 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1807,11 +1786,11 @@ case 54: ; break;} case 55: -#line 709 "asn1p_y.y" +#line 717 "asn1p_y.y" { asn1p_lexer_hack_push_opaque_state(); ; break;} case 56: -#line 709 "asn1p_y.y" +#line 717 "asn1p_y.y" { yyval.a_expr = yyvsp[-4].a_expr; assert(yyval.a_expr->Identifier == 0); @@ -1821,7 +1800,7 @@ case 56: ; break;} case 57: -#line 719 "asn1p_y.y" +#line 727 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1831,7 +1810,7 @@ case 57: ; break;} case 58: -#line 726 "asn1p_y.y" +#line 734 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1840,7 +1819,7 @@ case 58: ; break;} case 59: -#line 744 "asn1p_y.y" +#line 752 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1851,7 +1830,7 @@ case 59: ; break;} case 60: -#line 752 "asn1p_y.y" +#line 760 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; yyval.a_expr->Identifier = yyvsp[-2].tv_str; @@ -1860,7 +1839,7 @@ case 60: ; break;} case 61: -#line 758 "asn1p_y.y" +#line 766 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; yyval.a_expr->Identifier = yyvsp[-2].tv_str; @@ -1869,7 +1848,7 @@ case 61: ; break;} case 62: -#line 774 "asn1p_y.y" +#line 782 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; assert(yyval.a_expr->Identifier == 0); @@ -1879,7 +1858,7 @@ case 62: ; break;} case 63: -#line 784 "asn1p_y.y" +#line 792 "asn1p_y.y" { int ret; yyval.a_plist = asn1p_paramlist_new(yylineno); @@ -1891,7 +1870,7 @@ case 63: ; break;} case 64: -#line 793 "asn1p_y.y" +#line 801 "asn1p_y.y" { int ret; yyval.a_plist = yyvsp[-2].a_plist; @@ -1902,14 +1881,14 @@ case 64: ; break;} case 65: -#line 804 "asn1p_y.y" +#line 812 "asn1p_y.y" { yyval.a_parg.governor = NULL; yyval.a_parg.argument = yyvsp[0].tv_str; ; break;} case 66: -#line 808 "asn1p_y.y" +#line 816 "asn1p_y.y" { int ret; yyval.a_parg.governor = asn1p_ref_new(yylineno); @@ -1919,7 +1898,7 @@ case 66: ; break;} case 67: -#line 815 "asn1p_y.y" +#line 823 "asn1p_y.y" { int ret; yyval.a_parg.governor = asn1p_ref_new(yylineno); @@ -1929,7 +1908,7 @@ case 67: ; break;} case 68: -#line 822 "asn1p_y.y" +#line 830 "asn1p_y.y" { int ret; yyval.a_parg.governor = asn1p_ref_new(yylineno); @@ -1940,7 +1919,7 @@ case 68: ; break;} case 69: -#line 833 "asn1p_y.y" +#line 841 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1948,20 +1927,20 @@ case 69: ; break;} case 70: -#line 838 "asn1p_y.y" +#line 846 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} case 71: -#line 845 "asn1p_y.y" +#line 853 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; ; break;} case 72: -#line 848 "asn1p_y.y" +#line 856 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1971,15 +1950,15 @@ case 72: ; break;} case 73: -#line 872 "asn1p_y.y" +#line 880 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); ; break;} case 74: -#line 873 "asn1p_y.y" +#line 881 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; ; break;} case 75: -#line 876 "asn1p_y.y" +#line 884 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1987,14 +1966,14 @@ case 75: ; break;} case 76: -#line 881 "asn1p_y.y" +#line 889 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} case 77: -#line 888 "asn1p_y.y" +#line 896 "asn1p_y.y" { yyval.a_expr = yyvsp[-1].a_expr; assert(yyval.a_expr->Identifier == 0); @@ -2003,7 +1982,7 @@ case 77: ; break;} case 78: -#line 894 "asn1p_y.y" +#line 902 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2013,13 +1992,13 @@ case 78: ; break;} case 79: -#line 901 "asn1p_y.y" +#line 909 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; ; break;} case 80: -#line 904 "asn1p_y.y" +#line 912 "asn1p_y.y" { yyval.a_expr = yyvsp[-1].a_expr; yyval.a_expr->marker = yyvsp[0].a_marker; @@ -2027,7 +2006,7 @@ case 80: ; break;} case 81: -#line 912 "asn1p_y.y" +#line 920 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2035,14 +2014,14 @@ case 81: ; break;} case 82: -#line 917 "asn1p_y.y" +#line 925 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} case 83: -#line 924 "asn1p_y.y" +#line 932 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; assert(yyval.a_expr->Identifier == 0); @@ -2050,20 +2029,20 @@ case 83: ; break;} case 84: -#line 929 "asn1p_y.y" +#line 937 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; ; break;} case 85: -#line 932 "asn1p_y.y" +#line 940 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; _fixup_anonymous_identifier(yyval.a_expr); ; break;} case 86: -#line 939 "asn1p_y.y" +#line 947 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; checkmem(yyval.a_expr); @@ -2073,15 +2052,15 @@ case 86: ; break;} case 87: -#line 949 "asn1p_y.y" +#line 957 "asn1p_y.y" { yyval.a_int = 0; ; break;} case 88: -#line 950 "asn1p_y.y" +#line 958 "asn1p_y.y" { yyval.a_int = 1; ; break;} case 89: -#line 954 "asn1p_y.y" +#line 962 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2091,14 +2070,14 @@ case 89: ; break;} case 90: -#line 961 "asn1p_y.y" +#line 969 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} case 91: -#line 968 "asn1p_y.y" +#line 976 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2109,7 +2088,7 @@ case 91: ; break;} case 92: -#line 976 "asn1p_y.y" +#line 984 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; yyval.a_expr->Identifier = yyvsp[-3].a_refcomp.name; @@ -2118,7 +2097,7 @@ case 92: ; break;} case 93: -#line 982 "asn1p_y.y" +#line 990 "asn1p_y.y" { int ret; yyval.a_expr = asn1p_expr_new(yylineno); @@ -2136,47 +2115,47 @@ case 93: ; break;} case 94: -#line 1000 "asn1p_y.y" +#line 1008 "asn1p_y.y" { yyval.a_wsynt = 0; ; break;} case 95: -#line 1001 "asn1p_y.y" +#line 1009 "asn1p_y.y" { yyval.a_wsynt = yyvsp[0].a_wsynt; ; break;} case 96: -#line 1008 "asn1p_y.y" +#line 1016 "asn1p_y.y" { asn1p_lexer_hack_enable_with_syntax(); ; break;} case 97: -#line 1010 "asn1p_y.y" +#line 1018 "asn1p_y.y" { yyval.a_wsynt = yyvsp[-1].a_wsynt; ; break;} case 98: -#line 1016 "asn1p_y.y" +#line 1024 "asn1p_y.y" { yyval.a_wsynt = asn1p_wsyntx_new(); TQ_ADD(&(yyval.a_wsynt->chunks), yyvsp[0].a_wchunk, next); ; break;} case 99: -#line 1020 "asn1p_y.y" +#line 1028 "asn1p_y.y" { yyval.a_wsynt = yyvsp[-1].a_wsynt; TQ_ADD(&(yyval.a_wsynt->chunks), yyvsp[0].a_wchunk, next); ; break;} case 100: -#line 1027 "asn1p_y.y" +#line 1035 "asn1p_y.y" { yyval.a_wchunk = asn1p_wsyntx_chunk_frombuf(yyvsp[0].tv_opaque.buf, yyvsp[0].tv_opaque.len, 0); ; break;} case 101: -#line 1030 "asn1p_y.y" +#line 1038 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -2188,7 +2167,7 @@ case 101: ; break;} case 102: -#line 1042 "asn1p_y.y" +#line 1050 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2199,7 +2178,7 @@ case 102: ; break;} case 103: -#line 1050 "asn1p_y.y" +#line 1058 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2211,7 +2190,7 @@ case 103: ; break;} case 104: -#line 1059 "asn1p_y.y" +#line 1067 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2223,7 +2202,7 @@ case 104: ; break;} case 105: -#line 1071 "asn1p_y.y" +#line 1079 "asn1p_y.y" { yyval.a_expr = yyvsp[-1].a_expr; yyval.a_expr->tag = yyvsp[-2].a_tag; @@ -2242,43 +2221,66 @@ case 105: yyval.a_expr->constraints = yyvsp[0].a_constr; } } + asn1p_last_type = yyval.a_expr; ; break;} case 106: -#line 1093 "asn1p_y.y" +#line 1102 "asn1p_y.y" +{apply_nonstd_mods();; + break;} +case 107: +#line 1102 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; ; break;} -case 107: -#line 1096 "asn1p_y.y" +case 108: +#line 1107 "asn1p_y.y" { - yyval.a_expr = yyvsp[-1].a_expr; + yyval.a_expr = yyvsp[0].a_expr; + ; + break;} +case 109: +#line 1110 "asn1p_y.y" +{apply_nonstd_mods();; + break;} +case 110: +#line 1110 "asn1p_y.y" +{ + yyval.a_expr = yyvsp[-2].a_expr; assert(yyval.a_expr->expr_type == A1TC_INVALID); yyval.a_expr->expr_type = ASN_CONSTR_CHOICE; yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 108: -#line 1102 "asn1p_y.y" +case 111: +#line 1116 "asn1p_y.y" +{apply_nonstd_mods();; + break;} +case 112: +#line 1116 "asn1p_y.y" { - yyval.a_expr = yyvsp[-1].a_expr; + yyval.a_expr = yyvsp[-2].a_expr; assert(yyval.a_expr->expr_type == A1TC_INVALID); yyval.a_expr->expr_type = ASN_CONSTR_SEQUENCE; yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 109: -#line 1108 "asn1p_y.y" +case 113: +#line 1122 "asn1p_y.y" +{apply_nonstd_mods();; + break;} +case 114: +#line 1122 "asn1p_y.y" { - yyval.a_expr = yyvsp[-1].a_expr; + yyval.a_expr = yyvsp[-2].a_expr; assert(yyval.a_expr->expr_type == A1TC_INVALID); yyval.a_expr->expr_type = ASN_CONSTR_SET; yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 110: -#line 1114 "asn1p_y.y" +case 115: +#line 1128 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2290,8 +2292,8 @@ case 110: asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} -case 111: -#line 1124 "asn1p_y.y" +case 116: +#line 1138 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2303,8 +2305,8 @@ case 111: asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} -case 112: -#line 1134 "asn1p_y.y" +case 117: +#line 1148 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2312,8 +2314,8 @@ case 112: yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 113: -#line 1140 "asn1p_y.y" +case 118: +#line 1154 "asn1p_y.y" { int ret; yyval.a_expr = asn1p_expr_new(yylineno); @@ -2326,8 +2328,8 @@ case 113: yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 114: -#line 1154 "asn1p_y.y" +case 119: +#line 1168 "asn1p_y.y" { int ret; yyval.a_expr = yyvsp[-1].a_expr; @@ -2343,8 +2345,8 @@ case 114: yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 115: -#line 1178 "asn1p_y.y" +case 120: +#line 1192 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2353,8 +2355,8 @@ case 115: yyval.a_expr->meta_type = AMT_TYPEREF; ; break;} -case 116: -#line 1185 "asn1p_y.y" +case 121: +#line 1199 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2363,8 +2365,8 @@ case 116: yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 117: -#line 1200 "asn1p_y.y" +case 122: +#line 1214 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2374,8 +2376,8 @@ case 117: free(yyvsp[0].tv_str); ; break;} -case 118: -#line 1208 "asn1p_y.y" +case 123: +#line 1222 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2387,8 +2389,8 @@ case 118: free(yyvsp[-2].tv_str); ; break;} -case 119: -#line 1218 "asn1p_y.y" +case 124: +#line 1232 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2400,8 +2402,8 @@ case 119: free(yyvsp[-2].tv_str); ; break;} -case 120: -#line 1228 "asn1p_y.y" +case 125: +#line 1242 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2413,8 +2415,8 @@ case 120: free(yyvsp[-2].tv_str); ; break;} -case 121: -#line 1238 "asn1p_y.y" +case 126: +#line 1252 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2424,8 +2426,8 @@ case 121: checkmem(ret == 0); ; break;} -case 122: -#line 1246 "asn1p_y.y" +case 127: +#line 1260 "asn1p_y.y" { int ret; yyval.a_ref = yyvsp[0].a_ref; @@ -2446,8 +2448,8 @@ case 122: } ; break;} -case 123: -#line 1268 "asn1p_y.y" +case 128: +#line 1282 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2457,8 +2459,8 @@ case 123: checkmem(ret == 0); ; break;} -case 124: -#line 1276 "asn1p_y.y" +case 129: +#line 1290 "asn1p_y.y" { int ret; yyval.a_ref = yyvsp[-2].a_ref; @@ -2467,22 +2469,22 @@ case 124: checkmem(ret == 0); ; break;} -case 127: -#line 1290 "asn1p_y.y" +case 132: +#line 1304 "asn1p_y.y" { yyval.a_refcomp.lex_type = RLT_AmpUppercase; yyval.a_refcomp.name = yyvsp[0].tv_str; ; break;} -case 128: -#line 1295 "asn1p_y.y" +case 133: +#line 1309 "asn1p_y.y" { yyval.a_refcomp.lex_type = RLT_Amplowercase; yyval.a_refcomp.name = yyvsp[0].tv_str; ; break;} -case 129: -#line 1308 "asn1p_y.y" +case 134: +#line 1322 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; assert(yyval.a_expr->Identifier == NULL); @@ -2491,8 +2493,8 @@ case 129: yyval.a_expr->value = yyvsp[0].a_value; ; break;} -case 130: -#line 1318 "asn1p_y.y" +case 135: +#line 1332 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(0); checkmem(yyval.a_value); @@ -2501,76 +2503,76 @@ case 130: yyval.a_value->value.choice_identifier.value = yyvsp[0].a_value; ; break;} -case 131: -#line 1325 "asn1p_y.y" +case 136: +#line 1339 "asn1p_y.y" { asn1p_lexer_hack_push_opaque_state(); ; break;} -case 132: -#line 1325 "asn1p_y.y" +case 137: +#line 1339 "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 133: -#line 1330 "asn1p_y.y" +case 138: +#line 1344 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(0); checkmem(yyval.a_value); yyval.a_value->type = ATV_NULL; ; break;} -case 134: -#line 1335 "asn1p_y.y" +case 139: +#line 1349 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(0); checkmem(yyval.a_value); yyval.a_value->type = ATV_FALSE; ; break;} -case 135: -#line 1340 "asn1p_y.y" +case 140: +#line 1354 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(0); checkmem(yyval.a_value); yyval.a_value->type = ATV_TRUE; ; break;} -case 136: -#line 1345 "asn1p_y.y" +case 141: +#line 1359 "asn1p_y.y" { yyval.a_value = _convert_bitstring2binary(yyvsp[0].tv_str, 'B'); checkmem(yyval.a_value); ; break;} -case 137: -#line 1349 "asn1p_y.y" +case 142: +#line 1363 "asn1p_y.y" { yyval.a_value = _convert_bitstring2binary(yyvsp[0].tv_str, 'H'); checkmem(yyval.a_value); ; break;} -case 138: -#line 1353 "asn1p_y.y" +case 143: +#line 1367 "asn1p_y.y" { yyval.a_value = yyval.a_value; ; break;} -case 139: -#line 1356 "asn1p_y.y" +case 144: +#line 1370 "asn1p_y.y" { yyval.a_value = yyvsp[0].a_value; ; break;} -case 140: -#line 1359 "asn1p_y.y" +case 145: +#line 1373 "asn1p_y.y" { yyval.a_value = yyvsp[0].a_value; ; break;} -case 141: -#line 1365 "asn1p_y.y" +case 146: +#line 1379 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -2583,8 +2585,8 @@ case 141: free(yyvsp[0].tv_str); ; break;} -case 142: -#line 1376 "asn1p_y.y" +case 147: +#line 1390 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -2600,31 +2602,31 @@ case 142: free(yyvsp[0].tv_str); ; break;} -case 143: -#line 1394 "asn1p_y.y" +case 148: +#line 1408 "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 144: -#line 1398 "asn1p_y.y" +case 149: +#line 1412 "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 145: -#line 1403 "asn1p_y.y" +case 150: +#line 1417 "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 146: -#line 1437 "asn1p_y.y" +case 151: +#line 1451 "asn1p_y.y" { yyval.tv_opaque.len = yyvsp[0].tv_opaque.len + 1; yyval.tv_opaque.buf = malloc(yyval.tv_opaque.len + 1); @@ -2635,8 +2637,8 @@ case 146: free(yyvsp[0].tv_opaque.buf); ; break;} -case 147: -#line 1446 "asn1p_y.y" +case 152: +#line 1460 "asn1p_y.y" { int newsize = yyvsp[-1].tv_opaque.len + yyvsp[0].tv_opaque.len; char *p = malloc(newsize + 1); @@ -2650,72 +2652,72 @@ case 147: yyval.tv_opaque.len = newsize; ; break;} -case 148: -#line 1461 "asn1p_y.y" +case 153: +#line 1475 "asn1p_y.y" { yyval.a_type = ASN_BASIC_BOOLEAN; ; break;} -case 149: -#line 1462 "asn1p_y.y" +case 154: +#line 1476 "asn1p_y.y" { yyval.a_type = ASN_BASIC_NULL; ; break;} -case 150: -#line 1463 "asn1p_y.y" +case 155: +#line 1477 "asn1p_y.y" { yyval.a_type = ASN_BASIC_REAL; ; break;} -case 151: -#line 1464 "asn1p_y.y" +case 156: +#line 1478 "asn1p_y.y" { yyval.a_type = yyvsp[0].a_type; ; break;} -case 152: -#line 1465 "asn1p_y.y" +case 157: +#line 1479 "asn1p_y.y" { yyval.a_type = ASN_BASIC_OCTET_STRING; ; break;} -case 153: -#line 1466 "asn1p_y.y" +case 158: +#line 1480 "asn1p_y.y" { yyval.a_type = ASN_BASIC_OBJECT_IDENTIFIER; ; break;} -case 154: -#line 1467 "asn1p_y.y" +case 159: +#line 1481 "asn1p_y.y" { yyval.a_type = ASN_BASIC_RELATIVE_OID; ; break;} -case 155: -#line 1468 "asn1p_y.y" +case 160: +#line 1482 "asn1p_y.y" { yyval.a_type = ASN_BASIC_EXTERNAL; ; break;} -case 156: -#line 1469 "asn1p_y.y" +case 161: +#line 1483 "asn1p_y.y" { yyval.a_type = ASN_BASIC_EMBEDDED_PDV; ; break;} -case 157: -#line 1470 "asn1p_y.y" +case 162: +#line 1484 "asn1p_y.y" { yyval.a_type = ASN_BASIC_CHARACTER_STRING; ; break;} -case 158: -#line 1471 "asn1p_y.y" +case 163: +#line 1485 "asn1p_y.y" { yyval.a_type = ASN_BASIC_UTCTime; ; break;} -case 159: -#line 1472 "asn1p_y.y" +case 164: +#line 1486 "asn1p_y.y" { yyval.a_type = ASN_BASIC_GeneralizedTime; ; break;} -case 160: -#line 1473 "asn1p_y.y" +case 165: +#line 1487 "asn1p_y.y" { yyval.a_type = yyvsp[0].a_type; ; break;} -case 161: -#line 1480 "asn1p_y.y" +case 166: +#line 1494 "asn1p_y.y" { yyval.a_type = ASN_BASIC_INTEGER; ; break;} -case 162: -#line 1481 "asn1p_y.y" +case 167: +#line 1495 "asn1p_y.y" { yyval.a_type = ASN_BASIC_ENUMERATED; ; break;} -case 163: -#line 1482 "asn1p_y.y" +case 168: +#line 1496 "asn1p_y.y" { yyval.a_type = ASN_BASIC_BIT_STRING; ; break;} -case 164: -#line 1486 "asn1p_y.y" +case 169: +#line 1500 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2723,8 +2725,8 @@ case 164: yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 165: -#line 1492 "asn1p_y.y" +case 170: +#line 1506 "asn1p_y.y" { if(yyvsp[0].a_expr) { yyval.a_expr = yyvsp[0].a_expr; @@ -2736,92 +2738,92 @@ case 165: yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 166: -#line 1505 "asn1p_y.y" +case 171: +#line 1519 "asn1p_y.y" { yyval.a_type = ASN_STRING_BMPString; ; break;} -case 167: -#line 1506 "asn1p_y.y" +case 172: +#line 1520 "asn1p_y.y" { yyval.a_type = ASN_STRING_GeneralString; fprintf(stderr, "WARNING: GeneralString is not fully supported\n"); ; break;} -case 168: -#line 1510 "asn1p_y.y" +case 173: +#line 1524 "asn1p_y.y" { yyval.a_type = ASN_STRING_GraphicString; fprintf(stderr, "WARNING: GraphicString is not fully supported\n"); ; break;} -case 169: -#line 1514 "asn1p_y.y" +case 174: +#line 1528 "asn1p_y.y" { yyval.a_type = ASN_STRING_IA5String; ; break;} -case 170: -#line 1515 "asn1p_y.y" +case 175: +#line 1529 "asn1p_y.y" { yyval.a_type = ASN_STRING_ISO646String; ; break;} -case 171: -#line 1516 "asn1p_y.y" +case 176: +#line 1530 "asn1p_y.y" { yyval.a_type = ASN_STRING_NumericString; ; break;} -case 172: -#line 1517 "asn1p_y.y" +case 177: +#line 1531 "asn1p_y.y" { yyval.a_type = ASN_STRING_PrintableString; ; break;} -case 173: -#line 1518 "asn1p_y.y" +case 178: +#line 1532 "asn1p_y.y" { yyval.a_type = ASN_STRING_T61String; fprintf(stderr, "WARNING: T61String is not fully supported\n"); ; break;} -case 174: -#line 1522 "asn1p_y.y" +case 179: +#line 1536 "asn1p_y.y" { yyval.a_type = ASN_STRING_TeletexString; ; break;} -case 175: -#line 1523 "asn1p_y.y" +case 180: +#line 1537 "asn1p_y.y" { yyval.a_type = ASN_STRING_UniversalString; ; break;} -case 176: -#line 1524 "asn1p_y.y" +case 181: +#line 1538 "asn1p_y.y" { yyval.a_type = ASN_STRING_UTF8String; ; break;} -case 177: -#line 1525 "asn1p_y.y" +case 182: +#line 1539 "asn1p_y.y" { yyval.a_type = ASN_STRING_VideotexString; fprintf(stderr, "WARNING: VideotexString is not fully supported\n"); ; break;} -case 178: -#line 1529 "asn1p_y.y" +case 183: +#line 1543 "asn1p_y.y" { yyval.a_type = ASN_STRING_VisibleString; ; break;} -case 179: -#line 1530 "asn1p_y.y" +case 184: +#line 1544 "asn1p_y.y" { yyval.a_type = ASN_STRING_ObjectDescriptor; ; break;} -case 185: -#line 1542 "asn1p_y.y" +case 190: +#line 1556 "asn1p_y.y" { yyval.a_constr = 0; ; break;} -case 186: -#line 1543 "asn1p_y.y" +case 191: +#line 1557 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 187: -#line 1549 "asn1p_y.y" +case 192: +#line 1563 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_SET, yyvsp[0].a_constr, 0); ; break;} -case 188: -#line 1552 "asn1p_y.y" +case 193: +#line 1566 "asn1p_y.y" { /* * This is a special case, for compatibility purposes. @@ -2830,26 +2832,26 @@ case 188: CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_SIZE, yyvsp[-1].a_constr, 0); ; break;} -case 189: -#line 1562 "asn1p_y.y" +case 194: +#line 1576 "asn1p_y.y" { yyval.a_constr = yyvsp[-1].a_constr; ; break;} -case 190: -#line 1565 "asn1p_y.y" +case 195: +#line 1579 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_SET, yyvsp[-3].a_constr, yyvsp[-1].a_constr); ; break;} -case 191: -#line 1571 "asn1p_y.y" +case 196: +#line 1585 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 192: -#line 1574 "asn1p_y.y" +case 197: +#line 1588 "asn1p_y.y" { asn1p_constraint_t *ct; ct = asn1p_constraint_new(yylineno); @@ -2857,8 +2859,8 @@ case 192: CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CSV, yyvsp[-2].a_constr, ct); ; break;} -case 193: -#line 1580 "asn1p_y.y" +case 198: +#line 1594 "asn1p_y.y" { asn1p_constraint_t *ct; ct = asn1p_constraint_new(yylineno); @@ -2868,38 +2870,38 @@ case 193: CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CSV, ct, yyvsp[0].a_constr); ; break;} -case 194: -#line 1591 "asn1p_y.y" +case 199: +#line 1605 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 195: -#line 1594 "asn1p_y.y" +case 200: +#line 1608 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_AEX, yyvsp[0].a_constr, 0); ; break;} -case 196: -#line 1597 "asn1p_y.y" +case 201: +#line 1611 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_UNI, yyvsp[-2].a_constr, yyvsp[0].a_constr); ; break;} -case 197: -#line 1600 "asn1p_y.y" +case 202: +#line 1614 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_INT, yyvsp[-2].a_constr, yyvsp[0].a_constr); ; break;} -case 198: -#line 1603 "asn1p_y.y" +case 203: +#line 1617 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_EXC, yyvsp[-2].a_constr, yyvsp[0].a_constr); ; break;} -case 199: -#line 1609 "asn1p_y.y" +case 204: +#line 1623 "asn1p_y.y" { int ret; yyval.a_constr = asn1p_constraint_new(yylineno); @@ -2909,8 +2911,8 @@ case 199: checkmem(ret == 0); ; break;} -case 200: -#line 1617 "asn1p_y.y" +case 205: +#line 1631 "asn1p_y.y" { int ret; yyval.a_constr = asn1p_constraint_new(yylineno); @@ -2920,8 +2922,8 @@ case 200: checkmem(ret == 0); ; break;} -case 201: -#line 1625 "asn1p_y.y" +case 206: +#line 1639 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2929,8 +2931,8 @@ case 201: yyval.a_constr->value = yyvsp[0].a_value; ; break;} -case 202: -#line 1631 "asn1p_y.y" +case 207: +#line 1645 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2938,8 +2940,8 @@ case 202: yyval.a_constr->containedSubtype = yyvsp[0].a_value; ; break;} -case 203: -#line 1637 "asn1p_y.y" +case 208: +#line 1651 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2948,8 +2950,8 @@ case 203: yyval.a_constr->range_stop = yyvsp[0].a_value; ; break;} -case 204: -#line 1644 "asn1p_y.y" +case 209: +#line 1658 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2959,8 +2961,8 @@ case 204: yyval.a_constr->range_start->type = ATV_MIN; ; break;} -case 205: -#line 1652 "asn1p_y.y" +case 210: +#line 1666 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2970,8 +2972,8 @@ case 205: yyval.a_constr->range_stop->type = ATV_MAX; ; break;} -case 206: -#line 1660 "asn1p_y.y" +case 211: +#line 1674 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2982,24 +2984,24 @@ case 206: yyval.a_constr->range_stop->type = ATV_MAX; ; break;} -case 207: -#line 1669 "asn1p_y.y" +case 212: +#line 1683 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 208: -#line 1672 "asn1p_y.y" +case 213: +#line 1686 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 209: -#line 1676 "asn1p_y.y" +case 214: +#line 1690 "asn1p_y.y" { asn1p_lexer_hack_push_opaque_state(); ; break;} -case 210: -#line 1676 "asn1p_y.y" +case 215: +#line 1690 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -3009,64 +3011,64 @@ case 210: yyval.a_constr->value->type = ATV_UNPARSED; ; break;} -case 211: -#line 1687 "asn1p_y.y" +case 216: +#line 1701 "asn1p_y.y" { yyval.a_ctype = ACT_EL_RANGE; ; break;} -case 212: -#line 1688 "asn1p_y.y" +case 217: +#line 1702 "asn1p_y.y" { yyval.a_ctype = ACT_EL_RLRANGE; ; break;} -case 213: -#line 1689 "asn1p_y.y" +case 218: +#line 1703 "asn1p_y.y" { yyval.a_ctype = ACT_EL_LLRANGE; ; break;} -case 214: -#line 1690 "asn1p_y.y" +case 219: +#line 1704 "asn1p_y.y" { yyval.a_ctype = ACT_EL_ULRANGE; ; break;} -case 215: -#line 1694 "asn1p_y.y" +case 220: +#line 1708 "asn1p_y.y" { yyval.a_ctype = ACT_CT_SIZE; ; break;} -case 216: -#line 1697 "asn1p_y.y" +case 221: +#line 1711 "asn1p_y.y" { yyval.a_ctype = ACT_CT_FROM; ; break;} -case 217: -#line 1703 "asn1p_y.y" +case 222: +#line 1717 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(0); checkmem(yyval.a_value); yyval.a_value->type = ATV_FALSE; ; break;} -case 218: -#line 1708 "asn1p_y.y" +case 223: +#line 1722 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(1); checkmem(yyval.a_value); yyval.a_value->type = ATV_TRUE; ; break;} -case 219: -#line 1713 "asn1p_y.y" +case 224: +#line 1727 "asn1p_y.y" { yyval.a_value = yyvsp[0].a_value; ; break;} -case 220: -#line 1716 "asn1p_y.y" +case 225: +#line 1730 "asn1p_y.y" { yyval.a_value = yyvsp[0].a_value; ; break;} -case 221: -#line 1719 "asn1p_y.y" +case 226: +#line 1733 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -3079,8 +3081,8 @@ case 221: free(yyvsp[0].tv_str); ; break;} -case 222: -#line 1733 "asn1p_y.y" +case 227: +#line 1747 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -3093,32 +3095,32 @@ case 222: free(yyvsp[0].tv_str); ; break;} -case 223: -#line 1747 "asn1p_y.y" +case 228: +#line 1761 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMP, yyvsp[0].a_constr, 0); ; break;} -case 224: -#line 1750 "asn1p_y.y" +case 229: +#line 1764 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMPS, yyvsp[-1].a_constr, 0); ; break;} -case 225: -#line 1756 "asn1p_y.y" +case 230: +#line 1770 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 226: -#line 1759 "asn1p_y.y" +case 231: +#line 1773 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMPS, yyvsp[-2].a_constr, yyvsp[0].a_constr); ; break;} -case 227: -#line 1765 "asn1p_y.y" +case 232: +#line 1779 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -3126,8 +3128,8 @@ case 227: yyval.a_constr->value = asn1p_value_frombuf("...", 3, 0); ; break;} -case 228: -#line 1771 "asn1p_y.y" +case 233: +#line 1785 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -3137,46 +3139,46 @@ case 228: if(yyvsp[-1].a_constr) asn1p_constraint_insert(yyval.a_constr, yyvsp[-1].a_constr); ; break;} -case 229: -#line 1785 "asn1p_y.y" +case 234: +#line 1799 "asn1p_y.y" { yyval.a_pres = ACPRES_DEFAULT; ; break;} -case 230: -#line 1786 "asn1p_y.y" +case 235: +#line 1800 "asn1p_y.y" { yyval.a_pres = yyvsp[0].a_pres; ; break;} -case 231: -#line 1790 "asn1p_y.y" +case 236: +#line 1804 "asn1p_y.y" { yyval.a_pres = ACPRES_PRESENT; ; break;} -case 232: -#line 1793 "asn1p_y.y" +case 237: +#line 1807 "asn1p_y.y" { yyval.a_pres = ACPRES_ABSENT; ; break;} -case 233: -#line 1796 "asn1p_y.y" +case 238: +#line 1810 "asn1p_y.y" { yyval.a_pres = ACPRES_OPTIONAL; ; break;} -case 234: -#line 1802 "asn1p_y.y" +case 239: +#line 1816 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 235: -#line 1805 "asn1p_y.y" +case 240: +#line 1819 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 236: -#line 1814 "asn1p_y.y" +case 241: +#line 1828 "asn1p_y.y" { asn1p_ref_t *ref = asn1p_ref_new(yylineno); asn1p_constraint_t *ct; @@ -3190,14 +3192,14 @@ case 236: CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CRC, ct, 0); ; break;} -case 237: -#line 1829 "asn1p_y.y" +case 242: +#line 1843 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CRC, yyvsp[-3].a_constr, yyvsp[-1].a_constr); ; break;} -case 238: -#line 1835 "asn1p_y.y" +case 243: +#line 1849 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -3205,8 +3207,8 @@ case 238: yyval.a_constr->value = asn1p_value_fromref(yyvsp[0].a_ref, 0); ; break;} -case 239: -#line 1841 "asn1p_y.y" +case 244: +#line 1855 "asn1p_y.y" { asn1p_constraint_t *ct; ct = asn1p_constraint_new(yylineno); @@ -3216,8 +3218,8 @@ case 239: CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CSV, yyvsp[-2].a_constr, ct); ; break;} -case 240: -#line 1855 "asn1p_y.y" +case 245: +#line 1869 "asn1p_y.y" { char *p = malloc(strlen(yyvsp[0].tv_str) + 2); int ret; @@ -3230,8 +3232,8 @@ case 240: free(yyvsp[0].tv_str); ; break;} -case 241: -#line 1866 "asn1p_y.y" +case 246: +#line 1880 "asn1p_y.y" { char *p = malloc(strlen(yyvsp[0].tv_str) + 3); int ret; @@ -3245,14 +3247,14 @@ case 241: free(yyvsp[0].tv_str); ; break;} -case 242: -#line 1882 "asn1p_y.y" +case 247: +#line 1896 "asn1p_y.y" { yyval.tv_str = yyvsp[0].tv_str; ; break;} -case 243: -#line 1885 "asn1p_y.y" +case 248: +#line 1899 "asn1p_y.y" { int l1 = strlen(yyvsp[-2].tv_str); int l3 = strlen(yyvsp[0].tv_str); @@ -3263,61 +3265,61 @@ case 243: yyval.tv_str[l1 + 1 + l3] = '\0'; ; break;} -case 244: -#line 1903 "asn1p_y.y" +case 249: +#line 1917 "asn1p_y.y" { yyval.a_marker.flags = EM_NOMARK; yyval.a_marker.default_value = 0; ; break;} -case 245: -#line 1907 "asn1p_y.y" +case 250: +#line 1921 "asn1p_y.y" { yyval.a_marker = yyvsp[0].a_marker; ; break;} -case 246: -#line 1911 "asn1p_y.y" +case 251: +#line 1925 "asn1p_y.y" { yyval.a_marker.flags = EM_OPTIONAL; yyval.a_marker.default_value = 0; ; break;} -case 247: -#line 1915 "asn1p_y.y" +case 252: +#line 1929 "asn1p_y.y" { yyval.a_marker.flags = EM_DEFAULT; yyval.a_marker.default_value = yyvsp[0].a_value; ; break;} -case 248: -#line 1938 "asn1p_y.y" +case 253: +#line 1952 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); ; break;} -case 249: -#line 1942 "asn1p_y.y" +case 254: +#line 1956 "asn1p_y.y" { yyval.a_expr = yyvsp[-1].a_expr; ; break;} -case 250: -#line 1948 "asn1p_y.y" +case 255: +#line 1962 "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 251: -#line 1953 "asn1p_y.y" +case 256: +#line 1967 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} -case 252: -#line 1960 "asn1p_y.y" +case 257: +#line 1974 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3326,8 +3328,8 @@ case 252: yyval.a_expr->Identifier = yyvsp[0].tv_str; ; break;} -case 253: -#line 1967 "asn1p_y.y" +case 258: +#line 1981 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3337,8 +3339,8 @@ case 253: yyval.a_expr->value = yyvsp[-1].a_value; ; break;} -case 254: -#line 1975 "asn1p_y.y" +case 259: +#line 1989 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3348,8 +3350,8 @@ case 254: yyval.a_expr->value = yyvsp[-1].a_value; ; break;} -case 255: -#line 1983 "asn1p_y.y" +case 260: +#line 1997 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3358,8 +3360,8 @@ case 255: yyval.a_expr->value = yyvsp[0].a_value; ; break;} -case 256: -#line 1990 "asn1p_y.y" +case 261: +#line 2004 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3369,103 +3371,103 @@ case 256: yyval.a_expr->meta_type = AMT_VALUE; ; break;} -case 257: -#line 2001 "asn1p_y.y" +case 262: +#line 2015 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int); checkmem(yyval.a_value); ; break;} -case 258: -#line 2005 "asn1p_y.y" +case 263: +#line 2019 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int); checkmem(yyval.a_value); ; break;} -case 259: -#line 2036 "asn1p_y.y" +case 264: +#line 2050 "asn1p_y.y" { memset(&yyval.a_tag, 0, sizeof(yyval.a_tag)); ; break;} -case 260: -#line 2037 "asn1p_y.y" +case 265: +#line 2051 "asn1p_y.y" { yyval.a_tag = yyvsp[0].a_tag; ; break;} -case 261: -#line 2041 "asn1p_y.y" +case 266: +#line 2055 "asn1p_y.y" { yyval.a_tag = yyvsp[-1].a_tag; yyval.a_tag.tag_mode = yyvsp[0].a_tag.tag_mode; ; break;} -case 262: -#line 2048 "asn1p_y.y" +case 267: +#line 2062 "asn1p_y.y" { yyval.a_tag = yyvsp[-2].a_tag; yyval.a_tag.tag_value = yyvsp[-1].a_int; ; break;} -case 263: -#line 2054 "asn1p_y.y" +case 268: +#line 2068 "asn1p_y.y" { yyval.a_tag.tag_class = TC_CONTEXT_SPECIFIC; ; break;} -case 264: -#line 2055 "asn1p_y.y" +case 269: +#line 2069 "asn1p_y.y" { yyval.a_tag.tag_class = TC_UNIVERSAL; ; break;} -case 265: -#line 2056 "asn1p_y.y" +case 270: +#line 2070 "asn1p_y.y" { yyval.a_tag.tag_class = TC_APPLICATION; ; break;} -case 266: -#line 2057 "asn1p_y.y" +case 271: +#line 2071 "asn1p_y.y" { yyval.a_tag.tag_class = TC_PRIVATE; ; break;} -case 267: -#line 2061 "asn1p_y.y" +case 272: +#line 2075 "asn1p_y.y" { yyval.a_tag.tag_mode = TM_DEFAULT; ; break;} -case 268: -#line 2062 "asn1p_y.y" +case 273: +#line 2076 "asn1p_y.y" { yyval.a_tag.tag_mode = TM_IMPLICIT; ; break;} -case 269: -#line 2063 "asn1p_y.y" +case 274: +#line 2077 "asn1p_y.y" { yyval.a_tag.tag_mode = TM_EXPLICIT; ; break;} -case 270: -#line 2067 "asn1p_y.y" +case 275: +#line 2081 "asn1p_y.y" { checkmem(yyvsp[0].tv_str); yyval.tv_str = yyvsp[0].tv_str; ; break;} -case 271: -#line 2071 "asn1p_y.y" +case 276: +#line 2085 "asn1p_y.y" { checkmem(yyvsp[0].tv_str); yyval.tv_str = yyvsp[0].tv_str; ; break;} -case 272: -#line 2079 "asn1p_y.y" +case 277: +#line 2093 "asn1p_y.y" { checkmem(yyvsp[0].tv_str); yyval.tv_str = yyvsp[0].tv_str; ; break;} -case 273: -#line 2086 "asn1p_y.y" +case 278: +#line 2100 "asn1p_y.y" { yyval.tv_str = 0; ; break;} -case 274: -#line 2087 "asn1p_y.y" +case 279: +#line 2101 "asn1p_y.y" { yyval.tv_str = yyvsp[0].tv_str; ; break;} -case 275: -#line 2093 "asn1p_y.y" +case 280: +#line 2107 "asn1p_y.y" { checkmem(yyvsp[0].tv_str); yyval.tv_str = yyvsp[0].tv_str; @@ -3693,7 +3695,7 @@ yyerrhandle: } return 1; } -#line 2099 "asn1p_y.y" +#line 2113 "asn1p_y.y" @@ -3833,6 +3835,22 @@ _fixup_anonymous_identifier(asn1p_expr_t *expr) { expr->Identifier); } +static void +apply_nonstd_mods() { + if(!asn1p_as_pointer) return; + asn1p_as_pointer = 0; + + if(asn1p_last_type) { + asn1p_last_type->marker.flags |= EM_INDIRECT; + fprintf(stderr, "INFO: Modifier <asn1c:pointer> " + "applied to \"%s\" at line %d\n", + asn1p_last_type->Identifier + ? asn1p_last_type->Identifier : "<anonymous>", + asn1p_last_type->_lineno); + asn1p_last_type = 0; + } +} + extern char *asn1p_text; int |