diff options
Diffstat (limited to 'libasn1parser/asn1p_y.c')
| -rw-r--r-- | libasn1parser/asn1p_y.c | 1759 |
1 files changed, 873 insertions, 886 deletions
diff --git a/libasn1parser/asn1p_y.c b/libasn1parser/asn1p_y.c index f74538fb..419cae45 100644 --- a/libasn1parser/asn1p_y.c +++ b/libasn1parser/asn1p_y.c @@ -139,11 +139,9 @@ void asn1p_lexer_hack_push_encoding_control(void); extern int asn1p_lineno; /* - * Process modifiers as <asn1c:pointer> + * Process directives as <ASN1C:RepresentAsPointer> */ 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 @@ -179,7 +177,7 @@ static void _fixup_anonymous_identifier(asn1p_expr_t *expr); } while(0) -#line 74 "asn1p_y.y" +#line 72 "asn1p_y.y" typedef union { asn1p_t *a_grammar; asn1p_module_flags_e a_module_flags; @@ -223,11 +221,11 @@ typedef union { -#define YYFINAL 434 +#define YYFINAL 431 #define YYFLAG -32768 #define YYNTBASE 118 -#define YYTRANSLATE(x) ((unsigned)(x) <= 356 ? yytranslate[x] : 226) +#define YYTRANSLATE(x) ((unsigned)(x) <= 356 ? yytranslate[x] : 223) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -277,142 +275,142 @@ static const short yyprhs[] = { 0, 103, 108, 110, 114, 116, 120, 122, 126, 130, 133, 135, 139, 141, 145, 147, 148, 155, 157, 159, 164, 168, 172, 179, 181, 185, 187, 191, 195, 199, 201, - 205, 207, 209, 210, 212, 214, 218, 222, 226, 228, + 205, 207, 209, 210, 212, 214, 218, 222, 225, 229, 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, 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, + 290, 292, 294, 298, 302, 306, 307, 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, 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 + 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 }; static const short yyrhs[] = { 119, - 0, 120, 0, 119, 120, 0, 222, 121, 36, 125, + 0, 120, 0, 119, 120, 0, 219, 121, 36, 125, 3, 23, 128, 41, 0, 0, 122, 0, 105, 123, 106, 0, 105, 106, 0, 124, 0, 123, 124, 0, - 225, 0, 225, 107, 9, 108, 0, 9, 0, 0, + 222, 0, 222, 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, 176, 0, 141, 0, - 0, 40, 14, 131, 0, 185, 0, 56, 133, 109, + 132, 0, 138, 0, 144, 0, 173, 0, 141, 0, + 0, 40, 14, 131, 0, 182, 0, 56, 133, 109, 0, 56, 48, 0, 135, 0, 133, 135, 0, 0, - 122, 0, 136, 48, 222, 134, 0, 137, 0, 136, - 110, 137, 0, 222, 0, 222, 105, 106, 0, 225, + 122, 0, 136, 48, 219, 134, 0, 137, 0, 136, + 110, 137, 0, 219, 0, 219, 105, 106, 0, 222, 0, 44, 139, 109, 0, 44, 19, 109, 0, 44, - 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, + 109, 0, 140, 0, 139, 110, 140, 0, 219, 0, + 219, 105, 106, 0, 222, 0, 0, 219, 143, 3, + 105, 142, 178, 0, 168, 0, 179, 0, 219, 3, + 214, 89, 0, 219, 3, 164, 0, 219, 3, 154, + 0, 219, 105, 145, 106, 3, 164, 0, 146, 0, + 145, 110, 146, 0, 219, 0, 219, 111, 222, 0, + 219, 111, 219, 0, 179, 111, 222, 0, 148, 0, + 147, 110, 148, 0, 164, 0, 222, 0, 0, 150, + 0, 151, 0, 150, 110, 151, 0, 222, 164, 208, + 0, 164, 208, 0, 32, 70, 164, 0, 163, 0, + 153, 0, 152, 110, 153, 0, 222, 164, 0, 163, 0, 164, 0, 30, 105, 156, 106, 158, 0, 0, - 90, 0, 157, 0, 156, 110, 157, 0, 174, 211, - 0, 174, 164, 155, 211, 0, 174, 174, 155, 211, + 90, 0, 157, 0, 156, 110, 157, 0, 171, 208, + 0, 171, 164, 155, 208, 0, 171, 171, 155, 208, 0, 0, 159, 0, 0, 97, 84, 105, 160, 161, - 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, 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, 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, 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, 225, 0, 8, 0 + 106, 0, 162, 0, 161, 162, 0, 4, 0, 171, + 0, 104, 0, 104, 112, 176, 0, 104, 112, 213, + 0, 214, 166, 186, 0, 0, 165, 167, 0, 181, + 0, 29, 105, 152, 106, 0, 80, 105, 149, 106, + 0, 81, 105, 149, 106, 0, 80, 186, 70, 221, + 214, 166, 0, 81, 186, 70, 221, 214, 166, 0, + 20, 0, 20, 37, 27, 222, 0, 219, 105, 147, + 106, 0, 168, 0, 58, 70, 168, 0, 13, 0, + 13, 113, 219, 0, 220, 113, 219, 0, 13, 113, + 222, 0, 220, 0, 220, 113, 169, 0, 170, 0, + 169, 113, 170, 0, 172, 0, 172, 0, 15, 0, + 16, 0, 222, 143, 3, 174, 0, 222, 111, 174, + 0, 0, 105, 175, 178, 0, 65, 0, 47, 0, + 88, 0, 5, 0, 7, 0, 177, 0, 213, 0, + 176, 0, 222, 0, 219, 113, 222, 0, 6, 0, + 10, 0, 11, 0, 4, 0, 178, 4, 0, 26, + 0, 65, 0, 78, 0, 180, 0, 69, 83, 0, + 67, 53, 0, 79, 0, 46, 0, 38, 73, 0, + 28, 83, 0, 93, 0, 49, 0, 182, 0, 60, + 0, 42, 0, 24, 83, 0, 179, 0, 180, 210, + 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, + 187, 0, 188, 0, 82, 107, 189, 108, 0, 107, + 189, 108, 0, 188, 107, 189, 108, 0, 190, 0, + 190, 110, 104, 0, 190, 110, 104, 110, 190, 0, + 191, 0, 19, 98, 191, 0, 190, 183, 191, 0, + 190, 184, 191, 0, 191, 185, 191, 0, 194, 107, + 189, 108, 0, 107, 189, 108, 0, 195, 0, 196, + 0, 195, 193, 195, 0, 63, 193, 195, 0, 195, + 193, 62, 0, 63, 193, 62, 0, 202, 0, 197, + 0, 0, 33, 27, 105, 192, 178, 0, 103, 0, + 103, 114, 0, 114, 103, 0, 114, 103, 114, 0, + 82, 0, 48, 0, 47, 0, 88, 0, 213, 0, + 177, 0, 222, 0, 219, 0, 97, 31, 188, 0, + 97, 32, 105, 198, 106, 0, 199, 0, 198, 110, + 199, 0, 104, 0, 222, 186, 200, 0, 0, 201, + 0, 75, 0, 17, 0, 71, 0, 203, 0, 204, + 0, 105, 219, 106, 0, 203, 105, 205, 106, 0, + 206, 0, 205, 110, 206, 0, 115, 207, 0, 115, + 113, 207, 0, 222, 0, 207, 113, 222, 0, 0, + 209, 0, 71, 0, 35, 174, 0, 105, 106, 0, + 105, 211, 106, 0, 212, 0, 211, 110, 212, 0, + 222, 0, 222, 107, 213, 108, 0, 222, 107, 176, + 108, 0, 213, 0, 104, 0, 9, 0, 12, 0, + 0, 215, 0, 216, 218, 0, 116, 217, 9, 117, + 0, 0, 91, 0, 21, 0, 77, 0, 0, 54, + 0, 43, 0, 13, 0, 14, 0, 14, 0, 0, + 222, 0, 8, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 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 + 320, 326, 332, 348, 373, 375, 378, 382, 387, 394, + 402, 407, 411, 420, 422, 430, 434, 442, 446, 449, + 452, 456, 476, 478, 486, 490, 522, 526, 535, 542, + 555, 562, 564, 576, 589, 600, 605, 611, 617, 619, + 622, 633, 639, 645, 652, 658, 666, 670, 673, 680, + 686, 692, 699, 705, 714, 716, 725, 733, 747, 759, + 765, 781, 790, 800, 810, 815, 822, 829, 839, 845, + 851, 855, 878, 880, 882, 888, 894, 902, 908, 915, + 920, 926, 932, 938, 941, 947, 957, 959, 962, 970, + 976, 985, 991, 1008, 1010, 1015, 1019, 1024, 1029, 1035, + 1039, 1050, 1059, 1068, 1079, 1101, 1108, 1127, 1131, 1137, + 1143, 1149, 1159, 1169, 1175, 1189, 1213, 1220, 1234, 1243, + 1253, 1263, 1273, 1281, 1302, 1311, 1320, 1321, 1323, 1330, + 1342, 1352, 1360, 1360, 1365, 1370, 1375, 1380, 1384, 1388, + 1391, 1394, 1399, 1411, 1428, 1433, 1438, 1471, 1481, 1495, + 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, + 1507, 1508, 1514, 1516, 1517, 1520, 1527, 1539, 1541, 1545, + 1549, 1550, 1551, 1552, 1553, 1557, 1558, 1559, 1560, 1564, + 1565, 1572, 1572, 1573, 1573, 1574, 1576, 1578, 1583, 1587, + 1596, 1600, 1605, 1609, 1615, 1625, 1629, 1632, 1635, 1638, + 1643, 1652, 1660, 1666, 1672, 1679, 1687, 1695, 1704, 1707, + 1710, 1711, 1721, 1723, 1724, 1725, 1728, 1732, 1737, 1743, + 1748, 1751, 1754, 1767, 1781, 1785, 1790, 1794, 1799, 1806, + 1819, 1821, 1824, 1828, 1831, 1836, 1840, 1848, 1863, 1869, + 1876, 1889, 1901, 1916, 1920, 1937, 1942, 1945, 1950, 1972, + 1977, 1982, 1988, 1994, 2002, 2010, 2018, 2025, 2035, 2040, + 2070, 2072, 2075, 2082, 2088, 2090, 2091, 2092, 2095, 2097, + 2098, 2101, 2106, 2113, 2120, 2122, 2127 }; #endif @@ -450,13 +448,13 @@ 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","@4","TypeDeclarationSet","@5", -"@6","@7","ComplexTypeReference","ComplexTypeReferenceAmpList","ComplexTypeReferenceElement", -"ClassFieldIdentifier","ClassFieldName","ValueDefinition","Value","@8","DefinedValue", +"ExtensionAndException","Type","NSTD_IndirectMarker","TypeDeclaration","TypeDeclarationSet", +"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", -"@9","ConstraintRangeSpec","ConstraintSpec","SingleValue","ContainedSubtype", +"@5","ConstraintRangeSpec","ConstraintSpec","SingleValue","ContainedSubtype", "InnerTypeConstraint","WithComponentsList","WithComponentsElement","optPresenceConstraint", "PresenceConstraint","TableConstraint","SimpleTableConstraint","ComponentRelationConstraint", "AtNotationList","AtNotationElement","ComponentIdList","optMarker","Marker", @@ -477,24 +475,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, 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 + 162, 163, 163, 163, 164, 165, 166, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 168, 168, + 168, 168, 168, 168, 169, 169, 170, 171, 172, 172, + 173, 174, 175, 174, 174, 174, 174, 174, 174, 174, + 174, 174, 176, 176, 177, 177, 177, 178, 178, 179, + 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, + 179, 179, 180, 180, 180, 181, 181, 182, 182, 182, + 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, + 182, 183, 183, 184, 184, 185, 186, 186, 187, 187, + 188, 188, 189, 189, 189, 190, 190, 190, 190, 190, + 191, 191, 191, 191, 191, 191, 191, 191, 191, 191, + 192, 191, 193, 193, 193, 193, 194, 194, 195, 195, + 195, 195, 195, 196, 197, 197, 198, 198, 199, 199, + 200, 200, 201, 201, 201, 202, 202, 203, 204, 205, + 205, 206, 206, 207, 207, 208, 208, 209, 209, 210, + 210, 211, 211, 212, 212, 212, 212, 212, 213, 213, + 214, 214, 215, 216, 217, 217, 217, 217, 218, 218, + 218, 219, 219, 220, 221, 221, 222 }; static const short yyr2[] = { 0, @@ -505,309 +503,309 @@ static const short yyr2[] = { 0, 4, 1, 3, 1, 3, 1, 3, 3, 2, 1, 3, 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, 2, + 1, 1, 0, 1, 1, 3, 3, 2, 3, 1, 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, 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, 3, 3, 3, 0, 2, 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, 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, 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, - 275, 276, 1, 2, 5, 3, 0, 0, 6, 280, + 272, 273, 1, 2, 5, 3, 0, 0, 6, 277, 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, 171, 0, 0, - 172, 173, 174, 0, 175, 176, 184, 177, 178, 179, - 180, 181, 182, 183, 0, 24, 25, 27, 28, 31, + 18, 21, 19, 0, 17, 12, 23, 168, 0, 0, + 169, 170, 171, 0, 172, 173, 181, 174, 175, 176, + 177, 178, 179, 180, 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, 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, + 26, 261, 119, 274, 0, 150, 0, 0, 164, 157, + 161, 163, 151, 0, 0, 152, 156, 160, 0, 0, + 57, 58, 153, 162, 123, 0, 33, 48, 47, 0, + 0, 35, 38, 0, 0, 0, 0, 265, 61, 60, + 106, 262, 269, 0, 165, 159, 158, 155, 154, 0, 63, 0, 65, 0, 0, 0, 51, 53, 39, 43, - 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, + 45, 0, 267, 268, 266, 0, 59, 0, 187, 271, + 270, 263, 120, 122, 0, 0, 0, 0, 55, 129, + 130, 124, 125, 127, 121, 138, 145, 139, 259, 146, + 147, 260, 136, 135, 137, 133, 131, 142, 140, 141, + 0, 143, 40, 41, 0, 89, 261, 128, 0, 119, + 274, 114, 0, 0, 187, 187, 107, 117, 166, 153, + 108, 0, 0, 0, 105, 188, 189, 261, 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 + 248, 87, 87, 91, 247, 106, 264, 0, 261, 0, + 261, 0, 261, 0, 0, 167, 261, 0, 0, 0, + 219, 218, 0, 217, 220, 0, 0, 0, 222, 0, + 193, 196, 0, 203, 204, 210, 209, 236, 237, 221, + 224, 223, 0, 62, 148, 56, 126, 134, 144, 132, + 0, 86, 95, 90, 249, 88, 246, 246, 0, 102, + 0, 81, 84, 85, 261, 118, 0, 0, 74, 75, + 80, 246, 261, 275, 0, 275, 258, 250, 0, 252, + 257, 254, 0, 69, 71, 72, 0, 0, 0, 213, + 0, 0, 0, 0, 0, 0, 191, 184, 185, 182, + 183, 0, 0, 0, 186, 0, 0, 0, 0, 0, + 149, 0, 92, 93, 115, 0, 109, 261, 83, 261, + 110, 261, 78, 246, 261, 276, 111, 261, 251, 0, + 0, 116, 261, 190, 197, 211, 214, 215, 208, 206, + 225, 0, 238, 202, 194, 198, 199, 200, 0, 207, + 205, 0, 0, 240, 192, 96, 103, 104, 143, 82, + 79, 76, 77, 106, 106, 253, 0, 0, 70, 0, + 216, 229, 0, 227, 187, 0, 201, 0, 242, 244, + 239, 0, 0, 112, 113, 256, 255, 212, 226, 0, + 231, 195, 243, 0, 241, 100, 0, 98, 101, 228, + 234, 235, 233, 230, 232, 245, 97, 99, 0, 0, + 0 }; -static const short yydefgoto[] = { 432, +static const short yydefgoto[] = { 429, 3, 4, 8, 9, 13, 14, 25, 26, 27, 55, 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 + 69, 70, 60, 213, 100, 61, 130, 131, 303, 304, + 288, 289, 290, 281, 282, 119, 277, 185, 186, 272, + 273, 403, 417, 418, 291, 292, 148, 149, 197, 101, + 162, 163, 187, 188, 62, 177, 215, 178, 249, 266, + 102, 103, 201, 104, 323, 324, 326, 205, 206, 207, + 250, 251, 252, 390, 312, 253, 254, 255, 256, 393, + 394, 424, 425, 257, 258, 259, 373, 374, 399, 224, + 225, 236, 299, 300, 260, 226, 122, 123, 146, 152, + 261, 105, 345, 262 }; -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, +static const short yypact[] = { 9, +-32768,-32768, 9,-32768, -76,-32768, 47, 15,-32768,-32768, +-32768,-32768, 55,-32768, -24, 158,-32768,-32768, 130, 95, + 81, 97, 162, 128, 228, 158,-32768, 141,-32768,-32768, +-32768,-32768,-32768, 213,-32768,-32768, 419,-32768, 224, 39, +-32768,-32768,-32768, 157,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768, 211, 419,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 344, 571,-32768, 151,-32768, 79,-32768, + 164,-32768,-32768, 46,-32768, -36,-32768, 183,-32768,-32768, +-32768, -11, 173,-32768, 229,-32768, 235, 249,-32768,-32768, +-32768,-32768,-32768, 270, 241,-32768,-32768,-32768, 646, 322, +-32768,-32768,-32768,-32768, 214, 323,-32768,-32768,-32768, 168, + 226,-32768,-32768, 9, 168, 234, 225, 4,-32768,-32768, + 250,-32768, -22, 168,-32768,-32768,-32768,-32768,-32768, 96, +-32768, 230, 237, 240, 295, 185,-32768,-32768, -76,-32768, +-32768, 269,-32768,-32768,-32768, 333,-32768, 496, 0,-32768, +-32768,-32768,-32768,-32768, 347, 646, 343, 168,-32768,-32768, +-32768, 243,-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,-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, 421, 424,-32768 + 246, 242,-32768,-32768, 105,-32768, 63,-32768, 244, 73, + 255, 317, 257, 293, -34, 51,-32768,-32768,-32768, 259, +-32768, 261, 260, 80,-32768,-32768, 264, 258,-32768,-32768, +-32768,-32768, 369, 269, 369, 343, 185, 279, 269, 185, +-32768, 288, 288,-32768,-32768,-32768,-32768, 350, 5, 233, + 8, 309, 8, 310, 34,-32768, 6, 80, 283, 356, +-32768,-32768, 27,-32768,-32768, 271, 9, 80,-32768, 276, + 181, 289, 278, 27,-32768,-32768,-32768, 284,-32768,-32768, +-32768,-32768, 80,-32768,-32768, 384,-32768, 384,-32768,-32768, + 308,-32768,-32768,-32768,-32768,-32768, -9, -9, 343, 285, + 117,-32768,-32768,-32768, 258,-32768, 328, 294, 291,-32768, +-32768, -9, 258, 343, 296, 343,-32768,-32768, 119,-32768, +-32768, 299, 152,-32768,-32768,-32768, 300, 231, 311, 301, + 314, 245, 307, 313, 315, 316,-32768,-32768,-32768,-32768, +-32768, 321, 231, 231,-32768, 231, 80, 287, 304, 318, +-32768, 325,-32768,-32768,-32768, 292,-32768, 5,-32768, 258, +-32768, 2,-32768, -9, 258,-32768,-32768, 258,-32768, 60, + 292,-32768, 6,-32768,-32768,-32768,-32768, 320,-32768,-32768, + 264, 31,-32768,-32768, 331,-32768,-32768,-32768, 327,-32768, +-32768, 10, 160,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, 334, 335,-32768, 369, +-32768,-32768, 161,-32768, 0, 80,-32768, 343, 286,-32768, +-32768, 304, 159,-32768,-32768,-32768,-32768, 384,-32768, 31, + 129, 215, 286, 343,-32768,-32768, 20,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 428, 445, +-32768 }; static const short yypgoto[] = {-32768, --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 +-32768, 443,-32768, 312,-32768, 434,-32768,-32768, 422,-32768, +-32768, 394,-32768,-32768,-32768,-32768, 378,-32768, 338,-32768, +-32768, 345,-32768,-32768, 389,-32768,-32768, 302,-32768, 103, + 227,-32768, 115,-32768, 123,-32768, 239,-32768, 247,-32768, +-32768,-32768,-32768, 48, -218, -77,-32768, -64,-32768, -133, +-32768, 253, -184, -118,-32768, -73,-32768, -266, -75, -206, + -72, 324,-32768, -6,-32768,-32768,-32768, -188,-32768, 155, + -161, 68, -49,-32768, 219,-32768, -284,-32768,-32768,-32768, + 64,-32768,-32768,-32768,-32768,-32768,-32768, 74, 83, -212, +-32768,-32768,-32768, 127, -116, -80,-32768,-32768,-32768,-32768, + 1,-32768, 182, -7 }; -#define YYLAST 745 +#define YYLAST 742 static const short yytable[] = { 15, - 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 + 5, 121, 223, 5, 120, 15, 232, 234, 268, 10, + 283, 114, 10, 10, 198, 10, 164, 10, 117, 180, + 150, 1, 2, 416, 143, 220, 132, 360, 7, 65, + 63, 151, 72, 287, 160, 161, 79, 64, 10, 287, + 71, 10, 169, 371, 78, 172, 10, 203, 65, 63, + 16, 1, 2, 10, 10, 11, 64, 67, 1, 2, + 179, 221, 10, 11, 333, 334, 79, 10, 169, 377, + 231, 172, 204, 115, 78, 199, 307, 160, 161, 343, + 144, 203, 19, 132, 387, 167, 316, 10, 169, 170, + 171, 172, 1, 2, 145, 164, 286, 220, 239, 133, + 180, 330, 72, 180, 118, 280, 204, 79, 280, 222, + 71, 280, 240, -73, 139, 78, 154, 118, 301, 283, + 118, 118, 398, 118, 153, 427, 241, 242, 182, 310, + 264, 383, 203, 221, 392, 165, 181, 297, 28, 298, + 311, 179, 243, 270, 179, 421, 275, 68, 202, 210, + 212, 284, 12, 29, 112, 233, 133, 204, 211, 305, + 17, 244, 416, 297, 10, 369, 30, 245, -246, 1, + 2, 20, -246, 160, 161, 10, 246, -272, 118, 21, + 1, 2, 31, 408, 247, 124, 248, 109, 110, 166, + 167, 168, 10, 169, 170, 171, 172, 1, 2, 422, + 22, 155, 23, 423, 73, 156, 411, 339, 269, 182, + 218, 24, 182, 33, 219, 344, 32, 181, 419, 378, + 181, 285, 337, 293, 349, 293, 338, 302, 350, 306, + 34, 173, 419, 301, 388, 37, 167, 66, 10, 169, + 170, 171, 172, 1, 2, 83, 84, 315, 36, 174, + 167, 80, 10, 169, 170, 171, 172, 352, 355, 108, + 284, 353, 381, 240, 384, 401, 409, 385, 111, 402, + 410, 335, 175, 366, 367, 305, 368, 241, 242, 318, + 319, 320, 321, 160, 161, 124, 346, 116, 346, 176, + 322, 241, 167, 243, 10, 169, 170, 171, 172, 10, + 169, 313, 314, 172, 1, 2, 359, 1, 2, 160, + 161, 125, 244, 318, 319, 320, 321, 126, 245, 404, + 405, 127, 128, 129, 134, 136, 135, 246, 379, 142, + 285, 138, 245, 241, 293, 247, 181, 248, 147, 141, + 157, 189, 302, 379, 159, 306, 82, 158, 370, 208, + 10, 181, 217, 228, 395, 214, 83, 84, 216, -273, + 227, 229, 230, 235, 400, 237, 238, 85, 38, 86, + 263, 87, 265, 118, 245, 271, 279, 276, 294, 296, + 308, 88, 309, 317, 327, 89, 325, 331, 329, 90, + 400, 332, 91, 41, 42, 43, 336, 340, 414, 341, + 342, 347, 395, 92, 45, 351, 426, 354, 93, 46, + 94, 47, 95, 204, 357, 356, 358, 362, 372, 48, + 363, 96, 97, 364, 365, 375, 10, 430, 49, 376, + 50, 1, 2, 391, 397, 51, 98, 52, 53, 54, + 396, 406, 407, 38, 431, 6, 18, 35, 99, 81, + 183, 113, 140, 106, 137, 389, 382, 209, 39, 295, + 380, 278, 40, 412, 428, 274, 267, 361, 41, 42, + 43, 200, 328, 420, 44, 415, 386, 348, 0, 45, + 413, 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, 190, 191, + 51, 0, 52, 53, 54, 192, 0, 0, 0, 85, + 38, 86, 0, 87, 193, 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, 194, 0, 92, 45, 0, 0, 0, + 93, 46, 94, 47, 95, 0, 0, 0, 0, 0, + 0, 48, 0, 96, 97, 195, 196, 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, - 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 + 0, 82, 187, 3, 82, 13, 195, 196, 215, 8, + 229, 48, 8, 8, 148, 8, 135, 8, 30, 136, + 43, 13, 14, 4, 21, 35, 99, 312, 105, 37, + 37, 54, 40, 32, 15, 16, 44, 37, 8, 32, + 40, 8, 9, 328, 44, 12, 8, 82, 56, 56, + 36, 13, 14, 8, 8, 9, 56, 19, 13, 14, + 136, 71, 8, 9, 277, 278, 74, 8, 9, 336, + 105, 12, 107, 110, 74, 148, 238, 15, 16, 292, + 77, 82, 107, 156, 351, 6, 248, 8, 9, 10, + 11, 12, 13, 14, 91, 214, 230, 35, 19, 99, + 217, 263, 110, 220, 116, 104, 107, 115, 104, 187, + 110, 104, 33, 106, 114, 115, 124, 116, 235, 338, + 116, 116, 113, 116, 124, 106, 47, 48, 136, 103, + 208, 344, 82, 71, 104, 135, 136, 104, 9, 106, + 114, 217, 63, 217, 220, 17, 220, 109, 148, 157, + 158, 229, 106, 59, 109, 105, 156, 107, 158, 237, + 106, 82, 4, 104, 8, 327, 86, 88, 106, 13, + 14, 14, 110, 15, 16, 8, 97, 105, 116, 22, + 13, 14, 86, 390, 105, 113, 107, 109, 110, 5, + 6, 7, 8, 9, 10, 11, 12, 13, 14, 71, + 43, 106, 45, 75, 48, 110, 395, 285, 216, 217, + 106, 54, 220, 86, 110, 293, 55, 217, 403, 336, + 220, 229, 106, 231, 106, 233, 110, 235, 110, 237, + 3, 47, 417, 350, 351, 23, 6, 14, 8, 9, + 10, 11, 12, 13, 14, 13, 14, 247, 108, 65, + 6, 41, 8, 9, 10, 11, 12, 106, 308, 109, + 338, 110, 340, 33, 345, 106, 106, 348, 105, 110, + 110, 279, 88, 323, 324, 353, 326, 47, 48, 99, + 100, 101, 102, 15, 16, 113, 294, 105, 296, 105, + 110, 47, 6, 63, 8, 9, 10, 11, 12, 8, + 9, 31, 32, 12, 13, 14, 62, 13, 14, 15, + 16, 83, 82, 99, 100, 101, 102, 83, 88, 384, + 385, 73, 53, 83, 3, 3, 113, 97, 336, 105, + 338, 106, 88, 47, 342, 105, 336, 107, 89, 106, + 111, 9, 350, 351, 105, 353, 3, 111, 62, 3, + 8, 351, 111, 37, 362, 113, 13, 14, 113, 105, + 117, 105, 70, 105, 372, 105, 107, 24, 25, 26, + 107, 28, 4, 116, 88, 97, 27, 90, 70, 70, + 98, 38, 27, 108, 107, 42, 98, 4, 105, 46, + 398, 84, 49, 50, 51, 52, 112, 70, 113, 106, + 110, 106, 410, 60, 61, 107, 414, 108, 65, 66, + 67, 68, 69, 107, 114, 105, 103, 105, 115, 76, + 106, 78, 79, 108, 104, 108, 8, 0, 85, 105, + 87, 13, 14, 114, 108, 92, 93, 94, 95, 96, + 110, 108, 108, 25, 0, 3, 13, 26, 105, 56, + 139, 74, 115, 65, 110, 353, 342, 156, 40, 233, + 338, 223, 44, 396, 417, 219, 214, 313, 50, 51, + 52, 148, 254, 410, 56, 402, 350, 296, -1, 61, + 398, -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, 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" @@ -1353,13 +1351,13 @@ yyreduce: switch (yyn) { case 1: -#line 322 "asn1p_y.y" +#line 321 "asn1p_y.y" { *(void **)param = yyvsp[0].a_grammar; ; break;} case 2: -#line 328 "asn1p_y.y" +#line 327 "asn1p_y.y" { yyval.a_grammar = asn1p_new(); checkmem(yyval.a_grammar); @@ -1367,14 +1365,14 @@ case 2: ; break;} case 3: -#line 333 "asn1p_y.y" +#line 332 "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 354 "asn1p_y.y" +#line 353 "asn1p_y.y" { if(yyvsp[-1].a_module) { @@ -1391,27 +1389,27 @@ case 4: ; break;} case 5: -#line 375 "asn1p_y.y" +#line 374 "asn1p_y.y" { yyval.a_oid = 0; ; break;} case 6: -#line 376 "asn1p_y.y" +#line 375 "asn1p_y.y" { yyval.a_oid = yyvsp[0].a_oid; ; break;} case 7: -#line 380 "asn1p_y.y" +#line 379 "asn1p_y.y" { yyval.a_oid = yyvsp[-1].a_oid; ; break;} case 8: -#line 383 "asn1p_y.y" +#line 382 "asn1p_y.y" { yyval.a_oid = 0; ; break;} case 9: -#line 389 "asn1p_y.y" +#line 388 "asn1p_y.y" { yyval.a_oid = asn1p_oid_new(); asn1p_oid_add_arc(yyval.a_oid, &yyvsp[0].a_oid_arc); @@ -1420,7 +1418,7 @@ case 9: ; break;} case 10: -#line 395 "asn1p_y.y" +#line 394 "asn1p_y.y" { yyval.a_oid = yyvsp[-1].a_oid; asn1p_oid_add_arc(yyval.a_oid, &yyvsp[0].a_oid_arc); @@ -1429,74 +1427,74 @@ case 10: ; break;} case 11: -#line 404 "asn1p_y.y" +#line 403 "asn1p_y.y" { /* iso */ yyval.a_oid_arc.name = yyvsp[0].tv_str; yyval.a_oid_arc.number = -1; ; break;} case 12: -#line 408 "asn1p_y.y" +#line 407 "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 412 "asn1p_y.y" +#line 411 "asn1p_y.y" { /* 1 */ yyval.a_oid_arc.name = 0; yyval.a_oid_arc.number = yyvsp[0].a_int; ; break;} case 14: -#line 422 "asn1p_y.y" +#line 421 "asn1p_y.y" { yyval.a_module_flags = MSF_NOFLAGS; ; break;} case 15: -#line 423 "asn1p_y.y" +#line 422 "asn1p_y.y" { yyval.a_module_flags = yyvsp[0].a_module_flags; ; break;} case 16: -#line 432 "asn1p_y.y" +#line 431 "asn1p_y.y" { yyval.a_module_flags = yyvsp[0].a_module_flags; ; break;} case 17: -#line 435 "asn1p_y.y" +#line 434 "asn1p_y.y" { yyval.a_module_flags = yyvsp[-1].a_module_flags | yyvsp[0].a_module_flags; ; break;} case 18: -#line 444 "asn1p_y.y" +#line 443 "asn1p_y.y" { yyval.a_module_flags = MSF_EXPLICIT_TAGS; ; break;} case 19: -#line 447 "asn1p_y.y" +#line 446 "asn1p_y.y" { yyval.a_module_flags = MSF_IMPLICIT_TAGS; ; break;} case 20: -#line 450 "asn1p_y.y" +#line 449 "asn1p_y.y" { yyval.a_module_flags = MSF_AUTOMATIC_TAGS; ; break;} case 21: -#line 453 "asn1p_y.y" +#line 452 "asn1p_y.y" { yyval.a_module_flags = MSF_EXTENSIBILITY_IMPLIED; ; break;} case 22: -#line 457 "asn1p_y.y" +#line 456 "asn1p_y.y" { /* X.680Amd1 specifies TAG and XER */ if(strcmp(yyvsp[-1].tv_str, "TAG") == 0) { @@ -1514,23 +1512,23 @@ case 22: ; break;} case 23: -#line 478 "asn1p_y.y" +#line 477 "asn1p_y.y" { yyval.a_module = 0; ; break;} case 24: -#line 479 "asn1p_y.y" +#line 478 "asn1p_y.y" { yyval.a_module = yyvsp[0].a_module; ; break;} case 25: -#line 488 "asn1p_y.y" +#line 487 "asn1p_y.y" { yyval.a_module = yyvsp[0].a_module; ; break;} case 26: -#line 491 "asn1p_y.y" +#line 490 "asn1p_y.y" { yyval.a_module = yyvsp[-1].a_module; @@ -1560,13 +1558,13 @@ case 26: ; break;} case 27: -#line 524 "asn1p_y.y" +#line 523 "asn1p_y.y" { yyval.a_module = yyvsp[0].a_module; ; break;} case 28: -#line 527 "asn1p_y.y" +#line 526 "asn1p_y.y" { yyval.a_module = asn1p_module_new(); checkmem(yyval.a_module); @@ -1578,7 +1576,7 @@ case 28: ; break;} case 29: -#line 536 "asn1p_y.y" +#line 535 "asn1p_y.y" { yyval.a_module = asn1p_module_new(); checkmem(yyval.a_module); @@ -1588,7 +1586,7 @@ case 29: ; break;} case 30: -#line 543 "asn1p_y.y" +#line 542 "asn1p_y.y" { yyval.a_module = asn1p_module_new(); checkmem(yyval.a_module); @@ -1598,7 +1596,7 @@ case 30: ; break;} case 31: -#line 556 "asn1p_y.y" +#line 555 "asn1p_y.y" { yyval.a_module = asn1p_module_new(); checkmem(yyval.a_module); @@ -1608,11 +1606,11 @@ case 31: ; break;} case 32: -#line 564 "asn1p_y.y" +#line 563 "asn1p_y.y" { asn1p_lexer_hack_push_encoding_control(); ; break;} case 33: -#line 565 "asn1p_y.y" +#line 564 "asn1p_y.y" { fprintf(stderr, "WARNING: ENCODING-CONTROL %s " @@ -1623,7 +1621,7 @@ case 33: ; break;} case 34: -#line 577 "asn1p_y.y" +#line 576 "asn1p_y.y" { return yyerror( "Attempt to redefine a standard basic type, " @@ -1632,7 +1630,7 @@ case 34: ; break;} case 35: -#line 591 "asn1p_y.y" +#line 590 "asn1p_y.y" { if(!saved_aid && 0) return yyerror("Unterminated IMPORTS FROM, " @@ -1642,13 +1640,13 @@ case 35: ; break;} case 36: -#line 601 "asn1p_y.y" +#line 600 "asn1p_y.y" { return yyerror("Empty IMPORTS list"); ; break;} case 37: -#line 607 "asn1p_y.y" +#line 606 "asn1p_y.y" { yyval.a_module = asn1p_module_new(); checkmem(yyval.a_module); @@ -1656,22 +1654,22 @@ case 37: ; break;} case 38: -#line 612 "asn1p_y.y" +#line 611 "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 619 "asn1p_y.y" +#line 618 "asn1p_y.y" { memset(&yyval.a_aid, 0, sizeof(yyval.a_aid)); ; break;} case 40: -#line 620 "asn1p_y.y" +#line 619 "asn1p_y.y" { yyval.a_aid.oid = yyvsp[0].a_oid; ; break;} case 41: -#line 624 "asn1p_y.y" +#line 623 "asn1p_y.y" { yyval.a_xports = yyvsp[-3].a_xports; yyval.a_xports->fromModuleName = yyvsp[-1].tv_str; @@ -1682,7 +1680,7 @@ case 41: ; break;} case 42: -#line 635 "asn1p_y.y" +#line 634 "asn1p_y.y" { yyval.a_xports = asn1p_xports_new(); checkmem(yyval.a_xports); @@ -1690,14 +1688,14 @@ case 42: ; break;} case 43: -#line 640 "asn1p_y.y" +#line 639 "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 647 "asn1p_y.y" +#line 646 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1706,7 +1704,7 @@ case 44: ; break;} case 45: -#line 653 "asn1p_y.y" +#line 652 "asn1p_y.y" { /* Completely equivalent to above */ yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1715,7 +1713,7 @@ case 45: ; break;} case 46: -#line 659 "asn1p_y.y" +#line 658 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1724,19 +1722,19 @@ case 46: ; break;} case 47: -#line 668 "asn1p_y.y" +#line 667 "asn1p_y.y" { yyval.a_xports = yyvsp[-1].a_xports; ; break;} case 48: -#line 671 "asn1p_y.y" +#line 670 "asn1p_y.y" { yyval.a_xports = 0; ; break;} case 49: -#line 674 "asn1p_y.y" +#line 673 "asn1p_y.y" { /* Empty EXPORTS clause effectively prohibits export. */ yyval.a_xports = asn1p_xports_new(); @@ -1744,7 +1742,7 @@ case 49: ; break;} case 50: -#line 682 "asn1p_y.y" +#line 681 "asn1p_y.y" { yyval.a_xports = asn1p_xports_new(); assert(yyval.a_xports); @@ -1752,14 +1750,14 @@ case 50: ; break;} case 51: -#line 687 "asn1p_y.y" +#line 686 "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 694 "asn1p_y.y" +#line 693 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1768,7 +1766,7 @@ case 52: ; break;} case 53: -#line 700 "asn1p_y.y" +#line 699 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1777,7 +1775,7 @@ case 53: ; break;} case 54: -#line 706 "asn1p_y.y" +#line 705 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1786,11 +1784,11 @@ case 54: ; break;} case 55: -#line 717 "asn1p_y.y" +#line 716 "asn1p_y.y" { asn1p_lexer_hack_push_opaque_state(); ; break;} case 56: -#line 717 "asn1p_y.y" +#line 716 "asn1p_y.y" { yyval.a_expr = yyvsp[-4].a_expr; assert(yyval.a_expr->Identifier == 0); @@ -1800,7 +1798,7 @@ case 56: ; break;} case 57: -#line 727 "asn1p_y.y" +#line 726 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1810,7 +1808,7 @@ case 57: ; break;} case 58: -#line 734 "asn1p_y.y" +#line 733 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1819,7 +1817,7 @@ case 58: ; break;} case 59: -#line 752 "asn1p_y.y" +#line 751 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1830,7 +1828,7 @@ case 59: ; break;} case 60: -#line 760 "asn1p_y.y" +#line 759 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; yyval.a_expr->Identifier = yyvsp[-2].tv_str; @@ -1839,7 +1837,7 @@ case 60: ; break;} case 61: -#line 766 "asn1p_y.y" +#line 765 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; yyval.a_expr->Identifier = yyvsp[-2].tv_str; @@ -1848,7 +1846,7 @@ case 61: ; break;} case 62: -#line 782 "asn1p_y.y" +#line 781 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; assert(yyval.a_expr->Identifier == 0); @@ -1858,7 +1856,7 @@ case 62: ; break;} case 63: -#line 792 "asn1p_y.y" +#line 791 "asn1p_y.y" { int ret; yyval.a_plist = asn1p_paramlist_new(yylineno); @@ -1870,7 +1868,7 @@ case 63: ; break;} case 64: -#line 801 "asn1p_y.y" +#line 800 "asn1p_y.y" { int ret; yyval.a_plist = yyvsp[-2].a_plist; @@ -1881,14 +1879,14 @@ case 64: ; break;} case 65: -#line 812 "asn1p_y.y" +#line 811 "asn1p_y.y" { yyval.a_parg.governor = NULL; yyval.a_parg.argument = yyvsp[0].tv_str; ; break;} case 66: -#line 816 "asn1p_y.y" +#line 815 "asn1p_y.y" { int ret; yyval.a_parg.governor = asn1p_ref_new(yylineno); @@ -1898,7 +1896,7 @@ case 66: ; break;} case 67: -#line 823 "asn1p_y.y" +#line 822 "asn1p_y.y" { int ret; yyval.a_parg.governor = asn1p_ref_new(yylineno); @@ -1908,7 +1906,7 @@ case 67: ; break;} case 68: -#line 830 "asn1p_y.y" +#line 829 "asn1p_y.y" { int ret; yyval.a_parg.governor = asn1p_ref_new(yylineno); @@ -1919,7 +1917,7 @@ case 68: ; break;} case 69: -#line 841 "asn1p_y.y" +#line 840 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1927,20 +1925,20 @@ case 69: ; break;} case 70: -#line 846 "asn1p_y.y" +#line 845 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} case 71: -#line 853 "asn1p_y.y" +#line 852 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; ; break;} case 72: -#line 856 "asn1p_y.y" +#line 855 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1950,15 +1948,15 @@ case 72: ; break;} case 73: -#line 880 "asn1p_y.y" +#line 879 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); ; break;} case 74: -#line 881 "asn1p_y.y" +#line 880 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; ; break;} case 75: -#line 884 "asn1p_y.y" +#line 883 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -1966,24 +1964,34 @@ case 75: ; break;} case 76: -#line 889 "asn1p_y.y" +#line 888 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} case 77: -#line 896 "asn1p_y.y" +#line 895 "asn1p_y.y" { yyval.a_expr = yyvsp[-1].a_expr; assert(yyval.a_expr->Identifier == 0); yyval.a_expr->Identifier = yyvsp[-2].tv_str; + yyvsp[0].a_marker.flags |= yyval.a_expr->marker.flags; yyval.a_expr->marker = yyvsp[0].a_marker; ; break;} case 78: #line 902 "asn1p_y.y" { + yyval.a_expr = yyvsp[-1].a_expr; + yyvsp[0].a_marker.flags |= yyval.a_expr->marker.flags; + yyval.a_expr->marker = yyvsp[0].a_marker; + _fixup_anonymous_identifier(yyval.a_expr); + ; + break;} +case 79: +#line 908 "asn1p_y.y" +{ yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); yyval.a_expr->meta_type = yyvsp[0].a_expr->meta_type; @@ -1991,22 +1999,14 @@ case 78: asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} -case 79: -#line 909 "asn1p_y.y" -{ - yyval.a_expr = yyvsp[0].a_expr; - ; - break;} case 80: -#line 912 "asn1p_y.y" +#line 915 "asn1p_y.y" { - yyval.a_expr = yyvsp[-1].a_expr; - yyval.a_expr->marker = yyvsp[0].a_marker; - _fixup_anonymous_identifier(yyval.a_expr); + yyval.a_expr = yyvsp[0].a_expr; ; break;} case 81: -#line 920 "asn1p_y.y" +#line 921 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2014,14 +2014,14 @@ case 81: ; break;} case 82: -#line 925 "asn1p_y.y" +#line 926 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} case 83: -#line 932 "asn1p_y.y" +#line 933 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; assert(yyval.a_expr->Identifier == 0); @@ -2029,20 +2029,20 @@ case 83: ; break;} case 84: -#line 937 "asn1p_y.y" +#line 938 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; ; break;} case 85: -#line 940 "asn1p_y.y" +#line 941 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; _fixup_anonymous_identifier(yyval.a_expr); ; break;} case 86: -#line 947 "asn1p_y.y" +#line 948 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; checkmem(yyval.a_expr); @@ -2052,15 +2052,15 @@ case 86: ; break;} case 87: -#line 957 "asn1p_y.y" +#line 958 "asn1p_y.y" { yyval.a_int = 0; ; break;} case 88: -#line 958 "asn1p_y.y" +#line 959 "asn1p_y.y" { yyval.a_int = 1; ; break;} case 89: -#line 962 "asn1p_y.y" +#line 963 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2070,14 +2070,14 @@ case 89: ; break;} case 90: -#line 969 "asn1p_y.y" +#line 970 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} case 91: -#line 976 "asn1p_y.y" +#line 977 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2088,7 +2088,7 @@ case 91: ; break;} case 92: -#line 984 "asn1p_y.y" +#line 985 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; yyval.a_expr->Identifier = yyvsp[-3].a_refcomp.name; @@ -2097,7 +2097,7 @@ case 92: ; break;} case 93: -#line 990 "asn1p_y.y" +#line 991 "asn1p_y.y" { int ret; yyval.a_expr = asn1p_expr_new(yylineno); @@ -2115,47 +2115,47 @@ case 93: ; break;} case 94: -#line 1008 "asn1p_y.y" +#line 1009 "asn1p_y.y" { yyval.a_wsynt = 0; ; break;} case 95: -#line 1009 "asn1p_y.y" +#line 1010 "asn1p_y.y" { yyval.a_wsynt = yyvsp[0].a_wsynt; ; break;} case 96: -#line 1016 "asn1p_y.y" +#line 1017 "asn1p_y.y" { asn1p_lexer_hack_enable_with_syntax(); ; break;} case 97: -#line 1018 "asn1p_y.y" +#line 1019 "asn1p_y.y" { yyval.a_wsynt = yyvsp[-1].a_wsynt; ; break;} case 98: -#line 1024 "asn1p_y.y" +#line 1025 "asn1p_y.y" { yyval.a_wsynt = asn1p_wsyntx_new(); TQ_ADD(&(yyval.a_wsynt->chunks), yyvsp[0].a_wchunk, next); ; break;} case 99: -#line 1028 "asn1p_y.y" +#line 1029 "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 1035 "asn1p_y.y" +#line 1036 "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 1038 "asn1p_y.y" +#line 1039 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -2167,7 +2167,7 @@ case 101: ; break;} case 102: -#line 1050 "asn1p_y.y" +#line 1051 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2178,7 +2178,7 @@ case 102: ; break;} case 103: -#line 1058 "asn1p_y.y" +#line 1059 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2190,7 +2190,7 @@ case 103: ; break;} case 104: -#line 1067 "asn1p_y.y" +#line 1068 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2202,7 +2202,7 @@ case 104: ; break;} case 105: -#line 1079 "asn1p_y.y" +#line 1080 "asn1p_y.y" { yyval.a_expr = yyvsp[-1].a_expr; yyval.a_expr->tag = yyvsp[-2].a_tag; @@ -2221,66 +2221,69 @@ case 105: yyval.a_expr->constraints = yyvsp[0].a_constr; } } - asn1p_last_type = yyval.a_expr; ; break;} case 106: #line 1102 "asn1p_y.y" -{apply_nonstd_mods();; +{ + yyval.a_int = asn1p_as_pointer ? EM_INDIRECT : 0; + asn1p_as_pointer = 0; + ; break;} case 107: -#line 1102 "asn1p_y.y" +#line 1109 "asn1p_y.y" { yyval.a_expr = yyvsp[0].a_expr; + yyval.a_expr->marker.flags |= yyvsp[-1].a_int; + + if((yyval.a_expr->marker.flags & EM_INDIRECT) + && (yyval.a_expr->marker.flags & EM_OPTIONAL) != EM_OPTIONAL) { + fprintf(stderr, + "INFO: Directive <ASN1C:RepresentAsPointer> " + "applied to %s at line %d\n", + ASN_EXPR_TYPE2STR(yyval.a_expr->expr_type) + ? ASN_EXPR_TYPE2STR(yyval.a_expr->expr_type) + : "member", + yyval.a_expr->_lineno + ); + } ; break;} case 108: -#line 1107 "asn1p_y.y" +#line 1128 "asn1p_y.y" { 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" +#line 1131 "asn1p_y.y" { - yyval.a_expr = yyvsp[-2].a_expr; + yyval.a_expr = yyvsp[-1].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 111: -#line 1116 "asn1p_y.y" -{apply_nonstd_mods();; - break;} -case 112: -#line 1116 "asn1p_y.y" +case 110: +#line 1137 "asn1p_y.y" { - yyval.a_expr = yyvsp[-2].a_expr; + yyval.a_expr = yyvsp[-1].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 113: -#line 1122 "asn1p_y.y" -{apply_nonstd_mods();; - break;} -case 114: -#line 1122 "asn1p_y.y" +case 111: +#line 1143 "asn1p_y.y" { - yyval.a_expr = yyvsp[-2].a_expr; + yyval.a_expr = yyvsp[-1].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 115: -#line 1128 "asn1p_y.y" +case 112: +#line 1149 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2292,8 +2295,8 @@ case 115: asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} -case 116: -#line 1138 "asn1p_y.y" +case 113: +#line 1159 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2305,8 +2308,8 @@ case 116: asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} -case 117: -#line 1148 "asn1p_y.y" +case 114: +#line 1169 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2314,8 +2317,8 @@ case 117: yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 118: -#line 1154 "asn1p_y.y" +case 115: +#line 1175 "asn1p_y.y" { int ret; yyval.a_expr = asn1p_expr_new(yylineno); @@ -2328,8 +2331,8 @@ case 118: yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 119: -#line 1168 "asn1p_y.y" +case 116: +#line 1189 "asn1p_y.y" { int ret; yyval.a_expr = yyvsp[-1].a_expr; @@ -2345,8 +2348,8 @@ case 119: yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 120: -#line 1192 "asn1p_y.y" +case 117: +#line 1213 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2355,8 +2358,8 @@ case 120: yyval.a_expr->meta_type = AMT_TYPEREF; ; break;} -case 121: -#line 1199 "asn1p_y.y" +case 118: +#line 1220 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2365,8 +2368,8 @@ case 121: yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 122: -#line 1214 "asn1p_y.y" +case 119: +#line 1235 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2376,8 +2379,8 @@ case 122: free(yyvsp[0].tv_str); ; break;} -case 123: -#line 1222 "asn1p_y.y" +case 120: +#line 1243 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2389,8 +2392,8 @@ case 123: free(yyvsp[-2].tv_str); ; break;} -case 124: -#line 1232 "asn1p_y.y" +case 121: +#line 1253 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2402,8 +2405,8 @@ case 124: free(yyvsp[-2].tv_str); ; break;} -case 125: -#line 1242 "asn1p_y.y" +case 122: +#line 1263 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2415,8 +2418,8 @@ case 125: free(yyvsp[-2].tv_str); ; break;} -case 126: -#line 1252 "asn1p_y.y" +case 123: +#line 1273 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2426,8 +2429,8 @@ case 126: checkmem(ret == 0); ; break;} -case 127: -#line 1260 "asn1p_y.y" +case 124: +#line 1281 "asn1p_y.y" { int ret; yyval.a_ref = yyvsp[0].a_ref; @@ -2448,8 +2451,8 @@ case 127: } ; break;} -case 128: -#line 1282 "asn1p_y.y" +case 125: +#line 1303 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2459,8 +2462,8 @@ case 128: checkmem(ret == 0); ; break;} -case 129: -#line 1290 "asn1p_y.y" +case 126: +#line 1311 "asn1p_y.y" { int ret; yyval.a_ref = yyvsp[-2].a_ref; @@ -2469,22 +2472,22 @@ case 129: checkmem(ret == 0); ; break;} -case 132: -#line 1304 "asn1p_y.y" +case 129: +#line 1325 "asn1p_y.y" { yyval.a_refcomp.lex_type = RLT_AmpUppercase; yyval.a_refcomp.name = yyvsp[0].tv_str; ; break;} -case 133: -#line 1309 "asn1p_y.y" +case 130: +#line 1330 "asn1p_y.y" { yyval.a_refcomp.lex_type = RLT_Amplowercase; yyval.a_refcomp.name = yyvsp[0].tv_str; ; break;} -case 134: -#line 1322 "asn1p_y.y" +case 131: +#line 1343 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; assert(yyval.a_expr->Identifier == NULL); @@ -2493,8 +2496,8 @@ case 134: yyval.a_expr->value = yyvsp[0].a_value; ; break;} -case 135: -#line 1332 "asn1p_y.y" +case 132: +#line 1353 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(0); checkmem(yyval.a_value); @@ -2503,76 +2506,76 @@ case 135: yyval.a_value->value.choice_identifier.value = yyvsp[0].a_value; ; break;} -case 136: -#line 1339 "asn1p_y.y" +case 133: +#line 1360 "asn1p_y.y" { asn1p_lexer_hack_push_opaque_state(); ; break;} -case 137: -#line 1339 "asn1p_y.y" +case 134: +#line 1360 "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 138: -#line 1344 "asn1p_y.y" +case 135: +#line 1365 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(0); checkmem(yyval.a_value); yyval.a_value->type = ATV_NULL; ; break;} -case 139: -#line 1349 "asn1p_y.y" +case 136: +#line 1370 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(0); checkmem(yyval.a_value); yyval.a_value->type = ATV_FALSE; ; break;} -case 140: -#line 1354 "asn1p_y.y" +case 137: +#line 1375 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(0); checkmem(yyval.a_value); yyval.a_value->type = ATV_TRUE; ; break;} -case 141: -#line 1359 "asn1p_y.y" +case 138: +#line 1380 "asn1p_y.y" { yyval.a_value = _convert_bitstring2binary(yyvsp[0].tv_str, 'B'); checkmem(yyval.a_value); ; break;} -case 142: -#line 1363 "asn1p_y.y" +case 139: +#line 1384 "asn1p_y.y" { yyval.a_value = _convert_bitstring2binary(yyvsp[0].tv_str, 'H'); checkmem(yyval.a_value); ; break;} -case 143: -#line 1367 "asn1p_y.y" +case 140: +#line 1388 "asn1p_y.y" { yyval.a_value = yyval.a_value; ; break;} -case 144: -#line 1370 "asn1p_y.y" +case 141: +#line 1391 "asn1p_y.y" { yyval.a_value = yyvsp[0].a_value; ; break;} -case 145: -#line 1373 "asn1p_y.y" +case 142: +#line 1394 "asn1p_y.y" { yyval.a_value = yyvsp[0].a_value; ; break;} -case 146: -#line 1379 "asn1p_y.y" +case 143: +#line 1400 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -2585,8 +2588,8 @@ case 146: free(yyvsp[0].tv_str); ; break;} -case 147: -#line 1390 "asn1p_y.y" +case 144: +#line 1411 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -2602,31 +2605,31 @@ case 147: free(yyvsp[0].tv_str); ; break;} -case 148: -#line 1408 "asn1p_y.y" +case 145: +#line 1429 "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 149: -#line 1412 "asn1p_y.y" +case 146: +#line 1433 "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 150: -#line 1417 "asn1p_y.y" +case 147: +#line 1438 "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 151: -#line 1451 "asn1p_y.y" +case 148: +#line 1472 "asn1p_y.y" { yyval.tv_opaque.len = yyvsp[0].tv_opaque.len + 1; yyval.tv_opaque.buf = malloc(yyval.tv_opaque.len + 1); @@ -2637,8 +2640,8 @@ case 151: free(yyvsp[0].tv_opaque.buf); ; break;} -case 152: -#line 1460 "asn1p_y.y" +case 149: +#line 1481 "asn1p_y.y" { int newsize = yyvsp[-1].tv_opaque.len + yyvsp[0].tv_opaque.len; char *p = malloc(newsize + 1); @@ -2652,72 +2655,72 @@ case 152: yyval.tv_opaque.len = newsize; ; break;} -case 153: -#line 1475 "asn1p_y.y" +case 150: +#line 1496 "asn1p_y.y" { yyval.a_type = ASN_BASIC_BOOLEAN; ; break;} -case 154: -#line 1476 "asn1p_y.y" +case 151: +#line 1497 "asn1p_y.y" { yyval.a_type = ASN_BASIC_NULL; ; break;} -case 155: -#line 1477 "asn1p_y.y" +case 152: +#line 1498 "asn1p_y.y" { yyval.a_type = ASN_BASIC_REAL; ; break;} -case 156: -#line 1478 "asn1p_y.y" +case 153: +#line 1499 "asn1p_y.y" { yyval.a_type = yyvsp[0].a_type; ; break;} -case 157: -#line 1479 "asn1p_y.y" +case 154: +#line 1500 "asn1p_y.y" { yyval.a_type = ASN_BASIC_OCTET_STRING; ; break;} -case 158: -#line 1480 "asn1p_y.y" +case 155: +#line 1501 "asn1p_y.y" { yyval.a_type = ASN_BASIC_OBJECT_IDENTIFIER; ; break;} -case 159: -#line 1481 "asn1p_y.y" +case 156: +#line 1502 "asn1p_y.y" { yyval.a_type = ASN_BASIC_RELATIVE_OID; ; break;} -case 160: -#line 1482 "asn1p_y.y" +case 157: +#line 1503 "asn1p_y.y" { yyval.a_type = ASN_BASIC_EXTERNAL; ; break;} -case 161: -#line 1483 "asn1p_y.y" +case 158: +#line 1504 "asn1p_y.y" { yyval.a_type = ASN_BASIC_EMBEDDED_PDV; ; break;} -case 162: -#line 1484 "asn1p_y.y" +case 159: +#line 1505 "asn1p_y.y" { yyval.a_type = ASN_BASIC_CHARACTER_STRING; ; break;} -case 163: -#line 1485 "asn1p_y.y" +case 160: +#line 1506 "asn1p_y.y" { yyval.a_type = ASN_BASIC_UTCTime; ; break;} -case 164: -#line 1486 "asn1p_y.y" +case 161: +#line 1507 "asn1p_y.y" { yyval.a_type = ASN_BASIC_GeneralizedTime; ; break;} -case 165: -#line 1487 "asn1p_y.y" +case 162: +#line 1508 "asn1p_y.y" { yyval.a_type = yyvsp[0].a_type; ; break;} -case 166: -#line 1494 "asn1p_y.y" +case 163: +#line 1515 "asn1p_y.y" { yyval.a_type = ASN_BASIC_INTEGER; ; break;} -case 167: -#line 1495 "asn1p_y.y" +case 164: +#line 1516 "asn1p_y.y" { yyval.a_type = ASN_BASIC_ENUMERATED; ; break;} -case 168: -#line 1496 "asn1p_y.y" +case 165: +#line 1517 "asn1p_y.y" { yyval.a_type = ASN_BASIC_BIT_STRING; ; break;} -case 169: -#line 1500 "asn1p_y.y" +case 166: +#line 1521 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2725,8 +2728,8 @@ case 169: yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 170: -#line 1506 "asn1p_y.y" +case 167: +#line 1527 "asn1p_y.y" { if(yyvsp[0].a_expr) { yyval.a_expr = yyvsp[0].a_expr; @@ -2738,92 +2741,92 @@ case 170: yyval.a_expr->meta_type = AMT_TYPE; ; break;} -case 171: -#line 1519 "asn1p_y.y" +case 168: +#line 1540 "asn1p_y.y" { yyval.a_type = ASN_STRING_BMPString; ; break;} -case 172: -#line 1520 "asn1p_y.y" +case 169: +#line 1541 "asn1p_y.y" { yyval.a_type = ASN_STRING_GeneralString; fprintf(stderr, "WARNING: GeneralString is not fully supported\n"); ; break;} -case 173: -#line 1524 "asn1p_y.y" +case 170: +#line 1545 "asn1p_y.y" { yyval.a_type = ASN_STRING_GraphicString; fprintf(stderr, "WARNING: GraphicString is not fully supported\n"); ; break;} -case 174: -#line 1528 "asn1p_y.y" +case 171: +#line 1549 "asn1p_y.y" { yyval.a_type = ASN_STRING_IA5String; ; break;} -case 175: -#line 1529 "asn1p_y.y" +case 172: +#line 1550 "asn1p_y.y" { yyval.a_type = ASN_STRING_ISO646String; ; break;} -case 176: -#line 1530 "asn1p_y.y" +case 173: +#line 1551 "asn1p_y.y" { yyval.a_type = ASN_STRING_NumericString; ; break;} -case 177: -#line 1531 "asn1p_y.y" +case 174: +#line 1552 "asn1p_y.y" { yyval.a_type = ASN_STRING_PrintableString; ; break;} -case 178: -#line 1532 "asn1p_y.y" +case 175: +#line 1553 "asn1p_y.y" { yyval.a_type = ASN_STRING_T61String; fprintf(stderr, "WARNING: T61String is not fully supported\n"); ; break;} -case 179: -#line 1536 "asn1p_y.y" +case 176: +#line 1557 "asn1p_y.y" { yyval.a_type = ASN_STRING_TeletexString; ; break;} -case 180: -#line 1537 "asn1p_y.y" +case 177: +#line 1558 "asn1p_y.y" { yyval.a_type = ASN_STRING_UniversalString; ; break;} -case 181: -#line 1538 "asn1p_y.y" +case 178: +#line 1559 "asn1p_y.y" { yyval.a_type = ASN_STRING_UTF8String; ; break;} -case 182: -#line 1539 "asn1p_y.y" +case 179: +#line 1560 "asn1p_y.y" { yyval.a_type = ASN_STRING_VideotexString; fprintf(stderr, "WARNING: VideotexString is not fully supported\n"); ; break;} -case 183: -#line 1543 "asn1p_y.y" +case 180: +#line 1564 "asn1p_y.y" { yyval.a_type = ASN_STRING_VisibleString; ; break;} -case 184: -#line 1544 "asn1p_y.y" +case 181: +#line 1565 "asn1p_y.y" { yyval.a_type = ASN_STRING_ObjectDescriptor; ; break;} -case 190: -#line 1556 "asn1p_y.y" +case 187: +#line 1577 "asn1p_y.y" { yyval.a_constr = 0; ; break;} -case 191: -#line 1557 "asn1p_y.y" +case 188: +#line 1578 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 192: -#line 1563 "asn1p_y.y" +case 189: +#line 1584 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_SET, yyvsp[0].a_constr, 0); ; break;} -case 193: -#line 1566 "asn1p_y.y" +case 190: +#line 1587 "asn1p_y.y" { /* * This is a special case, for compatibility purposes. @@ -2832,26 +2835,26 @@ case 193: CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_SIZE, yyvsp[-1].a_constr, 0); ; break;} -case 194: -#line 1576 "asn1p_y.y" +case 191: +#line 1597 "asn1p_y.y" { yyval.a_constr = yyvsp[-1].a_constr; ; break;} -case 195: -#line 1579 "asn1p_y.y" +case 192: +#line 1600 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_SET, yyvsp[-3].a_constr, yyvsp[-1].a_constr); ; break;} -case 196: -#line 1585 "asn1p_y.y" +case 193: +#line 1606 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 197: -#line 1588 "asn1p_y.y" +case 194: +#line 1609 "asn1p_y.y" { asn1p_constraint_t *ct; ct = asn1p_constraint_new(yylineno); @@ -2859,8 +2862,8 @@ case 197: CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CSV, yyvsp[-2].a_constr, ct); ; break;} -case 198: -#line 1594 "asn1p_y.y" +case 195: +#line 1615 "asn1p_y.y" { asn1p_constraint_t *ct; ct = asn1p_constraint_new(yylineno); @@ -2870,38 +2873,38 @@ case 198: CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CSV, ct, yyvsp[0].a_constr); ; break;} -case 199: -#line 1605 "asn1p_y.y" +case 196: +#line 1626 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 200: -#line 1608 "asn1p_y.y" +case 197: +#line 1629 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_AEX, yyvsp[0].a_constr, 0); ; break;} -case 201: -#line 1611 "asn1p_y.y" +case 198: +#line 1632 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_UNI, yyvsp[-2].a_constr, yyvsp[0].a_constr); ; break;} -case 202: -#line 1614 "asn1p_y.y" +case 199: +#line 1635 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_INT, yyvsp[-2].a_constr, yyvsp[0].a_constr); ; break;} -case 203: -#line 1617 "asn1p_y.y" +case 200: +#line 1638 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_EXC, yyvsp[-2].a_constr, yyvsp[0].a_constr); ; break;} -case 204: -#line 1623 "asn1p_y.y" +case 201: +#line 1644 "asn1p_y.y" { int ret; yyval.a_constr = asn1p_constraint_new(yylineno); @@ -2911,8 +2914,8 @@ case 204: checkmem(ret == 0); ; break;} -case 205: -#line 1631 "asn1p_y.y" +case 202: +#line 1652 "asn1p_y.y" { int ret; yyval.a_constr = asn1p_constraint_new(yylineno); @@ -2922,8 +2925,8 @@ case 205: checkmem(ret == 0); ; break;} -case 206: -#line 1639 "asn1p_y.y" +case 203: +#line 1660 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2931,8 +2934,8 @@ case 206: yyval.a_constr->value = yyvsp[0].a_value; ; break;} -case 207: -#line 1645 "asn1p_y.y" +case 204: +#line 1666 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2940,8 +2943,8 @@ case 207: yyval.a_constr->containedSubtype = yyvsp[0].a_value; ; break;} -case 208: -#line 1651 "asn1p_y.y" +case 205: +#line 1672 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2950,8 +2953,8 @@ case 208: yyval.a_constr->range_stop = yyvsp[0].a_value; ; break;} -case 209: -#line 1658 "asn1p_y.y" +case 206: +#line 1679 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2961,8 +2964,8 @@ case 209: yyval.a_constr->range_start->type = ATV_MIN; ; break;} -case 210: -#line 1666 "asn1p_y.y" +case 207: +#line 1687 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2972,8 +2975,8 @@ case 210: yyval.a_constr->range_stop->type = ATV_MAX; ; break;} -case 211: -#line 1674 "asn1p_y.y" +case 208: +#line 1695 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2984,24 +2987,24 @@ case 211: yyval.a_constr->range_stop->type = ATV_MAX; ; break;} -case 212: -#line 1683 "asn1p_y.y" +case 209: +#line 1704 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 213: -#line 1686 "asn1p_y.y" +case 210: +#line 1707 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 214: -#line 1690 "asn1p_y.y" +case 211: +#line 1711 "asn1p_y.y" { asn1p_lexer_hack_push_opaque_state(); ; break;} -case 215: -#line 1690 "asn1p_y.y" +case 212: +#line 1711 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -3011,64 +3014,64 @@ case 215: yyval.a_constr->value->type = ATV_UNPARSED; ; break;} -case 216: -#line 1701 "asn1p_y.y" +case 213: +#line 1722 "asn1p_y.y" { yyval.a_ctype = ACT_EL_RANGE; ; break;} -case 217: -#line 1702 "asn1p_y.y" +case 214: +#line 1723 "asn1p_y.y" { yyval.a_ctype = ACT_EL_RLRANGE; ; break;} -case 218: -#line 1703 "asn1p_y.y" +case 215: +#line 1724 "asn1p_y.y" { yyval.a_ctype = ACT_EL_LLRANGE; ; break;} -case 219: -#line 1704 "asn1p_y.y" +case 216: +#line 1725 "asn1p_y.y" { yyval.a_ctype = ACT_EL_ULRANGE; ; break;} -case 220: -#line 1708 "asn1p_y.y" +case 217: +#line 1729 "asn1p_y.y" { yyval.a_ctype = ACT_CT_SIZE; ; break;} -case 221: -#line 1711 "asn1p_y.y" +case 218: +#line 1732 "asn1p_y.y" { yyval.a_ctype = ACT_CT_FROM; ; break;} -case 222: -#line 1717 "asn1p_y.y" +case 219: +#line 1738 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(0); checkmem(yyval.a_value); yyval.a_value->type = ATV_FALSE; ; break;} -case 223: -#line 1722 "asn1p_y.y" +case 220: +#line 1743 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(1); checkmem(yyval.a_value); yyval.a_value->type = ATV_TRUE; ; break;} -case 224: -#line 1727 "asn1p_y.y" +case 221: +#line 1748 "asn1p_y.y" { yyval.a_value = yyvsp[0].a_value; ; break;} -case 225: -#line 1730 "asn1p_y.y" +case 222: +#line 1751 "asn1p_y.y" { yyval.a_value = yyvsp[0].a_value; ; break;} -case 226: -#line 1733 "asn1p_y.y" +case 223: +#line 1754 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -3081,8 +3084,8 @@ case 226: free(yyvsp[0].tv_str); ; break;} -case 227: -#line 1747 "asn1p_y.y" +case 224: +#line 1768 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -3095,32 +3098,32 @@ case 227: free(yyvsp[0].tv_str); ; break;} -case 228: -#line 1761 "asn1p_y.y" +case 225: +#line 1782 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMP, yyvsp[0].a_constr, 0); ; break;} -case 229: -#line 1764 "asn1p_y.y" +case 226: +#line 1785 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMPS, yyvsp[-1].a_constr, 0); ; break;} -case 230: -#line 1770 "asn1p_y.y" +case 227: +#line 1791 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 231: -#line 1773 "asn1p_y.y" +case 228: +#line 1794 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMPS, yyvsp[-2].a_constr, yyvsp[0].a_constr); ; break;} -case 232: -#line 1779 "asn1p_y.y" +case 229: +#line 1800 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -3128,8 +3131,8 @@ case 232: yyval.a_constr->value = asn1p_value_frombuf("...", 3, 0); ; break;} -case 233: -#line 1785 "asn1p_y.y" +case 230: +#line 1806 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -3139,46 +3142,46 @@ case 233: if(yyvsp[-1].a_constr) asn1p_constraint_insert(yyval.a_constr, yyvsp[-1].a_constr); ; break;} -case 234: -#line 1799 "asn1p_y.y" +case 231: +#line 1820 "asn1p_y.y" { yyval.a_pres = ACPRES_DEFAULT; ; break;} -case 235: -#line 1800 "asn1p_y.y" +case 232: +#line 1821 "asn1p_y.y" { yyval.a_pres = yyvsp[0].a_pres; ; break;} -case 236: -#line 1804 "asn1p_y.y" +case 233: +#line 1825 "asn1p_y.y" { yyval.a_pres = ACPRES_PRESENT; ; break;} -case 237: -#line 1807 "asn1p_y.y" +case 234: +#line 1828 "asn1p_y.y" { yyval.a_pres = ACPRES_ABSENT; ; break;} -case 238: -#line 1810 "asn1p_y.y" +case 235: +#line 1831 "asn1p_y.y" { yyval.a_pres = ACPRES_OPTIONAL; ; break;} -case 239: -#line 1816 "asn1p_y.y" +case 236: +#line 1837 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 240: -#line 1819 "asn1p_y.y" +case 237: +#line 1840 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} -case 241: -#line 1828 "asn1p_y.y" +case 238: +#line 1849 "asn1p_y.y" { asn1p_ref_t *ref = asn1p_ref_new(yylineno); asn1p_constraint_t *ct; @@ -3192,14 +3195,14 @@ case 241: CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CRC, ct, 0); ; break;} -case 242: -#line 1843 "asn1p_y.y" +case 239: +#line 1864 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CRC, yyvsp[-3].a_constr, yyvsp[-1].a_constr); ; break;} -case 243: -#line 1849 "asn1p_y.y" +case 240: +#line 1870 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -3207,8 +3210,8 @@ case 243: yyval.a_constr->value = asn1p_value_fromref(yyvsp[0].a_ref, 0); ; break;} -case 244: -#line 1855 "asn1p_y.y" +case 241: +#line 1876 "asn1p_y.y" { asn1p_constraint_t *ct; ct = asn1p_constraint_new(yylineno); @@ -3218,8 +3221,8 @@ case 244: CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CSV, yyvsp[-2].a_constr, ct); ; break;} -case 245: -#line 1869 "asn1p_y.y" +case 242: +#line 1890 "asn1p_y.y" { char *p = malloc(strlen(yyvsp[0].tv_str) + 2); int ret; @@ -3232,8 +3235,8 @@ case 245: free(yyvsp[0].tv_str); ; break;} -case 246: -#line 1880 "asn1p_y.y" +case 243: +#line 1901 "asn1p_y.y" { char *p = malloc(strlen(yyvsp[0].tv_str) + 3); int ret; @@ -3247,14 +3250,14 @@ case 246: free(yyvsp[0].tv_str); ; break;} -case 247: -#line 1896 "asn1p_y.y" +case 244: +#line 1917 "asn1p_y.y" { yyval.tv_str = yyvsp[0].tv_str; ; break;} -case 248: -#line 1899 "asn1p_y.y" +case 245: +#line 1920 "asn1p_y.y" { int l1 = strlen(yyvsp[-2].tv_str); int l3 = strlen(yyvsp[0].tv_str); @@ -3265,61 +3268,61 @@ case 248: yyval.tv_str[l1 + 1 + l3] = '\0'; ; break;} -case 249: -#line 1917 "asn1p_y.y" +case 246: +#line 1938 "asn1p_y.y" { yyval.a_marker.flags = EM_NOMARK; yyval.a_marker.default_value = 0; ; break;} -case 250: -#line 1921 "asn1p_y.y" +case 247: +#line 1942 "asn1p_y.y" { yyval.a_marker = yyvsp[0].a_marker; ; break;} -case 251: -#line 1925 "asn1p_y.y" +case 248: +#line 1946 "asn1p_y.y" { yyval.a_marker.flags = EM_OPTIONAL; yyval.a_marker.default_value = 0; ; break;} -case 252: -#line 1929 "asn1p_y.y" +case 249: +#line 1950 "asn1p_y.y" { yyval.a_marker.flags = EM_DEFAULT; yyval.a_marker.default_value = yyvsp[0].a_value; ; break;} -case 253: -#line 1952 "asn1p_y.y" +case 250: +#line 1973 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); ; break;} -case 254: -#line 1956 "asn1p_y.y" +case 251: +#line 1977 "asn1p_y.y" { yyval.a_expr = yyvsp[-1].a_expr; ; break;} -case 255: -#line 1962 "asn1p_y.y" +case 252: +#line 1983 "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 256: -#line 1967 "asn1p_y.y" +case 253: +#line 1988 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} -case 257: -#line 1974 "asn1p_y.y" +case 254: +#line 1995 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3328,8 +3331,8 @@ case 257: yyval.a_expr->Identifier = yyvsp[0].tv_str; ; break;} -case 258: -#line 1981 "asn1p_y.y" +case 255: +#line 2002 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3339,8 +3342,8 @@ case 258: yyval.a_expr->value = yyvsp[-1].a_value; ; break;} -case 259: -#line 1989 "asn1p_y.y" +case 256: +#line 2010 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3350,8 +3353,8 @@ case 259: yyval.a_expr->value = yyvsp[-1].a_value; ; break;} -case 260: -#line 1997 "asn1p_y.y" +case 257: +#line 2018 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3360,8 +3363,8 @@ case 260: yyval.a_expr->value = yyvsp[0].a_value; ; break;} -case 261: -#line 2004 "asn1p_y.y" +case 258: +#line 2025 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3371,103 +3374,103 @@ case 261: yyval.a_expr->meta_type = AMT_VALUE; ; break;} -case 262: -#line 2015 "asn1p_y.y" +case 259: +#line 2036 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int); checkmem(yyval.a_value); ; break;} -case 263: -#line 2019 "asn1p_y.y" +case 260: +#line 2040 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int); checkmem(yyval.a_value); ; break;} -case 264: -#line 2050 "asn1p_y.y" +case 261: +#line 2071 "asn1p_y.y" { memset(&yyval.a_tag, 0, sizeof(yyval.a_tag)); ; break;} -case 265: -#line 2051 "asn1p_y.y" +case 262: +#line 2072 "asn1p_y.y" { yyval.a_tag = yyvsp[0].a_tag; ; break;} -case 266: -#line 2055 "asn1p_y.y" +case 263: +#line 2076 "asn1p_y.y" { yyval.a_tag = yyvsp[-1].a_tag; yyval.a_tag.tag_mode = yyvsp[0].a_tag.tag_mode; ; break;} -case 267: -#line 2062 "asn1p_y.y" +case 264: +#line 2083 "asn1p_y.y" { yyval.a_tag = yyvsp[-2].a_tag; yyval.a_tag.tag_value = yyvsp[-1].a_int; ; break;} -case 268: -#line 2068 "asn1p_y.y" +case 265: +#line 2089 "asn1p_y.y" { yyval.a_tag.tag_class = TC_CONTEXT_SPECIFIC; ; break;} -case 269: -#line 2069 "asn1p_y.y" +case 266: +#line 2090 "asn1p_y.y" { yyval.a_tag.tag_class = TC_UNIVERSAL; ; break;} -case 270: -#line 2070 "asn1p_y.y" +case 267: +#line 2091 "asn1p_y.y" { yyval.a_tag.tag_class = TC_APPLICATION; ; break;} -case 271: -#line 2071 "asn1p_y.y" +case 268: +#line 2092 "asn1p_y.y" { yyval.a_tag.tag_class = TC_PRIVATE; ; break;} -case 272: -#line 2075 "asn1p_y.y" +case 269: +#line 2096 "asn1p_y.y" { yyval.a_tag.tag_mode = TM_DEFAULT; ; break;} -case 273: -#line 2076 "asn1p_y.y" +case 270: +#line 2097 "asn1p_y.y" { yyval.a_tag.tag_mode = TM_IMPLICIT; ; break;} -case 274: -#line 2077 "asn1p_y.y" +case 271: +#line 2098 "asn1p_y.y" { yyval.a_tag.tag_mode = TM_EXPLICIT; ; break;} -case 275: -#line 2081 "asn1p_y.y" +case 272: +#line 2102 "asn1p_y.y" { checkmem(yyvsp[0].tv_str); yyval.tv_str = yyvsp[0].tv_str; ; break;} -case 276: -#line 2085 "asn1p_y.y" +case 273: +#line 2106 "asn1p_y.y" { checkmem(yyvsp[0].tv_str); yyval.tv_str = yyvsp[0].tv_str; ; break;} -case 277: -#line 2093 "asn1p_y.y" +case 274: +#line 2114 "asn1p_y.y" { checkmem(yyvsp[0].tv_str); yyval.tv_str = yyvsp[0].tv_str; ; break;} -case 278: -#line 2100 "asn1p_y.y" +case 275: +#line 2121 "asn1p_y.y" { yyval.tv_str = 0; ; break;} -case 279: -#line 2101 "asn1p_y.y" +case 276: +#line 2122 "asn1p_y.y" { yyval.tv_str = yyvsp[0].tv_str; ; break;} -case 280: -#line 2107 "asn1p_y.y" +case 277: +#line 2128 "asn1p_y.y" { checkmem(yyvsp[0].tv_str); yyval.tv_str = yyvsp[0].tv_str; @@ -3695,7 +3698,7 @@ yyerrhandle: } return 1; } -#line 2113 "asn1p_y.y" +#line 2134 "asn1p_y.y" @@ -3835,22 +3838,6 @@ _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 |