diff options
| author | Lev Walkin <vlm@lionet.info> | 2004-09-14 02:44:07 +0000 |
|---|---|---|
| committer | Lev Walkin <vlm@lionet.info> | 2004-09-14 02:44:07 +0000 |
| commit | ec208e6cfe81ff52fe506aabaa2f7cad1b157c72 (patch) | |
| tree | 001c4b3b3c221ed759433cb754166e4866f1f478 | |
| parent | af120f75620fec9ab97833e07cc5c1a15e433fe5 (diff) | |
support of tags after SET OF/SEQUENCE OF: SET OF [1] INTEGER
| -rw-r--r-- | libasn1parser/asn1p_y.c | 821 | ||||
| -rw-r--r-- | libasn1parser/asn1p_y.y | 10 |
2 files changed, 422 insertions, 409 deletions
diff --git a/libasn1parser/asn1p_y.c b/libasn1parser/asn1p_y.c index 84a8c555..7d927e97 100644 --- a/libasn1parser/asn1p_y.c +++ b/libasn1parser/asn1p_y.c @@ -205,7 +205,7 @@ typedef union { -#define YYFINAL 395 +#define YYFINAL 397 #define YYFLAG -32768 #define YYNTBASE 115 @@ -262,22 +262,22 @@ static const short yyprhs[] = { 0, 202, 204, 206, 208, 212, 216, 220, 222, 224, 228, 231, 233, 239, 240, 242, 244, 248, 251, 256, 261, 262, 264, 265, 272, 274, 277, 279, 281, 283, 287, - 291, 295, 297, 299, 304, 309, 314, 319, 324, 326, - 331, 336, 338, 342, 344, 348, 352, 354, 358, 360, - 364, 366, 368, 370, 372, 377, 378, 382, 384, 386, - 388, 390, 392, 394, 398, 400, 403, 405, 407, 409, - 411, 414, 417, 419, 421, 424, 427, 429, 431, 433, - 435, 438, 440, 443, 445, 447, 449, 451, 453, 455, - 457, 459, 461, 463, 465, 467, 469, 471, 473, 475, - 477, 479, 481, 482, 484, 486, 491, 495, 500, 502, - 506, 512, 514, 518, 522, 526, 531, 535, 537, 541, - 545, 549, 553, 555, 557, 559, 562, 565, 569, 571, - 573, 575, 577, 579, 581, 583, 589, 591, 595, 597, - 601, 602, 604, 606, 608, 610, 612, 614, 618, 623, - 625, 629, 632, 636, 638, 642, 643, 645, 647, 650, - 652, 654, 655, 659, 662, 666, 668, 672, 674, 679, - 684, 686, 688, 690, 692, 693, 695, 697, 700, 703, - 705, 707, 709 + 291, 295, 297, 299, 304, 309, 314, 320, 326, 328, + 333, 338, 340, 344, 346, 350, 354, 356, 360, 362, + 366, 368, 370, 372, 374, 379, 380, 384, 386, 388, + 390, 392, 394, 396, 400, 402, 405, 407, 409, 411, + 413, 416, 419, 421, 423, 426, 429, 431, 433, 435, + 437, 440, 442, 445, 447, 449, 451, 453, 455, 457, + 459, 461, 463, 465, 467, 469, 471, 473, 475, 477, + 479, 481, 483, 484, 486, 488, 493, 497, 502, 504, + 508, 514, 516, 520, 524, 528, 533, 537, 539, 543, + 547, 551, 555, 557, 559, 561, 564, 567, 571, 573, + 575, 577, 579, 581, 583, 585, 591, 593, 597, 599, + 603, 604, 606, 608, 610, 612, 614, 616, 620, 625, + 627, 631, 634, 638, 640, 644, 645, 647, 649, 652, + 654, 656, 657, 661, 664, 668, 670, 674, 676, 681, + 686, 688, 690, 692, 694, 695, 697, 699, 702, 705, + 707, 709, 711 }; static const short yyrhs[] = { 116, @@ -312,46 +312,47 @@ static const short yyrhs[] = { 116, 102, 0, 102, 111, 171, 0, 102, 111, 207, 0, 208, 162, 180, 0, 175, 0, 176, 0, 27, 104, 149, 105, 0, 78, 104, 147, 105, 0, 79, 104, - 147, 105, 0, 78, 180, 68, 162, 0, 79, 180, - 68, 162, 0, 18, 0, 18, 35, 25, 212, 0, - 210, 104, 145, 105, 0, 163, 0, 56, 68, 163, - 0, 11, 0, 11, 112, 210, 0, 11, 112, 212, - 0, 211, 0, 211, 112, 164, 0, 165, 0, 164, - 112, 165, 0, 167, 0, 167, 0, 13, 0, 14, - 0, 212, 138, 3, 169, 0, 0, 104, 170, 172, - 0, 5, 0, 7, 0, 6, 0, 207, 0, 171, - 0, 212, 0, 210, 112, 212, 0, 4, 0, 172, - 4, 0, 24, 0, 63, 0, 76, 0, 174, 0, - 67, 81, 0, 65, 51, 0, 77, 0, 44, 0, - 36, 71, 0, 26, 81, 0, 91, 0, 47, 0, - 58, 0, 40, 0, 22, 81, 0, 173, 0, 174, - 204, 0, 23, 0, 48, 0, 49, 0, 50, 0, - 59, 0, 64, 0, 74, 0, 83, 0, 85, 0, - 90, 0, 92, 0, 93, 0, 94, 0, 66, 0, - 99, 0, 100, 0, 97, 0, 98, 0, 96, 0, - 0, 181, 0, 182, 0, 80, 106, 183, 107, 0, - 106, 183, 107, 0, 182, 106, 183, 107, 0, 184, - 0, 184, 109, 102, 0, 184, 109, 102, 109, 184, - 0, 185, 0, 184, 177, 185, 0, 184, 178, 185, - 0, 185, 179, 185, 0, 187, 106, 183, 107, 0, - 106, 183, 107, 0, 188, 0, 188, 186, 188, 0, - 61, 186, 188, 0, 188, 186, 60, 0, 61, 186, - 60, 0, 194, 0, 189, 0, 101, 0, 101, 113, - 0, 113, 101, 0, 113, 101, 113, 0, 80, 0, - 46, 0, 207, 0, 212, 0, 6, 0, 45, 0, - 86, 0, 95, 30, 104, 190, 105, 0, 191, 0, - 190, 109, 191, 0, 102, 0, 212, 180, 192, 0, - 0, 193, 0, 73, 0, 15, 0, 69, 0, 195, - 0, 196, 0, 104, 210, 105, 0, 195, 104, 197, - 105, 0, 198, 0, 197, 109, 198, 0, 114, 199, - 0, 114, 112, 199, 0, 212, 0, 199, 112, 212, - 0, 0, 201, 0, 69, 0, 33, 202, 0, 188, - 0, 173, 0, 0, 104, 203, 172, 0, 104, 105, - 0, 104, 205, 105, 0, 206, 0, 205, 109, 206, - 0, 212, 0, 212, 106, 207, 107, 0, 212, 106, - 171, 107, 0, 207, 0, 102, 0, 9, 0, 10, - 0, 0, 209, 0, 103, 0, 103, 52, 0, 103, - 41, 0, 11, 0, 12, 0, 12, 0, 8, 0 + 147, 105, 0, 78, 180, 68, 208, 162, 0, 79, + 180, 68, 208, 162, 0, 18, 0, 18, 35, 25, + 212, 0, 210, 104, 145, 105, 0, 163, 0, 56, + 68, 163, 0, 11, 0, 11, 112, 210, 0, 11, + 112, 212, 0, 211, 0, 211, 112, 164, 0, 165, + 0, 164, 112, 165, 0, 167, 0, 167, 0, 13, + 0, 14, 0, 212, 138, 3, 169, 0, 0, 104, + 170, 172, 0, 5, 0, 7, 0, 6, 0, 207, + 0, 171, 0, 212, 0, 210, 112, 212, 0, 4, + 0, 172, 4, 0, 24, 0, 63, 0, 76, 0, + 174, 0, 67, 81, 0, 65, 51, 0, 77, 0, + 44, 0, 36, 71, 0, 26, 81, 0, 91, 0, + 47, 0, 58, 0, 40, 0, 22, 81, 0, 173, + 0, 174, 204, 0, 23, 0, 48, 0, 49, 0, + 50, 0, 59, 0, 64, 0, 74, 0, 83, 0, + 85, 0, 90, 0, 92, 0, 93, 0, 94, 0, + 66, 0, 99, 0, 100, 0, 97, 0, 98, 0, + 96, 0, 0, 181, 0, 182, 0, 80, 106, 183, + 107, 0, 106, 183, 107, 0, 182, 106, 183, 107, + 0, 184, 0, 184, 109, 102, 0, 184, 109, 102, + 109, 184, 0, 185, 0, 184, 177, 185, 0, 184, + 178, 185, 0, 185, 179, 185, 0, 187, 106, 183, + 107, 0, 106, 183, 107, 0, 188, 0, 188, 186, + 188, 0, 61, 186, 188, 0, 188, 186, 60, 0, + 61, 186, 60, 0, 194, 0, 189, 0, 101, 0, + 101, 113, 0, 113, 101, 0, 113, 101, 113, 0, + 80, 0, 46, 0, 207, 0, 212, 0, 6, 0, + 45, 0, 86, 0, 95, 30, 104, 190, 105, 0, + 191, 0, 190, 109, 191, 0, 102, 0, 212, 180, + 192, 0, 0, 193, 0, 73, 0, 15, 0, 69, + 0, 195, 0, 196, 0, 104, 210, 105, 0, 195, + 104, 197, 105, 0, 198, 0, 197, 109, 198, 0, + 114, 199, 0, 114, 112, 199, 0, 212, 0, 199, + 112, 212, 0, 0, 201, 0, 69, 0, 33, 202, + 0, 188, 0, 173, 0, 0, 104, 203, 172, 0, + 104, 105, 0, 104, 205, 105, 0, 206, 0, 205, + 109, 206, 0, 212, 0, 212, 106, 207, 107, 0, + 212, 106, 171, 107, 0, 207, 0, 102, 0, 9, + 0, 10, 0, 0, 209, 0, 103, 0, 103, 52, + 0, 103, 41, 0, 11, 0, 12, 0, 12, 0, + 8, 0 }; #endif @@ -368,22 +369,22 @@ static const short yyrline[] = { 0, 827, 831, 843, 849, 855, 862, 869, 874, 880, 886, 892, 897, 907, 909, 912, 920, 926, 935, 941, 958, 960, 965, 969, 974, 979, 985, 989, 1000, 1009, 1018, - 1029, 1051, 1055, 1061, 1067, 1073, 1079, 1087, 1095, 1101, - 1115, 1139, 1146, 1160, 1169, 1179, 1189, 1197, 1218, 1227, - 1236, 1237, 1239, 1246, 1258, 1268, 1270, 1275, 1279, 1283, - 1287, 1290, 1295, 1307, 1323, 1334, 1348, 1350, 1351, 1352, - 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1366, 1368, - 1369, 1372, 1379, 1391, 1393, 1397, 1401, 1402, 1403, 1404, - 1405, 1409, 1410, 1411, 1412, 1416, 1417, 1424, 1424, 1425, - 1425, 1426, 1428, 1430, 1435, 1439, 1448, 1452, 1457, 1461, - 1467, 1477, 1481, 1484, 1487, 1492, 1501, 1509, 1515, 1522, - 1530, 1538, 1547, 1550, 1555, 1557, 1558, 1559, 1562, 1566, - 1571, 1575, 1586, 1591, 1596, 1603, 1609, 1613, 1618, 1624, - 1636, 1638, 1641, 1645, 1648, 1653, 1657, 1665, 1680, 1686, - 1693, 1706, 1718, 1733, 1737, 1754, 1756, 1759, 1763, 1769, - 1772, 1774, 1774, 1794, 1799, 1804, 1810, 1816, 1824, 1832, - 1840, 1847, 1857, 1862, 1892, 1894, 1897, 1902, 1906, 1912, - 1917, 1924, 1931 + 1029, 1051, 1055, 1061, 1067, 1073, 1079, 1088, 1097, 1103, + 1117, 1141, 1148, 1162, 1171, 1181, 1191, 1199, 1220, 1229, + 1238, 1239, 1241, 1248, 1260, 1270, 1272, 1277, 1281, 1285, + 1289, 1292, 1297, 1309, 1325, 1336, 1350, 1352, 1353, 1354, + 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, 1368, 1370, + 1371, 1374, 1381, 1393, 1395, 1399, 1403, 1404, 1405, 1406, + 1407, 1411, 1412, 1413, 1414, 1418, 1419, 1426, 1426, 1427, + 1427, 1428, 1430, 1432, 1437, 1441, 1450, 1454, 1459, 1463, + 1469, 1479, 1483, 1486, 1489, 1494, 1503, 1511, 1517, 1524, + 1532, 1540, 1549, 1552, 1557, 1559, 1560, 1561, 1564, 1568, + 1573, 1577, 1588, 1593, 1598, 1605, 1611, 1615, 1620, 1626, + 1638, 1640, 1643, 1647, 1650, 1655, 1659, 1667, 1682, 1688, + 1695, 1708, 1720, 1735, 1739, 1756, 1758, 1761, 1765, 1771, + 1774, 1776, 1776, 1796, 1801, 1806, 1812, 1818, 1826, 1834, + 1842, 1849, 1859, 1864, 1894, 1896, 1899, 1904, 1908, 1914, + 1919, 1926, 1933 }; #endif @@ -475,7 +476,7 @@ static const short yyr2[] = { 0, 1, 1, 1, 3, 3, 3, 1, 1, 3, 2, 1, 5, 0, 1, 1, 3, 2, 4, 4, 0, 1, 0, 6, 1, 2, 1, 1, 1, 3, 3, - 3, 1, 1, 4, 4, 4, 4, 4, 1, 4, + 3, 1, 1, 4, 4, 4, 5, 5, 1, 4, 4, 1, 3, 1, 3, 3, 1, 3, 1, 3, 1, 1, 1, 1, 4, 0, 3, 1, 1, 1, 1, 1, 1, 3, 1, 2, 1, 1, 1, 1, @@ -519,228 +520,236 @@ static const short yydefact[] = { 0, 217, 201, 202, 0, 0, 0, 90, 0, 0, 228, 226, 226, 87, 227, 0, 0, 98, 0, 78, 81, 245, 113, 0, 0, 0, 73, 77, 245, 0, 179, - 0, 0, 0, 0, 242, 234, 0, 236, 241, 238, + 245, 0, 0, 245, 242, 234, 0, 236, 241, 238, 0, 69, 71, 72, 63, 195, 0, 0, 0, 0, 0, 51, 0, 170, 171, 168, 169, 0, 0, 172, 0, 0, 0, 0, 120, 135, 127, 134, 0, 82, 91, 86, 232, 231, 230, 229, 83, 83, 110, 0, 104, 0, 80, 0, 245, 105, 0, 226, 177, 0, - 107, 0, 106, 108, 235, 0, 0, 111, 245, 196, + 0, 0, 106, 0, 235, 0, 0, 111, 245, 196, 197, 192, 190, 0, 218, 187, 57, 183, 184, 185, 0, 191, 189, 0, 0, 220, 136, 0, 0, 84, 88, 89, 99, 100, 79, 176, 76, 74, 75, 180, - 178, 237, 0, 0, 70, 198, 209, 0, 207, 173, - 186, 0, 222, 224, 219, 0, 92, 233, 0, 240, - 239, 206, 0, 211, 223, 0, 221, 0, 181, 208, - 214, 215, 213, 210, 212, 225, 96, 0, 94, 97, - 93, 95, 0, 0, 0 + 107, 178, 108, 237, 0, 0, 70, 198, 209, 0, + 207, 173, 186, 0, 222, 224, 219, 0, 92, 233, + 0, 240, 239, 206, 0, 211, 223, 0, 221, 0, + 181, 208, 214, 215, 213, 210, 212, 225, 96, 0, + 94, 97, 93, 95, 0, 0, 0 }; -static const short yydefgoto[] = { 393, +static const short yydefgoto[] = { 395, 3, 4, 8, 9, 13, 14, 25, 26, 27, 55, 56, 57, 106, 58, 74, 75, 76, 77, 59, 69, 70, 60, 100, 211, 212, 213, 61, 126, 127, 261, 262, 245, 246, 238, 239, 116, 341, 178, 179, 290, - 291, 378, 388, 389, 247, 263, 147, 148, 163, 164, + 291, 380, 390, 391, 247, 263, 147, 148, 163, 164, 180, 181, 62, 172, 225, 173, 287, 149, 103, 151, 152, 278, 279, 281, 188, 189, 190, 249, 250, 215, - 268, 216, 217, 218, 358, 359, 384, 385, 219, 220, - 221, 335, 336, 363, 233, 234, 296, 339, 195, 257, + 268, 216, 217, 218, 360, 361, 386, 387, 219, 220, + 221, 335, 336, 365, 233, 234, 296, 339, 195, 257, 258, 222, 235, 119, 153, 104, 223 }; -static const short yypact[] = { 29, --32768,-32768, 29,-32768, -79,-32768, 18, 22,-32768,-32768, --32768,-32768, 42,-32768, 34, 236,-32768,-32768, 99, 71, - 115, 118, 102, 121, 190, 236,-32768, 105,-32768,-32768, --32768,-32768,-32768, 224,-32768,-32768, 329,-32768, 235, 11, --32768,-32768,-32768, 192,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768, 227, 329,-32768,-32768,-32768,-32768, --32768,-32768,-32768, 33, 238,-32768, 173,-32768, 54,-32768, --32768,-32768,-32768, 23,-32768, -17,-32768,-32768,-32768,-32768, --32768, -10, 174,-32768, 210,-32768, 211, 223,-32768,-32768, --32768,-32768,-32768, 247, 216,-32768,-32768,-32768, 543, 296, --32768,-32768,-32768, 199, 310,-32768,-32768,-32768, 246,-32768, --32768, 29, 246, 212, 176,-32768,-32768, 406,-32768, 246, --32768,-32768,-32768,-32768,-32768, 109,-32768, 208, 213, 217, - 155, 78,-32768, -79,-32768, 155,-32768,-32768, -9, 221, - 291, 231, 260, 103, 128,-32768, 117,-32768,-32768, 232, --32768,-32768, 240,-32768,-32768, 336, 543, 342, 342, 135, --32768,-32768, 241,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768, 242,-32768,-32768, 150,-32768, 61, --32768, 326, 16, 278, 251, 40, 140, 292,-32768, 253, - 40, 294,-32768, 52,-32768, 24, 261,-32768,-32768,-32768, --32768,-32768,-32768, 25,-32768,-32768, 338,-32768, 29, 140, - 265, 263,-32768, 233, 277, 270, 25,-32768,-32768, 276, --32768,-32768,-32768, 155, 377, 342, 287, 155, 298,-32768, - 35, 35,-32768,-32768, 483, 342, 274, 156,-32768,-32768, - 261,-32768, 140, 318, 158,-32768,-32768, 261, 280, 249, - 483, 140, 164, 483,-32768,-32768, 166,-32768,-32768, 284, - 167,-32768,-32768,-32768,-32768, 279, 290, 165, 297, 289, - 299,-32768, 135,-32768,-32768,-32768,-32768, 140, 140,-32768, - 140, 140, 182, 293,-32768,-32768, 400,-32768, 323,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 320, 320,-32768, 388, --32768, 16,-32768, 302, 261,-32768, 40, 35,-32768, 308, --32768, 304,-32768,-32768,-32768, 56, 388,-32768, 24,-32768, - 300,-32768,-32768, 30,-32768,-32768,-32768,-32768,-32768,-32768, - 309,-32768,-32768, 9, 175,-32768,-32768, 311, 377,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 316, --32768,-32768, 313, 319,-32768,-32768,-32768, 178,-32768, 117, --32768, 342, 315,-32768,-32768, 293,-32768, 400, 140,-32768, --32768,-32768, 30, 92, 315, 342,-32768, 239, 233,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768, 7,-32768,-32768, --32768,-32768, 431, 434,-32768 +static const short yypact[] = { 254, +-32768,-32768, 254,-32768, -79,-32768, 13, 7,-32768,-32768, +-32768,-32768, 35,-32768, -51, 202,-32768,-32768, 61, 20, + 11, 19, 57, 44, 90, 202,-32768, 23,-32768,-32768, +-32768,-32768,-32768, 115,-32768,-32768, 351,-32768, 176, 12, +-32768,-32768,-32768, 174,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768, 151, 351,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 220, 565,-32768, 99,-32768, 199,-32768, +-32768,-32768,-32768, 24,-32768, -20,-32768,-32768,-32768,-32768, +-32768, -9, 106,-32768, 140,-32768, 145, 163,-32768,-32768, +-32768,-32768,-32768, 186, 182,-32768,-32768,-32768, 582, 249, +-32768,-32768,-32768, 143, 278,-32768,-32768,-32768, 228,-32768, +-32768, 254, 228, 180, 129,-32768,-32768, 428,-32768, 228, +-32768,-32768,-32768,-32768,-32768, 101,-32768, 147, 191, 195, + 300, 74,-32768, -79,-32768, 300,-32768,-32768, 105, 214, + 285, 217, 255, 89, 124,-32768, -40,-32768,-32768, 218, +-32768,-32768, 221,-32768,-32768, 328, 582, 324, 324, 51, +-32768,-32768, 222,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768, 223,-32768,-32768, 142,-32768, 40, +-32768, 308, 37, 304, 230, 48, 155, 269,-32768, 232, + 48, 271,-32768, 42,-32768, 26, 237,-32768,-32768,-32768, +-32768,-32768,-32768, -26,-32768,-32768, 311,-32768, 254, 155, + 238, 236,-32768, 206, 251, 242, -26,-32768,-32768, 245, +-32768,-32768,-32768, 300, 346, 324, 256, 300, 320,-32768, + 5, 5,-32768,-32768, 505, 324, 241, 144,-32768,-32768, + 237,-32768, 155, 286, 153,-32768,-32768, 237, 246, 171, + 237, 155, 167, 237,-32768,-32768, 168,-32768,-32768, 252, + 170,-32768,-32768,-32768,-32768, 248, 265, 82, 266, 250, + 262,-32768, 51,-32768,-32768,-32768,-32768, 155, 155,-32768, + 155, 155, 188, 258,-32768,-32768, 369,-32768, 293,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, 288, 288,-32768, 280, +-32768, 37,-32768, 270, 237,-32768, 48, 5,-32768, 277, + 505, 273,-32768, 505,-32768, 54, 280,-32768, 26,-32768, + 268,-32768,-32768, 60,-32768,-32768,-32768,-32768,-32768,-32768, + 275,-32768,-32768, 9, 177,-32768,-32768, 282, 346,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 279, +-32768,-32768,-32768,-32768, 283, 284,-32768,-32768,-32768, 189, +-32768, -40,-32768, 324, 272,-32768,-32768, 258,-32768, 369, + 155,-32768,-32768,-32768, 60, 85, 272, 324,-32768, 94, + 206,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 14, +-32768,-32768,-32768,-32768, 392, 394,-32768 }; static const short yypgoto[] = {-32768, --32768, 432, 303,-32768,-32768, 423,-32768,-32768, 412,-32768, --32768, 383,-32768,-32768,-32768, 366,-32768, 328,-32768,-32768, - 334,-32768, 379,-32768,-32768, 172,-32768,-32768, 295,-32768, - 129, 256, 142,-32768, 149,-32768, 159,-32768, 230,-32768, --32768,-32768,-32768, 72, -169, -81, -18, -49,-32768, 237, - -172, -68,-32768,-32768,-32768, -246, 120, -52, -115,-32768, - 116,-32768,-32768,-32768, -138,-32768,-32768, -12, -156, -200, - 250,-32768, -186,-32768,-32768, 90,-32768,-32768,-32768,-32768, --32768,-32768, 100, 106, -179,-32768,-32768,-32768,-32768,-32768, - 160, -122, 392,-32768, 2,-32768, -7 +-32768, 395, 261,-32768,-32768, 389,-32768,-32768, 377,-32768, +-32768, 348,-32768,-32768,-32768, 333,-32768, 295,-32768,-32768, + 303,-32768, 344,-32768,-32768, 141,-32768,-32768, 259,-32768, + 100, 227, 113,-32768, 111,-32768, 123,-32768, 194,-32768, +-32768,-32768,-32768, 33, -169, -81, -173, -49,-32768, 203, + -177, -100,-32768,-32768,-32768, -252, 87, -52, -109,-32768, + 67,-32768,-32768,-32768, -137,-32768,-32768, -44, -156, -107, + 211,-32768, -56,-32768,-32768, 55,-32768,-32768,-32768,-32768, +-32768,-32768, 63, 65, -160,-32768,-32768,-32768,-32768,-32768, + 116, -125, -71,-32768, 2,-32768, -7 }; -#define YYLAST 634 +#define YYLAST 673 static const short yytable[] = { 15, - 117, 5, 150, 214, 5, 15, 192, 232, 193, 174, - 387, 102, 102, 240, 101, 101, 10, 114, 10, 161, - 162, 1, 2, 10, 7, 10, 11, 67, 112, 65, - 10, 10, 72, 1, 2, 82, 79, 10, 64, 1, - 2, 71, 295, 83, 84, 78, 128, 10, 65, 10, - 11, 297, 298, 343, 85, 16, 86, 64, 87, 10, - 169, 170, 165, 10, 169, 170, 79, 229, 88, 244, - 353, 259, 89, 161, 162, 78, 90, 328, 329, 91, - 330, 323, 166, 167, 168, 10, 169, 170, 1, 2, - 92, 113, 115, 229, -250, 93, 333, 94, 231, 95, - 129, 72, 120, 230, 128, 79, 381, 28, 96, 97, - 71, 391, 155, 134, 78, 265, 214, 237, 68, 150, - 362, 154, 12, 98, 176, 266, 115, 29, 349, 230, - 110, 357, 240, 175, 242, 150, 99, 267, 150, 19, - 201, 237, 10, 169, 170, 201, 17, 10, 169, 170, - 199, 200, 63, 255, 32, 165, 256, 255, 129, 303, - 382, 108, 109, 115, 383, -226, 308, 161, 162, -226, - 201, 63, 10, 169, 170, 241, 294, 344, 248, 202, - 203, 171, 185, 248, 202, 203, 260, 201, 264, 10, - 169, 170, 34, 259, 354, 204, 185, 271, 30, 10, - 204, 31, 1, 2, 33, 390, 186, 185, 187, 202, - 270, 36, 379, 156, 205, 390, 137, 157, 288, 205, - 206, 374, 187, 347, 322, 206, 202, 138, 299, 207, - 304, 191, 311, 187, 207, 314, 208, 73, 209, 312, - 210, 332, 387, 209, 37, 210, 66, 20, 83, 84, - 206, 161, 162, 10, 227, 21, 1, 2, 228, 85, - 301, 86, 306, 87, 302, 80, 307, 206, 313, 331, - 315, 318, 307, 88, 316, 319, 22, 89, 23, 365, - 107, 90, 372, 366, 91, 120, 373, 24, 83, 84, - 121, 122, 176, 123, 241, 92, 125, 124, 130, 248, - 93, 175, 94, 201, 95, 10, 169, 170, 260, 176, - 131, 264, 132, 96, 97, 136, 360, 158, 175, 85, - 160, 86, 159, 87, -251, 182, 364, 184, 98, 274, - 275, 276, 277, 88, 183, 194, 10, 89, 197, 1, - 2, 90, 202, 196, 91, 274, 275, 276, 277, 10, - 236, 38, 224, 226, 364, 92, 243, 310, 252, 251, - 93, 254, 94, 115, 95, 360, 39, 269, 386, 272, - 40, 273, 280, 96, 97, 282, 41, 42, 43, 284, - 286, 289, 44, 206, 300, 305, 309, 45, 98, 317, - 321, 320, 46, 325, 47, 10, 169, 170, 1, 2, - 324, 293, 48, 337, 338, 326, 334, 340, 346, 350, - 351, 49, 356, 50, 367, 361, 139, 140, 51, 370, - 52, 53, 54, 141, 369, 371, 376, 85, 38, 86, - 394, 87, 142, 395, 6, 18, 177, 35, 81, 111, - 135, 88, 133, 105, 327, 89, 253, 355, 348, 90, - 345, 198, 91, 41, 42, 43, 342, 292, 368, 392, - 285, 143, 380, 92, 45, 377, 283, 375, 93, 46, - 94, 47, 95, 118, 0, 352, 0, 0, 0, 48, - 0, 96, 97, 144, 145, 0, 0, 0, 49, 0, - 50, 0, 146, 139, 140, 51, 98, 52, 53, 54, - 141, 0, 0, 0, 85, 38, 86, 0, 87, 142, - 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, 143, 0, - 92, 45, 0, 0, 0, 93, 46, 94, 47, 95, - 0, 0, 0, 1, 2, 0, 48, 0, 96, 97, - 144, 145, 0, 0, 85, 49, 86, 50, 87, 0, - 0, 0, 51, 98, 52, 53, 54, 0, 88, 0, - 0, 0, 89, 0, 0, 0, 90, 0, 0, 91, + 117, 5, 232, 214, 5, 15, 174, 192, 150, 193, + 118, 102, 102, 240, 101, 101, 10, 389, 114, 10, + 10, 11, 1, 2, 7, 112, 161, 162, 67, 65, + 165, 10, 72, 10, 1, 2, 79, 229, 64, 185, + 16, 71, 10, 11, 10, 78, 128, 343, 65, 10, + 169, 170, 161, 162, 19, 10, 201, 64, 10, 169, + 170, 10, 169, 170, 355, 187, 79, 10, 259, 28, + 297, 298, 229, 230, 266, 78, 29, 244, 166, 167, + 168, 10, 169, 170, 1, 2, 267, 201, 113, 10, + 169, 170, 34, 115, 30, 202, 203, 389, 231, 383, + 129, 72, 31, 63, 128, 79, 161, 162, 230, 32, + 71, 204, 155, 134, 78, 265, 214, 12, 393, 68, + 364, 154, 63, 165, 176, 150, 202, 33, 115, 36, + 205, 110, 240, 175, 242, 37, 206, 351, 237, 17, + 353, 322, 115, 255, -226, 207, 256, 349, -226, 237, + 199, 200, 208, 384, 209, 255, 210, 385, 129, 303, + 201, 359, 10, 169, 170, 271, 308, 206, 185, 137, + 328, 329, 295, 330, 344, 241, 294, 171, 248, 311, + 138, 10, 314, 248, 1, 2, 260, 66, 264, 80, + 259, 356, 186, 201, 187, 10, 169, 170, 304, 202, + 203, 150, 392, 185, 150, 156, 107, 312, -250, 157, + 270, 323, 392, 20, 381, 204, 120, 120, 288, 73, + 121, 21, 82, 347, 376, 122, 333, 191, 299, 187, + 83, 84, 202, 123, 205, 10, 124, 331, 1, 2, + 206, 85, 22, 86, 23, 87, 227, 332, 301, 207, + 228, 130, 302, 24, 131, 88, 158, 306, 209, 89, + 210, 307, 125, 90, 1, 2, 91, 274, 275, 276, + 277, 313, 315, 206, 318, 307, 316, 92, 319, 310, + 132, 367, 93, 136, 94, 368, 95, 10, 169, 170, + 1, 2, 176, 374, 241, 96, 97, 375, 160, 248, + 159, 175, 274, 275, 276, 277, 108, 109, 260, 176, + 98, 264, 161, 162, 83, 84, 362, -251, 175, 182, + 183, 194, 184, 99, 196, 201, 366, 10, 169, 170, + 197, 10, 236, 224, 226, 243, 251, 252, 254, 115, + 269, 85, 272, 86, 273, 87, 280, 282, 284, 286, + 289, 300, 309, 305, 325, 88, 366, 317, 10, 89, + 320, 1, 2, 90, 202, 321, 91, 362, 326, 324, + 388, 334, 337, 38, 338, 340, 346, 92, 350, 352, + 358, 363, 93, 378, 94, 369, 95, 371, 39, 372, + 373, 396, 40, 397, 177, 96, 97, 6, 41, 42, + 43, 18, 35, 81, 44, 206, 111, 135, 105, 45, + 98, 133, 345, 327, 46, 198, 47, 253, 357, 348, + 342, 292, 394, 293, 48, 370, 285, 283, 377, 382, + 379, 354, 0, 49, 0, 50, 0, 0, 139, 140, + 51, 0, 52, 53, 54, 141, 0, 0, 0, 85, + 38, 86, 0, 87, 142, 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, 143, 0, 92, 45, 0, 0, 0, + 93, 46, 94, 47, 95, 0, 0, 0, 0, 0, + 0, 48, 0, 96, 97, 144, 145, 0, 0, 0, + 49, 0, 50, 0, 146, 139, 140, 51, 98, 52, + 53, 54, 141, 0, 0, 0, 85, 38, 86, 0, + 87, 142, 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, + 143, 0, 92, 45, 0, 0, 0, 93, 46, 94, + 47, 95, 0, 0, 0, 83, 84, 0, 48, 0, + 96, 97, 144, 145, 0, 0, 85, 49, 86, 50, + 87, 0, 1, 2, 51, 98, 52, 53, 54, 0, + 88, 0, 0, 85, 89, 86, 0, 87, 90, 0, + 0, 91, 0, 0, 0, 0, 0, 88, 0, 0, + 0, 89, 92, 0, 0, 90, 0, 93, 91, 94, + 0, 95, 0, 0, 0, 0, 0, 0, 0, 92, + 96, 97, 0, 0, 93, 0, 94, 0, 95, 0, + 0, 0, 0, 0, 0, 98, 0, 96, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 92, 0, 0, 0, 0, 93, 0, 94, 0, 95, - 0, 0, 0, 0, 0, 0, 0, 0, 96, 97, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 98 + 0, 0, 98 }; static const short yycheck[] = { 7, - 82, 0, 118, 160, 3, 13, 145, 180, 147, 132, - 4, 64, 65, 183, 64, 65, 8, 28, 8, 13, - 14, 11, 12, 8, 104, 8, 9, 17, 46, 37, - 8, 8, 40, 11, 12, 3, 44, 8, 37, 11, - 12, 40, 229, 11, 12, 44, 99, 8, 56, 8, - 9, 231, 232, 300, 22, 34, 24, 56, 26, 8, - 9, 10, 131, 8, 9, 10, 74, 33, 36, 30, - 317, 194, 40, 13, 14, 74, 44, 278, 279, 47, - 281, 268, 5, 6, 7, 8, 9, 10, 11, 12, - 58, 109, 103, 33, 104, 63, 283, 65, 180, 67, - 99, 109, 112, 69, 157, 113, 15, 9, 76, 77, - 109, 105, 120, 112, 113, 197, 273, 102, 108, 235, - 112, 120, 105, 91, 132, 101, 103, 57, 308, 69, - 108, 102, 302, 132, 184, 251, 104, 113, 254, 106, - 6, 102, 8, 9, 10, 6, 105, 8, 9, 10, - 158, 159, 37, 102, 53, 224, 105, 102, 157, 241, - 69, 108, 109, 103, 73, 105, 248, 13, 14, 109, - 6, 56, 8, 9, 10, 183, 229, 300, 186, 45, - 46, 104, 80, 191, 45, 46, 194, 6, 196, 8, - 9, 10, 3, 316, 317, 61, 80, 210, 84, 8, - 61, 84, 11, 12, 84, 378, 104, 80, 106, 45, - 209, 107, 369, 105, 80, 388, 41, 109, 226, 80, - 86, 360, 106, 305, 60, 86, 45, 52, 236, 95, - 243, 104, 251, 106, 95, 254, 102, 46, 104, 252, - 106, 60, 4, 104, 21, 106, 12, 12, 11, 12, - 86, 13, 14, 8, 105, 20, 11, 12, 109, 22, - 105, 24, 105, 26, 109, 39, 109, 86, 105, 282, - 105, 105, 109, 36, 109, 109, 41, 40, 43, 105, - 108, 44, 105, 109, 47, 112, 109, 52, 11, 12, - 81, 81, 300, 71, 302, 58, 81, 51, 3, 307, - 63, 300, 65, 6, 67, 8, 9, 10, 316, 317, - 112, 319, 3, 76, 77, 104, 324, 110, 317, 22, - 104, 24, 110, 26, 104, 35, 334, 68, 91, 97, - 98, 99, 100, 36, 104, 104, 8, 40, 3, 11, - 12, 44, 45, 104, 47, 97, 98, 99, 100, 8, - 25, 23, 112, 112, 362, 58, 106, 109, 106, 68, - 63, 68, 65, 103, 67, 373, 38, 30, 376, 105, - 42, 109, 96, 76, 77, 106, 48, 49, 50, 104, - 4, 95, 54, 86, 111, 68, 107, 59, 91, 106, - 101, 113, 64, 105, 66, 8, 9, 10, 11, 12, - 104, 104, 74, 4, 82, 107, 114, 88, 107, 102, - 107, 83, 113, 85, 104, 107, 11, 12, 90, 107, - 92, 93, 94, 18, 109, 107, 112, 22, 23, 24, - 0, 26, 27, 0, 3, 13, 134, 26, 56, 74, - 113, 36, 109, 65, 273, 40, 191, 319, 307, 44, - 302, 157, 47, 48, 49, 50, 298, 228, 339, 388, - 224, 56, 373, 58, 59, 366, 217, 362, 63, 64, - 65, 66, 67, 82, -1, 316, -1, -1, -1, 74, - -1, 76, 77, 78, 79, -1, -1, -1, 83, -1, - 85, -1, 87, 11, 12, 90, 91, 92, 93, 94, - 18, -1, -1, -1, 22, 23, 24, -1, 26, 27, - -1, -1, -1, -1, -1, -1, -1, -1, 36, -1, - -1, -1, 40, -1, -1, -1, 44, -1, -1, 47, - 48, 49, 50, -1, -1, -1, -1, -1, 56, -1, - 58, 59, -1, -1, -1, 63, 64, 65, 66, 67, - -1, -1, -1, 11, 12, -1, 74, -1, 76, 77, - 78, 79, -1, -1, 22, 83, 24, 85, 26, -1, - -1, -1, 90, 91, 92, 93, 94, -1, 36, -1, - -1, -1, 40, -1, -1, -1, 44, -1, -1, 47, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 58, -1, -1, -1, -1, 63, -1, 65, -1, 67, - -1, -1, -1, -1, -1, -1, -1, -1, 76, 77, + 82, 0, 180, 160, 3, 13, 132, 145, 118, 147, + 82, 64, 65, 183, 64, 65, 8, 4, 28, 8, + 8, 9, 11, 12, 104, 46, 13, 14, 17, 37, + 131, 8, 40, 8, 11, 12, 44, 33, 37, 80, + 34, 40, 8, 9, 8, 44, 99, 300, 56, 8, + 9, 10, 13, 14, 106, 8, 6, 56, 8, 9, + 10, 8, 9, 10, 317, 106, 74, 8, 194, 9, + 231, 232, 33, 69, 101, 74, 57, 30, 5, 6, + 7, 8, 9, 10, 11, 12, 113, 6, 109, 8, + 9, 10, 3, 103, 84, 45, 46, 4, 180, 15, + 99, 109, 84, 37, 157, 113, 13, 14, 69, 53, + 109, 61, 120, 112, 113, 197, 273, 105, 105, 108, + 112, 120, 56, 224, 132, 235, 45, 84, 103, 107, + 80, 108, 302, 132, 184, 21, 86, 311, 102, 105, + 314, 60, 103, 102, 105, 95, 105, 308, 109, 102, + 158, 159, 102, 69, 104, 102, 106, 73, 157, 241, + 6, 102, 8, 9, 10, 210, 248, 86, 80, 41, + 278, 279, 229, 281, 300, 183, 229, 104, 186, 251, + 52, 8, 254, 191, 11, 12, 194, 12, 196, 39, + 316, 317, 104, 6, 106, 8, 9, 10, 243, 45, + 46, 311, 380, 80, 314, 105, 108, 252, 104, 109, + 209, 268, 390, 12, 371, 61, 112, 112, 226, 46, + 81, 20, 3, 305, 362, 81, 283, 104, 236, 106, + 11, 12, 45, 71, 80, 8, 51, 282, 11, 12, + 86, 22, 41, 24, 43, 26, 105, 60, 105, 95, + 109, 3, 109, 52, 112, 36, 110, 105, 104, 40, + 106, 109, 81, 44, 11, 12, 47, 97, 98, 99, + 100, 105, 105, 86, 105, 109, 109, 58, 109, 109, + 3, 105, 63, 104, 65, 109, 67, 8, 9, 10, + 11, 12, 300, 105, 302, 76, 77, 109, 104, 307, + 110, 300, 97, 98, 99, 100, 108, 109, 316, 317, + 91, 319, 13, 14, 11, 12, 324, 104, 317, 35, + 104, 104, 68, 104, 104, 6, 334, 8, 9, 10, + 3, 8, 25, 112, 112, 106, 68, 106, 68, 103, + 30, 22, 105, 24, 109, 26, 96, 106, 104, 4, + 95, 111, 107, 68, 105, 36, 364, 106, 8, 40, + 113, 11, 12, 44, 45, 101, 47, 375, 107, 104, + 378, 114, 4, 23, 82, 88, 107, 58, 102, 107, + 113, 107, 63, 112, 65, 104, 67, 109, 38, 107, + 107, 0, 42, 0, 134, 76, 77, 3, 48, 49, + 50, 13, 26, 56, 54, 86, 74, 113, 65, 59, + 91, 109, 302, 273, 64, 157, 66, 191, 319, 307, + 298, 228, 390, 104, 74, 339, 224, 217, 364, 375, + 368, 316, -1, 83, -1, 85, -1, -1, 11, 12, + 90, -1, 92, 93, 94, 18, -1, -1, -1, 22, + 23, 24, -1, 26, 27, -1, -1, -1, -1, -1, + -1, -1, -1, 36, -1, -1, -1, 40, -1, -1, + -1, 44, -1, -1, 47, 48, 49, 50, -1, -1, + -1, -1, -1, 56, -1, 58, 59, -1, -1, -1, + 63, 64, 65, 66, 67, -1, -1, -1, -1, -1, + -1, 74, -1, 76, 77, 78, 79, -1, -1, -1, + 83, -1, 85, -1, 87, 11, 12, 90, 91, 92, + 93, 94, 18, -1, -1, -1, 22, 23, 24, -1, + 26, 27, -1, -1, -1, -1, -1, -1, -1, -1, + 36, -1, -1, -1, 40, -1, -1, -1, 44, -1, + -1, 47, 48, 49, 50, -1, -1, -1, -1, -1, + 56, -1, 58, 59, -1, -1, -1, 63, 64, 65, + 66, 67, -1, -1, -1, 11, 12, -1, 74, -1, + 76, 77, 78, 79, -1, -1, 22, 83, 24, 85, + 26, -1, 11, 12, 90, 91, 92, 93, 94, -1, + 36, -1, -1, 22, 40, 24, -1, 26, 44, -1, + -1, 47, -1, -1, -1, -1, -1, 36, -1, -1, + -1, 40, 58, -1, -1, 44, -1, 63, 47, 65, + -1, 67, -1, -1, -1, -1, -1, -1, -1, 58, + 76, 77, -1, -1, 63, -1, 65, -1, 67, -1, + -1, -1, -1, -1, -1, 91, -1, 76, 77, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 91 + -1, -1, 91 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/share/bison.simple" @@ -2163,25 +2172,27 @@ case 107: { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); - yyval.a_expr->constraints = yyvsp[-2].a_constr; + yyval.a_expr->constraints = yyvsp[-3].a_constr; yyval.a_expr->expr_type = ASN_CONSTR_SEQUENCE_OF; yyval.a_expr->meta_type = AMT_TYPE; + yyvsp[0].a_expr->tag = yyvsp[-1].a_tag; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} case 108: -#line 1087 "asn1p_y.y" +#line 1088 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); - yyval.a_expr->constraints = yyvsp[-2].a_constr; + yyval.a_expr->constraints = yyvsp[-3].a_constr; yyval.a_expr->expr_type = ASN_CONSTR_SET_OF; yyval.a_expr->meta_type = AMT_TYPE; + yyvsp[0].a_expr->tag = yyvsp[-1].a_tag; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} case 109: -#line 1095 "asn1p_y.y" +#line 1097 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2190,7 +2201,7 @@ case 109: ; break;} case 110: -#line 1101 "asn1p_y.y" +#line 1103 "asn1p_y.y" { int ret; yyval.a_expr = asn1p_expr_new(yylineno); @@ -2204,7 +2215,7 @@ case 110: ; break;} case 111: -#line 1115 "asn1p_y.y" +#line 1117 "asn1p_y.y" { int ret; yyval.a_expr = yyvsp[-1].a_expr; @@ -2221,7 +2232,7 @@ case 111: ; break;} case 112: -#line 1139 "asn1p_y.y" +#line 1141 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2231,7 +2242,7 @@ case 112: ; break;} case 113: -#line 1146 "asn1p_y.y" +#line 1148 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2241,7 +2252,7 @@ case 113: ; break;} case 114: -#line 1161 "asn1p_y.y" +#line 1163 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2252,7 +2263,7 @@ case 114: ; break;} case 115: -#line 1169 "asn1p_y.y" +#line 1171 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2265,7 +2276,7 @@ case 115: ; break;} case 116: -#line 1179 "asn1p_y.y" +#line 1181 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2278,7 +2289,7 @@ case 116: ; break;} case 117: -#line 1189 "asn1p_y.y" +#line 1191 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2289,7 +2300,7 @@ case 117: ; break;} case 118: -#line 1197 "asn1p_y.y" +#line 1199 "asn1p_y.y" { int ret; yyval.a_ref = yyvsp[0].a_ref; @@ -2311,7 +2322,7 @@ case 118: ; break;} case 119: -#line 1219 "asn1p_y.y" +#line 1221 "asn1p_y.y" { int ret; yyval.a_ref = asn1p_ref_new(yylineno); @@ -2322,7 +2333,7 @@ case 119: ; break;} case 120: -#line 1227 "asn1p_y.y" +#line 1229 "asn1p_y.y" { int ret; yyval.a_ref = yyvsp[-2].a_ref; @@ -2332,21 +2343,21 @@ case 120: ; break;} case 123: -#line 1241 "asn1p_y.y" +#line 1243 "asn1p_y.y" { yyval.a_refcomp.lex_type = RLT_AmpUppercase; yyval.a_refcomp.name = yyvsp[0].tv_str; ; break;} case 124: -#line 1246 "asn1p_y.y" +#line 1248 "asn1p_y.y" { yyval.a_refcomp.lex_type = RLT_Amplowercase; yyval.a_refcomp.name = yyvsp[0].tv_str; ; break;} case 125: -#line 1259 "asn1p_y.y" +#line 1261 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; assert(yyval.a_expr->Identifier == NULL); @@ -2356,11 +2367,11 @@ case 125: ; break;} case 126: -#line 1269 "asn1p_y.y" +#line 1271 "asn1p_y.y" { asn1p_lexer_hack_push_opaque_state(); ; break;} case 127: -#line 1270 "asn1p_y.y" +#line 1272 "asn1p_y.y" { yyval.a_value = asn1p_value_frombuf(yyvsp[0].tv_opaque.buf, yyvsp[0].tv_opaque.len, 0); checkmem(yyval.a_value); @@ -2368,40 +2379,40 @@ case 127: ; break;} case 128: -#line 1275 "asn1p_y.y" +#line 1277 "asn1p_y.y" { yyval.a_value = _convert_bitstring2binary(yyvsp[0].tv_str, 'B'); checkmem(yyval.a_value); ; break;} case 129: -#line 1279 "asn1p_y.y" +#line 1281 "asn1p_y.y" { yyval.a_value = _convert_bitstring2binary(yyvsp[0].tv_str, 'H'); checkmem(yyval.a_value); ; break;} case 130: -#line 1283 "asn1p_y.y" +#line 1285 "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 131: -#line 1287 "asn1p_y.y" +#line 1289 "asn1p_y.y" { yyval.a_value = yyvsp[0].a_value; ; break;} case 132: -#line 1290 "asn1p_y.y" +#line 1292 "asn1p_y.y" { yyval.a_value = yyvsp[0].a_value; ; break;} case 133: -#line 1296 "asn1p_y.y" +#line 1298 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -2415,7 +2426,7 @@ case 133: ; break;} case 134: -#line 1307 "asn1p_y.y" +#line 1309 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -2432,7 +2443,7 @@ case 134: ; break;} case 135: -#line 1324 "asn1p_y.y" +#line 1326 "asn1p_y.y" { yyval.tv_opaque.len = yyvsp[0].tv_opaque.len + 2; yyval.tv_opaque.buf = malloc(yyval.tv_opaque.len + 1); @@ -2445,7 +2456,7 @@ case 135: ; break;} case 136: -#line 1334 "asn1p_y.y" +#line 1336 "asn1p_y.y" { int newsize = yyvsp[-1].tv_opaque.len + yyvsp[0].tv_opaque.len; char *p = malloc(newsize + 1); @@ -2460,67 +2471,67 @@ case 136: ; break;} case 137: -#line 1349 "asn1p_y.y" +#line 1351 "asn1p_y.y" { yyval.a_type = ASN_BASIC_BOOLEAN; ; break;} case 138: -#line 1350 "asn1p_y.y" +#line 1352 "asn1p_y.y" { yyval.a_type = ASN_BASIC_NULL; ; break;} case 139: -#line 1351 "asn1p_y.y" +#line 1353 "asn1p_y.y" { yyval.a_type = ASN_BASIC_REAL; ; break;} case 140: -#line 1352 "asn1p_y.y" +#line 1354 "asn1p_y.y" { yyval.a_type = yyvsp[0].a_type; ; break;} case 141: -#line 1353 "asn1p_y.y" +#line 1355 "asn1p_y.y" { yyval.a_type = ASN_BASIC_OCTET_STRING; ; break;} case 142: -#line 1354 "asn1p_y.y" +#line 1356 "asn1p_y.y" { yyval.a_type = ASN_BASIC_OBJECT_IDENTIFIER; ; break;} case 143: -#line 1355 "asn1p_y.y" +#line 1357 "asn1p_y.y" { yyval.a_type = ASN_BASIC_RELATIVE_OID; ; break;} case 144: -#line 1356 "asn1p_y.y" +#line 1358 "asn1p_y.y" { yyval.a_type = ASN_BASIC_EXTERNAL; ; break;} case 145: -#line 1357 "asn1p_y.y" +#line 1359 "asn1p_y.y" { yyval.a_type = ASN_BASIC_EMBEDDED_PDV; ; break;} case 146: -#line 1358 "asn1p_y.y" +#line 1360 "asn1p_y.y" { yyval.a_type = ASN_BASIC_CHARACTER_STRING; ; break;} case 147: -#line 1359 "asn1p_y.y" +#line 1361 "asn1p_y.y" { yyval.a_type = ASN_BASIC_UTCTime; ; break;} case 148: -#line 1360 "asn1p_y.y" +#line 1362 "asn1p_y.y" { yyval.a_type = ASN_BASIC_GeneralizedTime; ; break;} case 149: -#line 1367 "asn1p_y.y" +#line 1369 "asn1p_y.y" { yyval.a_type = ASN_BASIC_INTEGER; ; break;} case 150: -#line 1368 "asn1p_y.y" +#line 1370 "asn1p_y.y" { yyval.a_type = ASN_BASIC_ENUMERATED; ; break;} case 151: -#line 1369 "asn1p_y.y" +#line 1371 "asn1p_y.y" { yyval.a_type = ASN_BASIC_BIT_STRING; ; break;} case 152: -#line 1373 "asn1p_y.y" +#line 1375 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -2529,7 +2540,7 @@ case 152: ; break;} case 153: -#line 1379 "asn1p_y.y" +#line 1381 "asn1p_y.y" { if(yyvsp[0].a_expr) { yyval.a_expr = yyvsp[0].a_expr; @@ -2542,91 +2553,91 @@ case 153: ; break;} case 154: -#line 1392 "asn1p_y.y" +#line 1394 "asn1p_y.y" { yyval.a_type = ASN_STRING_BMPString; ; break;} case 155: -#line 1393 "asn1p_y.y" +#line 1395 "asn1p_y.y" { yyval.a_type = ASN_STRING_GeneralString; fprintf(stderr, "WARNING: GeneralString is not fully supported"); ; break;} case 156: -#line 1397 "asn1p_y.y" +#line 1399 "asn1p_y.y" { yyval.a_type = ASN_STRING_GraphicString; fprintf(stderr, "WARNING: GraphicString is not fully supported"); ; break;} case 157: -#line 1401 "asn1p_y.y" +#line 1403 "asn1p_y.y" { yyval.a_type = ASN_STRING_IA5String; ; break;} case 158: -#line 1402 "asn1p_y.y" +#line 1404 "asn1p_y.y" { yyval.a_type = ASN_STRING_ISO646String; ; break;} case 159: -#line 1403 "asn1p_y.y" +#line 1405 "asn1p_y.y" { yyval.a_type = ASN_STRING_NumericString; ; break;} case 160: -#line 1404 "asn1p_y.y" +#line 1406 "asn1p_y.y" { yyval.a_type = ASN_STRING_PrintableString; ; break;} case 161: -#line 1405 "asn1p_y.y" +#line 1407 "asn1p_y.y" { yyval.a_type = ASN_STRING_T61String; fprintf(stderr, "WARNING: T61String is not fully supported"); ; break;} case 162: -#line 1409 "asn1p_y.y" +#line 1411 "asn1p_y.y" { yyval.a_type = ASN_STRING_TeletexString; ; break;} case 163: -#line 1410 "asn1p_y.y" +#line 1412 "asn1p_y.y" { yyval.a_type = ASN_STRING_UniversalString; ; break;} case 164: -#line 1411 "asn1p_y.y" +#line 1413 "asn1p_y.y" { yyval.a_type = ASN_STRING_UTF8String; ; break;} case 165: -#line 1412 "asn1p_y.y" +#line 1414 "asn1p_y.y" { yyval.a_type = ASN_STRING_VideotexString; fprintf(stderr, "WARNING: VideotexString is not fully supported"); ; break;} case 166: -#line 1416 "asn1p_y.y" +#line 1418 "asn1p_y.y" { yyval.a_type = ASN_STRING_VisibleString; ; break;} case 167: -#line 1417 "asn1p_y.y" +#line 1419 "asn1p_y.y" { yyval.a_type = ASN_STRING_ObjectDescriptor; ; break;} case 173: -#line 1429 "asn1p_y.y" +#line 1431 "asn1p_y.y" { yyval.a_constr = 0; ; break;} case 174: -#line 1430 "asn1p_y.y" +#line 1432 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} case 175: -#line 1436 "asn1p_y.y" +#line 1438 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_SET, yyvsp[0].a_constr, 0); ; break;} case 176: -#line 1439 "asn1p_y.y" +#line 1441 "asn1p_y.y" { /* * This is a special case, for compatibility purposes. @@ -2636,25 +2647,25 @@ case 176: ; break;} case 177: -#line 1449 "asn1p_y.y" +#line 1451 "asn1p_y.y" { yyval.a_constr = yyvsp[-1].a_constr; ; break;} case 178: -#line 1452 "asn1p_y.y" +#line 1454 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_SET, yyvsp[-3].a_constr, yyvsp[-1].a_constr); ; break;} case 179: -#line 1458 "asn1p_y.y" +#line 1460 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} case 180: -#line 1461 "asn1p_y.y" +#line 1463 "asn1p_y.y" { asn1p_constraint_t *ct; ct = asn1p_constraint_new(yylineno); @@ -2663,7 +2674,7 @@ case 180: ; break;} case 181: -#line 1467 "asn1p_y.y" +#line 1469 "asn1p_y.y" { asn1p_constraint_t *ct; ct = asn1p_constraint_new(yylineno); @@ -2674,31 +2685,31 @@ case 181: ; break;} case 182: -#line 1478 "asn1p_y.y" +#line 1480 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} case 183: -#line 1481 "asn1p_y.y" +#line 1483 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_UNI, yyvsp[-2].a_constr, yyvsp[0].a_constr); ; break;} case 184: -#line 1484 "asn1p_y.y" +#line 1486 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_INT, yyvsp[-2].a_constr, yyvsp[0].a_constr); ; break;} case 185: -#line 1487 "asn1p_y.y" +#line 1489 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_EXC, yyvsp[-2].a_constr, yyvsp[0].a_constr); ; break;} case 186: -#line 1493 "asn1p_y.y" +#line 1495 "asn1p_y.y" { int ret; yyval.a_constr = asn1p_constraint_new(yylineno); @@ -2709,7 +2720,7 @@ case 186: ; break;} case 187: -#line 1501 "asn1p_y.y" +#line 1503 "asn1p_y.y" { int ret; yyval.a_constr = asn1p_constraint_new(yylineno); @@ -2720,7 +2731,7 @@ case 187: ; break;} case 188: -#line 1509 "asn1p_y.y" +#line 1511 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2729,7 +2740,7 @@ case 188: ; break;} case 189: -#line 1515 "asn1p_y.y" +#line 1517 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2739,7 +2750,7 @@ case 189: ; break;} case 190: -#line 1522 "asn1p_y.y" +#line 1524 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2750,7 +2761,7 @@ case 190: ; break;} case 191: -#line 1530 "asn1p_y.y" +#line 1532 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2761,7 +2772,7 @@ case 191: ; break;} case 192: -#line 1538 "asn1p_y.y" +#line 1540 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2773,53 +2784,53 @@ case 192: ; break;} case 193: -#line 1547 "asn1p_y.y" +#line 1549 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} case 194: -#line 1550 "asn1p_y.y" +#line 1552 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} case 195: -#line 1556 "asn1p_y.y" +#line 1558 "asn1p_y.y" { yyval.a_ctype = ACT_EL_RANGE; ; break;} case 196: -#line 1557 "asn1p_y.y" +#line 1559 "asn1p_y.y" { yyval.a_ctype = ACT_EL_RLRANGE; ; break;} case 197: -#line 1558 "asn1p_y.y" +#line 1560 "asn1p_y.y" { yyval.a_ctype = ACT_EL_LLRANGE; ; break;} case 198: -#line 1559 "asn1p_y.y" +#line 1561 "asn1p_y.y" { yyval.a_ctype = ACT_EL_ULRANGE; ; break;} case 199: -#line 1563 "asn1p_y.y" +#line 1565 "asn1p_y.y" { yyval.a_ctype = ACT_CT_SIZE; ; break;} case 200: -#line 1566 "asn1p_y.y" +#line 1568 "asn1p_y.y" { yyval.a_ctype = ACT_CT_FROM; ; break;} case 201: -#line 1572 "asn1p_y.y" +#line 1574 "asn1p_y.y" { yyval.a_value = yyvsp[0].a_value; ; break;} case 202: -#line 1575 "asn1p_y.y" +#line 1577 "asn1p_y.y" { asn1p_ref_t *ref; int ret; @@ -2833,14 +2844,14 @@ case 202: ; break;} case 203: -#line 1586 "asn1p_y.y" +#line 1588 "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 204: -#line 1591 "asn1p_y.y" +#line 1593 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(0); checkmem(yyval.a_value); @@ -2848,7 +2859,7 @@ case 204: ; break;} case 205: -#line 1596 "asn1p_y.y" +#line 1598 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(1); checkmem(yyval.a_value); @@ -2856,25 +2867,25 @@ case 205: ; break;} case 206: -#line 1604 "asn1p_y.y" +#line 1606 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMPS, yyvsp[-1].a_constr, 0); ; break;} case 207: -#line 1610 "asn1p_y.y" +#line 1612 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} case 208: -#line 1613 "asn1p_y.y" +#line 1615 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CT_WCOMPS, yyvsp[-2].a_constr, yyvsp[0].a_constr); ; break;} case 209: -#line 1619 "asn1p_y.y" +#line 1621 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2882,7 +2893,7 @@ case 209: ; break;} case 210: -#line 1624 "asn1p_y.y" +#line 1626 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2892,45 +2903,45 @@ case 210: ; break;} case 211: -#line 1637 "asn1p_y.y" +#line 1639 "asn1p_y.y" { yyval.a_pres = ACPRES_DEFAULT; ; break;} case 212: -#line 1638 "asn1p_y.y" +#line 1640 "asn1p_y.y" { yyval.a_pres = yyvsp[0].a_pres; ; break;} case 213: -#line 1642 "asn1p_y.y" +#line 1644 "asn1p_y.y" { yyval.a_pres = ACPRES_PRESENT; ; break;} case 214: -#line 1645 "asn1p_y.y" +#line 1647 "asn1p_y.y" { yyval.a_pres = ACPRES_ABSENT; ; break;} case 215: -#line 1648 "asn1p_y.y" +#line 1650 "asn1p_y.y" { yyval.a_pres = ACPRES_OPTIONAL; ; break;} case 216: -#line 1654 "asn1p_y.y" +#line 1656 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} case 217: -#line 1657 "asn1p_y.y" +#line 1659 "asn1p_y.y" { yyval.a_constr = yyvsp[0].a_constr; ; break;} case 218: -#line 1666 "asn1p_y.y" +#line 1668 "asn1p_y.y" { asn1p_ref_t *ref = asn1p_ref_new(yylineno); asn1p_constraint_t *ct; @@ -2945,13 +2956,13 @@ case 218: ; break;} case 219: -#line 1681 "asn1p_y.y" +#line 1683 "asn1p_y.y" { CONSTRAINT_INSERT(yyval.a_constr, ACT_CA_CRC, yyvsp[-3].a_constr, yyvsp[-1].a_constr); ; break;} case 220: -#line 1687 "asn1p_y.y" +#line 1689 "asn1p_y.y" { yyval.a_constr = asn1p_constraint_new(yylineno); checkmem(yyval.a_constr); @@ -2960,7 +2971,7 @@ case 220: ; break;} case 221: -#line 1693 "asn1p_y.y" +#line 1695 "asn1p_y.y" { asn1p_constraint_t *ct; ct = asn1p_constraint_new(yylineno); @@ -2971,7 +2982,7 @@ case 221: ; break;} case 222: -#line 1707 "asn1p_y.y" +#line 1709 "asn1p_y.y" { char *p = malloc(strlen(yyvsp[0].tv_str) + 2); int ret; @@ -2985,7 +2996,7 @@ case 222: ; break;} case 223: -#line 1718 "asn1p_y.y" +#line 1720 "asn1p_y.y" { char *p = malloc(strlen(yyvsp[0].tv_str) + 3); int ret; @@ -3000,13 +3011,13 @@ case 223: ; break;} case 224: -#line 1734 "asn1p_y.y" +#line 1736 "asn1p_y.y" { yyval.tv_str = yyvsp[0].tv_str; ; break;} case 225: -#line 1737 "asn1p_y.y" +#line 1739 "asn1p_y.y" { int l1 = strlen(yyvsp[-2].tv_str); int l3 = strlen(yyvsp[0].tv_str); @@ -3018,60 +3029,60 @@ case 225: ; break;} case 226: -#line 1755 "asn1p_y.y" +#line 1757 "asn1p_y.y" { yyval.a_marker = EM_NOMARK; ; break;} case 227: -#line 1756 "asn1p_y.y" +#line 1758 "asn1p_y.y" { yyval.a_marker = yyvsp[0].a_marker; ; break;} case 228: -#line 1760 "asn1p_y.y" +#line 1762 "asn1p_y.y" { yyval.a_marker = EM_OPTIONAL; ; break;} case 229: -#line 1763 "asn1p_y.y" +#line 1765 "asn1p_y.y" { yyval.a_marker = EM_DEFAULT; /* FIXME: store DefaultValue somewhere */ ; break;} case 230: -#line 1770 "asn1p_y.y" +#line 1772 "asn1p_y.y" { ; break;} case 231: -#line 1772 "asn1p_y.y" +#line 1774 "asn1p_y.y" { ; break;} case 232: -#line 1774 "asn1p_y.y" +#line 1776 "asn1p_y.y" { asn1p_lexer_hack_push_opaque_state(); ; break;} case 233: -#line 1774 "asn1p_y.y" +#line 1776 "asn1p_y.y" { ; break;} case 234: -#line 1795 "asn1p_y.y" +#line 1797 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); ; break;} case 235: -#line 1799 "asn1p_y.y" +#line 1801 "asn1p_y.y" { yyval.a_expr = yyvsp[-1].a_expr; ; break;} case 236: -#line 1805 "asn1p_y.y" +#line 1807 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3079,14 +3090,14 @@ case 236: ; break;} case 237: -#line 1810 "asn1p_y.y" +#line 1812 "asn1p_y.y" { yyval.a_expr = yyvsp[-2].a_expr; asn1p_expr_add(yyval.a_expr, yyvsp[0].a_expr); ; break;} case 238: -#line 1817 "asn1p_y.y" +#line 1819 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3096,7 +3107,7 @@ case 238: ; break;} case 239: -#line 1824 "asn1p_y.y" +#line 1826 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3107,7 +3118,7 @@ case 239: ; break;} case 240: -#line 1832 "asn1p_y.y" +#line 1834 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3118,7 +3129,7 @@ case 240: ; break;} case 241: -#line 1840 "asn1p_y.y" +#line 1842 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3128,7 +3139,7 @@ case 241: ; break;} case 242: -#line 1847 "asn1p_y.y" +#line 1849 "asn1p_y.y" { yyval.a_expr = asn1p_expr_new(yylineno); checkmem(yyval.a_expr); @@ -3139,71 +3150,71 @@ case 242: ; break;} case 243: -#line 1858 "asn1p_y.y" +#line 1860 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int); checkmem(yyval.a_value); ; break;} case 244: -#line 1862 "asn1p_y.y" +#line 1864 "asn1p_y.y" { yyval.a_value = asn1p_value_fromint(yyvsp[0].a_int); checkmem(yyval.a_value); ; break;} case 245: -#line 1893 "asn1p_y.y" +#line 1895 "asn1p_y.y" { memset(&yyval.a_tag, 0, sizeof(yyval.a_tag)); ; break;} case 246: -#line 1894 "asn1p_y.y" +#line 1896 "asn1p_y.y" { yyval.a_tag = yyvsp[0].a_tag; ; break;} case 247: -#line 1898 "asn1p_y.y" +#line 1900 "asn1p_y.y" { yyval.a_tag = yyvsp[0].a_tag; yyval.a_tag.tag_mode = TM_DEFAULT; ; break;} case 248: -#line 1902 "asn1p_y.y" +#line 1904 "asn1p_y.y" { yyval.a_tag = yyvsp[-1].a_tag; yyval.a_tag.tag_mode = TM_IMPLICIT; ; break;} case 249: -#line 1906 "asn1p_y.y" +#line 1908 "asn1p_y.y" { yyval.a_tag = yyvsp[-1].a_tag; yyval.a_tag.tag_mode = TM_EXPLICIT; ; break;} case 250: -#line 1913 "asn1p_y.y" +#line 1915 "asn1p_y.y" { checkmem(yyvsp[0].tv_str); yyval.tv_str = yyvsp[0].tv_str; ; break;} case 251: -#line 1917 "asn1p_y.y" +#line 1919 "asn1p_y.y" { checkmem(yyvsp[0].tv_str); yyval.tv_str = yyvsp[0].tv_str; ; break;} case 252: -#line 1925 "asn1p_y.y" +#line 1927 "asn1p_y.y" { checkmem(yyvsp[0].tv_str); yyval.tv_str = yyvsp[0].tv_str; ; break;} case 253: -#line 1932 "asn1p_y.y" +#line 1934 "asn1p_y.y" { checkmem(yyvsp[0].tv_str); yyval.tv_str = yyvsp[0].tv_str; @@ -3431,7 +3442,7 @@ yyerrhandle: } return 1; } -#line 1938 "asn1p_y.y" +#line 1940 "asn1p_y.y" diff --git a/libasn1parser/asn1p_y.y b/libasn1parser/asn1p_y.y index a1528704..bc195222 100644 --- a/libasn1parser/asn1p_y.y +++ b/libasn1parser/asn1p_y.y @@ -1076,21 +1076,23 @@ TypeDeclaration: $$->expr_type = ASN_CONSTR_SET; $$->meta_type = AMT_TYPE; } - | TOK_SEQUENCE optConstraints TOK_OF TypeDeclaration { + | TOK_SEQUENCE optConstraints TOK_OF optTag TypeDeclaration { $$ = asn1p_expr_new(yylineno); checkmem($$); $$->constraints = $2; $$->expr_type = ASN_CONSTR_SEQUENCE_OF; $$->meta_type = AMT_TYPE; - asn1p_expr_add($$, $4); + $5->tag = $4; + asn1p_expr_add($$, $5); } - | TOK_SET optConstraints TOK_OF TypeDeclaration { + | TOK_SET optConstraints TOK_OF optTag TypeDeclaration { $$ = asn1p_expr_new(yylineno); checkmem($$); $$->constraints = $2; $$->expr_type = ASN_CONSTR_SET_OF; $$->meta_type = AMT_TYPE; - asn1p_expr_add($$, $4); + $5->tag = $4; + asn1p_expr_add($$, $5); } | TOK_ANY { $$ = asn1p_expr_new(yylineno); |