Index: trunk/doc-rnd/TODO =================================================================== --- trunk/doc-rnd/TODO (revision 1218) +++ trunk/doc-rnd/TODO (revision 1219) @@ -1,8 +1,6 @@ UNGLIB: - test transition (after glib removal is finished so that valgrind works reasonably well again): - - can't click into a text and get it selected (rtree?)?! - convert buffer to element fails? - - test autorouter - test exporters - test gpmi search - place 2 arcs, select first, can't move to left edge (bbox or rtree?) Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 1218) +++ trunk/src/rats_act.c (revision 1219) @@ -31,6 +31,10 @@ #include "change.h" #include "error.h" #include "undo.h" +#include "set.h" +#include "misc.h" +#include "find.h" +#include "remove.h" #include "rats.h" #include "draw.h" Index: trunk/src/remove_act.c =================================================================== --- trunk/src/remove_act.c (revision 1218) +++ trunk/src/remove_act.c (revision 1219) @@ -31,6 +31,8 @@ #include "change.h" #include "error.h" #include "undo.h" +#include "set.h" +#include "remove.h" /* --------------------------------------------------------------------------- */ Index: trunk/src/stub_mincut.c =================================================================== --- trunk/src/stub_mincut.c (revision 1218) +++ trunk/src/stub_mincut.c (revision 1219) @@ -31,7 +31,6 @@ if (TEST_FLAG(ENABLEMINCUTFLAG, PCB)) Message(_("Can not run mincut: the mincut plugin/buildin is not present.\n")); - return 0; } static void stub_rat_found_short_dummy(PinType * pin, PadType * pad, const char *with_net) Index: trunk/src_plugins/autoplace/action.c =================================================================== --- trunk/src_plugins/autoplace/action.c (revision 1218) +++ trunk/src_plugins/autoplace/action.c (revision 1219) @@ -28,6 +28,7 @@ #include "config.h" #include "global.h" #include "autoplace.h" +#include "set.h" static const char autoplace_syntax[] = "AutoPlaceSelected()"; Index: trunk/src_plugins/autoroute/action.c =================================================================== --- trunk/src_plugins/autoroute/action.c (revision 1218) +++ trunk/src_plugins/autoroute/action.c (revision 1219) @@ -28,6 +28,7 @@ #include "config.h" #include "global.h" #include "autoroute.h" +#include "set.h" /* action routines for the autorouter */ Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 1218) +++ trunk/src_plugins/autoroute/autoroute.c (revision 1219) @@ -79,6 +79,7 @@ #include "undo.h" #include "vector.h" #include "pcb-printf.h" +#include "set.h" RCSID("$Id$"); Index: trunk/src_plugins/edif/edif.c =================================================================== --- trunk/src_plugins/edif/edif.c (revision 1218) +++ trunk/src_plugins/edif/edif.c (revision 1219) @@ -101,10 +101,13 @@ #include "global.h" #include "data.h" +#include "error.h" + /* from mymem.h, not include because of the malloc junk */ -LibraryMenuTypePtr GetLibraryMenuMemory (LibraryTypePtr); -LibraryEntryTypePtr GetLibraryEntryMemory (LibraryMenuTypePtr); +LibraryMenuTypePtr GetLibraryMenuMemory(LibraryTypePtr, int *idx); +LibraryEntryTypePtr GetLibraryEntryMemory(LibraryMenuTypePtr); + /* * Local definitions. */ @@ -172,7 +175,7 @@ char* buf; char* p; LibraryEntryTypePtr entry; - LibraryMenuTypePtr menu = GetLibraryMenuMemory (&PCB->NetlistLib); + LibraryMenuTypePtr menu = GetLibraryMenuMemory (PCB->NetlistLib, NULL); if ( !name->str1 ) { @@ -260,7 +263,7 @@ static void yyerror(const char *); static void PopC(void); -#line 264 "y.tab.c" /* yacc.c:339 */ +#line 267 "y.tab.c" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -885,13 +888,13 @@ typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 193 "../src_plugins/edif/edif.y" /* yacc.c:355 */ +#line 196 "../src_plugins/edif/edif.y" /* yacc.c:355 */ char* s; pair_list* pl; str_pair* ps; -#line 895 "y.tab.c" /* yacc.c:355 */ +#line 898 "y.tab.c" /* yacc.c:355 */ }; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 @@ -906,7 +909,7 @@ /* Copy the second part of user declarations. */ -#line 910 "y.tab.c" /* yacc.c:358 */ +#line 913 "y.tab.c" /* yacc.c:358 */ #ifdef short # undef short @@ -1232,119 +1235,119 @@ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 505, 505, 508, 511, 512, 513, 514, 515, 516, - 517, 520, 523, 526, 530, 533, 534, 537, 540, 541, - 542, 543, 544, 545, 548, 551, 552, 555, 558, 559, - 560, 561, 562, 565, 568, 571, 572, 575, 578, 581, - 582, 583, 584, 585, 588, 591, 594, 597, 600, 603, - 606, 607, 608, 611, 614, 615, 618, 619, 622, 625, - 626, 627, 628, 631, 634, 635, 638, 641, 642, 645, - 648, 651, 654, 657, 658, 659, 660, 661, 662, 663, - 666, 669, 672, 673, 676, 679, 682, 683, 684, 687, - 690, 691, 692, 695, 696, 697, 700, 703, 704, 707, - 710, 713, 714, 717, 720, 721, 722, 723, 724, 725, - 726, 727, 730, 733, 736, 737, 738, 739, 740, 741, - 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, - 752, 753, 756, 759, 760, 763, 766, 767, 768, 771, - 774, 775, 778, 781, 784, 785, 786, 789, 792, 793, - 796, 799, 800, 803, 806, 807, 810, 813, 814, 817, - 820, 821, 824, 827, 828, 831, 834, 835, 838, 841, - 842, 845, 848, 849, 850, 853, 856, 857, 858, 859, - 860, 863, 866, 867, 870, 873, 876, 877, 878, 879, - 880, 881, 882, 883, 884, 885, 886, 887, 888, 889, - 890, 893, 896, 897, 898, 899, 902, 905, 906, 907, - 910, 913, 914, 917, 918, 921, 922, 925, 926, 929, - 932, 933, 936, 939, 940, 943, 946, 950, 951, 952, - 953, 956, 959, 960, 961, 964, 968, 969, 970, 973, - 974, 975, 976, 979, 980, 981, 984, 987, 988, 989, - 990, 991, 992, 993, 996, 999, 1002, 1003, 1004, 1005, - 1006, 1009, 1012, 1015, 1018, 1019, 1020, 1021, 1022, 1023, - 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1034, 1037, - 1040, 1043, 1044, 1045, 1048, 1051, 1052, 1053, 1054, 1055, - 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1066, 1069, - 1070, 1073, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, - 1084, 1085, 1086, 1089, 1092, 1093, 1094, 1095, 1098, 1099, - 1100, 1101, 1102, 1105, 1108, 1109, 1110, 1111, 1114, 1117, - 1118, 1119, 1120, 1123, 1126, 1129, 1130, 1133, 1134, 1135, - 1136, 1139, 1142, 1143, 1146, 1149, 1150, 1151, 1152, 1153, - 1156, 1159, 1162, 1165, 1168, 1171, 1172, 1175, 1178, 1181, - 1182, 1183, 1184, 1185, 1186, 1187, 1188, 1189, 1190, 1193, - 1196, 1197, 1198, 1201, 1204, 1205, 1206, 1207, 1208, 1211, - 1214, 1215, 1218, 1221, 1222, 1223, 1224, 1225, 1228, 1229, - 1232, 1233, 1236, 1239, 1240, 1243, 1246, 1247, 1248, 1249, - 1252, 1255, 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, - 1264, 1265, 1266, 1267, 1268, 1269, 1270, 1271, 1274, 1278, - 1279, 1280, 1281, 1284, 1287, 1288, 1289, 1290, 1293, 1296, - 1297, 1298, 1299, 1302, 1305, 1306, 1309, 1312, 1315, 1316, - 1317, 1318, 1321, 1324, 1325, 1326, 1327, 1328, 1329, 1330, - 1331, 1332, 1335, 1338, 1339, 1342, 1345, 1348, 1349, 1352, - 1355, 1358, 1361, 1364, 1367, 1370, 1371, 1372, 1373, 1374, - 1377, 1380, 1383, 1384, 1387, 1390, 1391, 1392, 1395, 1398, - 1399, 1402, 1405, 1406, 1409, 1410, 1411, 1414, 1415, 1416, - 1419, 1422, 1423, 1424, 1425, 1428, 1431, 1432, 1433, 1434, - 1437, 1440, 1441, 1444, 1447, 1448, 1451, 1454, 1457, 1460, - 1461, 1462, 1465, 1468, 1469, 1470, 1471, 1474, 1477, 1478, - 1479, 1480, 1483, 1486, 1487, 1490, 1493, 1494, 1495, 1496, - 1497, 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, - 1507, 1510, 1513, 1514, 1515, 1516, 1517, 1520, 1523, 1524, - 1527, 1528, 1529, 1532, 1535, 1536, 1537, 1540, 1541, 1542, - 1545, 1548, 1549, 1552, 1555, 1556, 1557, 1558, 1561, 1564, - 1565, 1568, 1569, 1572, 1575, 1576, 1577, 1580, 1583, 1584, - 1587, 1590, 1591, 1592, 1593, 1594, 1597, 1600, 1601, 1604, - 1605, 1606, 1609, 1610, 1613, 1616, 1617, 1618, 1619, 1620, - 1621, 1622, 1623, 1624, 1625, 1628, 1631, 1632, 1633, 1634, - 1635, 1638, 1641, 1642, 1643, 1644, 1645, 1646, 1649, 1652, - 1653, 1654, 1657, 1660, 1661, 1662, 1665, 1668, 1669, 1670, - 1671, 1672, 1675, 1676, 1680, 1681, 1684, 1687, 1688, 1689, - 1690, 1693, 1696, 1699, 1700, 1701, 1704, 1707, 1708, 1709, - 1712, 1715, 1716, 1717, 1718, 1721, 1724, 1725, 1726, 1727, - 1730, 1733, 1734, 1737, 1740, 1741, 1742, 1743, 1746, 1749, - 1750, 1751, 1752, 1753, 1756, 1759, 1762, 1763, 1766, 1769, - 1770, 1771, 1772, 1773, 1774, 1775, 1776, 1779, 1782, 1786, - 1787, 1788, 1789, 1792, 1796, 1797, 1798, 1799, 1802, 1805, - 1806, 1809, 1812, 1815, 1816, 1817, 1818, 1819, 1820, 1821, - 1822, 1823, 1824, 1827, 1830, 1833, 1834, 1837, 1840, 1841, - 1844, 1847, 1850, 1851, 1854, 1857, 1858, 1861, 1864, 1867, - 1868, 1869, 1870, 1873, 1876, 1877, 1880, 1883, 1884, 1885, - 1886, 1889, 1892, 1893, 1896, 1899, 1900, 1903, 1906, 1909, - 1910, 1913, 1916, 1917, 1918, 1919, 1920, 1921, 1922, 1923, - 1924, 1925, 1926, 1927, 1928, 1931, 1934, 1935, 1936, 1937, - 1938, 1939, 1940, 1941, 1942, 1943, 1946, 1949, 1950, 1951, - 1952, 1955, 1958, 1959, 1960, 1961, 1964, 1967, 1968, 1969, - 1972, 1975, 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, - 1984, 1985, 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2009, 2010, 2011, - 2014, 2017, 2020, 2021, 2022, 2023, 2024, 2027, 2028, 2031, - 2032, 2035, 2050, 2051, 2052, 2053, 2056, 2059, 2060, 2063, - 2066, 2067, 2070, 2073, 2074, 2075, 2076, 2077, 2080, 2083, - 2086, 2089, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, - 2098, 2099, 2100, 2103, 2104, 2105, 2106, 2107, 2108, 2111, - 2114, 2115, 2116, 2119, 2122, 2123, 2126, 2129, 2130, 2131, - 2132, 2135, 2139, 2140, 2143, 2144, 2147, 2150, 2151, 2154, - 2157, 2160, 2161, 2164, 2167, 2170, 2173, 2174, 2175, 2176, - 2179, 2182, 2183, 2186, 2189, 2192, 2193, 2194, 2195, 2196, - 2197, 2200, 2203, 2204, 2205, 2206, 2209, 2212, 2213, 2216, - 2219, 2220, 2223, 2226, 2227, 2230, 2233, 2234, 2237, 2240, - 2241, 2242, 2243, 2246, 2249, 2250, 2251, 2254, 2255, 2256, - 2259, 2262, 2265, 2266, 2267, 2268, 2271, 2272, 2275, 2278, - 2281, 2282, 2283, 2284, 2285, 2286, 2287, 2288, 2289, 2290, - 2291, 2292, 2293, 2294, 2297, 2300, 2301, 2304, 2307, 2308, - 2309, 2312, 2315, 2316, 2317, 2318, 2321, 2322, 2323, 2326, - 2329, 2330, 2331, 2332, 2333, 2334, 2335, 2338, 2341, 2344, - 2345, 2348, 2349, 2350, 2353, 2357, 2360, 2361, 2362, 2363, - 2364, 2367, 2371, 2372, 2375, 2376, 2379, 2380, 2383, 2384, - 2387, 2388, 2391, 2394, 2395, 2396, 2399, 2402, 2403, 2404, - 2405, 2408, 2411, 2412, 2413, 2414, 2415, 2416, 2419, 2422, - 2425, 2428, 2429, 2430, 2431, 2434, 2437, 2438, 2439, 2440, - 2441, 2442, 2443, 2444, 2445, 2446, 2447, 2448, 2449, 2450, - 2451, 2452, 2455, 2458, 2461, 2462, 2463, 2464, 2465, 2468, - 2469, 2472, 2473, 2476, 2479, 2482, 2483, 2484, 2485, 2486, - 2487, 2490, 2493, 2494, 2495, 2498, 2501, 2502, 2503, 2504, - 2505, 2506, 2507, 2508, 2509, 2512, 2515, 2518, 2521, 2522, - 2525, 2528, 2529, 2530, 2531, 2532, 2533, 2534, 2535, 2536, - 2537, 2540, 2543, 2546, 2549, 2552, 2555, 2556, 2557, 2558, - 2561, 2564, 2565, 2566, 2567, 2568, 2569, 2570, 2573, 2576, - 2577, 2578, 2579, 2580, 2581, 2582, 2585, 2588, 2591, 2594 + 0, 508, 508, 511, 514, 515, 516, 517, 518, 519, + 520, 523, 526, 529, 533, 536, 537, 540, 543, 544, + 545, 546, 547, 548, 551, 554, 555, 558, 561, 562, + 563, 564, 565, 568, 571, 574, 575, 578, 581, 584, + 585, 586, 587, 588, 591, 594, 597, 600, 603, 606, + 609, 610, 611, 614, 617, 618, 621, 622, 625, 628, + 629, 630, 631, 634, 637, 638, 641, 644, 645, 648, + 651, 654, 657, 660, 661, 662, 663, 664, 665, 666, + 669, 672, 675, 676, 679, 682, 685, 686, 687, 690, + 693, 694, 695, 698, 699, 700, 703, 706, 707, 710, + 713, 716, 717, 720, 723, 724, 725, 726, 727, 728, + 729, 730, 733, 736, 739, 740, 741, 742, 743, 744, + 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, + 755, 756, 759, 762, 763, 766, 769, 770, 771, 774, + 777, 778, 781, 784, 787, 788, 789, 792, 795, 796, + 799, 802, 803, 806, 809, 810, 813, 816, 817, 820, + 823, 824, 827, 830, 831, 834, 837, 838, 841, 844, + 845, 848, 851, 852, 853, 856, 859, 860, 861, 862, + 863, 866, 869, 870, 873, 876, 879, 880, 881, 882, + 883, 884, 885, 886, 887, 888, 889, 890, 891, 892, + 893, 896, 899, 900, 901, 902, 905, 908, 909, 910, + 913, 916, 917, 920, 921, 924, 925, 928, 929, 932, + 935, 936, 939, 942, 943, 946, 949, 953, 954, 955, + 956, 959, 962, 963, 964, 967, 971, 972, 973, 976, + 977, 978, 979, 982, 983, 984, 987, 990, 991, 992, + 993, 994, 995, 996, 999, 1002, 1005, 1006, 1007, 1008, + 1009, 1012, 1015, 1018, 1021, 1022, 1023, 1024, 1025, 1026, + 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1037, 1040, + 1043, 1046, 1047, 1048, 1051, 1054, 1055, 1056, 1057, 1058, + 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1069, 1072, + 1073, 1076, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, + 1087, 1088, 1089, 1092, 1095, 1096, 1097, 1098, 1101, 1102, + 1103, 1104, 1105, 1108, 1111, 1112, 1113, 1114, 1117, 1120, + 1121, 1122, 1123, 1126, 1129, 1132, 1133, 1136, 1137, 1138, + 1139, 1142, 1145, 1146, 1149, 1152, 1153, 1154, 1155, 1156, + 1159, 1162, 1165, 1168, 1171, 1174, 1175, 1178, 1181, 1184, + 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, 1196, + 1199, 1200, 1201, 1204, 1207, 1208, 1209, 1210, 1211, 1214, + 1217, 1218, 1221, 1224, 1225, 1226, 1227, 1228, 1231, 1232, + 1235, 1236, 1239, 1242, 1243, 1246, 1249, 1250, 1251, 1252, + 1255, 1258, 1259, 1260, 1261, 1262, 1263, 1264, 1265, 1266, + 1267, 1268, 1269, 1270, 1271, 1272, 1273, 1274, 1277, 1281, + 1282, 1283, 1284, 1287, 1290, 1291, 1292, 1293, 1296, 1299, + 1300, 1301, 1302, 1305, 1308, 1309, 1312, 1315, 1318, 1319, + 1320, 1321, 1324, 1327, 1328, 1329, 1330, 1331, 1332, 1333, + 1334, 1335, 1338, 1341, 1342, 1345, 1348, 1351, 1352, 1355, + 1358, 1361, 1364, 1367, 1370, 1373, 1374, 1375, 1376, 1377, + 1380, 1383, 1386, 1387, 1390, 1393, 1394, 1395, 1398, 1401, + 1402, 1405, 1408, 1409, 1412, 1413, 1414, 1417, 1418, 1419, + 1422, 1425, 1426, 1427, 1428, 1431, 1434, 1435, 1436, 1437, + 1440, 1443, 1444, 1447, 1450, 1451, 1454, 1457, 1460, 1463, + 1464, 1465, 1468, 1471, 1472, 1473, 1474, 1477, 1480, 1481, + 1482, 1483, 1486, 1489, 1490, 1493, 1496, 1497, 1498, 1499, + 1500, 1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508, 1509, + 1510, 1513, 1516, 1517, 1518, 1519, 1520, 1523, 1526, 1527, + 1530, 1531, 1532, 1535, 1538, 1539, 1540, 1543, 1544, 1545, + 1548, 1551, 1552, 1555, 1558, 1559, 1560, 1561, 1564, 1567, + 1568, 1571, 1572, 1575, 1578, 1579, 1580, 1583, 1586, 1587, + 1590, 1593, 1594, 1595, 1596, 1597, 1600, 1603, 1604, 1607, + 1608, 1609, 1612, 1613, 1616, 1619, 1620, 1621, 1622, 1623, + 1624, 1625, 1626, 1627, 1628, 1631, 1634, 1635, 1636, 1637, + 1638, 1641, 1644, 1645, 1646, 1647, 1648, 1649, 1652, 1655, + 1656, 1657, 1660, 1663, 1664, 1665, 1668, 1671, 1672, 1673, + 1674, 1675, 1678, 1679, 1683, 1684, 1687, 1690, 1691, 1692, + 1693, 1696, 1699, 1702, 1703, 1704, 1707, 1710, 1711, 1712, + 1715, 1718, 1719, 1720, 1721, 1724, 1727, 1728, 1729, 1730, + 1733, 1736, 1737, 1740, 1743, 1744, 1745, 1746, 1749, 1752, + 1753, 1754, 1755, 1756, 1759, 1762, 1765, 1766, 1769, 1772, + 1773, 1774, 1775, 1776, 1777, 1778, 1779, 1782, 1785, 1789, + 1790, 1791, 1792, 1795, 1799, 1800, 1801, 1802, 1805, 1808, + 1809, 1812, 1815, 1818, 1819, 1820, 1821, 1822, 1823, 1824, + 1825, 1826, 1827, 1830, 1833, 1836, 1837, 1840, 1843, 1844, + 1847, 1850, 1853, 1854, 1857, 1860, 1861, 1864, 1867, 1870, + 1871, 1872, 1873, 1876, 1879, 1880, 1883, 1886, 1887, 1888, + 1889, 1892, 1895, 1896, 1899, 1902, 1903, 1906, 1909, 1912, + 1913, 1916, 1919, 1920, 1921, 1922, 1923, 1924, 1925, 1926, + 1927, 1928, 1929, 1930, 1931, 1934, 1937, 1938, 1939, 1940, + 1941, 1942, 1943, 1944, 1945, 1946, 1949, 1952, 1953, 1954, + 1955, 1958, 1961, 1962, 1963, 1964, 1967, 1970, 1971, 1972, + 1975, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, + 1987, 1988, 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2012, 2013, 2014, + 2017, 2020, 2023, 2024, 2025, 2026, 2027, 2030, 2031, 2034, + 2035, 2038, 2053, 2054, 2055, 2056, 2059, 2062, 2063, 2066, + 2069, 2070, 2073, 2076, 2077, 2078, 2079, 2080, 2083, 2086, + 2089, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099, 2100, + 2101, 2102, 2103, 2106, 2107, 2108, 2109, 2110, 2111, 2114, + 2117, 2118, 2119, 2122, 2125, 2126, 2129, 2132, 2133, 2134, + 2135, 2138, 2142, 2143, 2146, 2147, 2150, 2153, 2154, 2157, + 2160, 2163, 2164, 2167, 2170, 2173, 2176, 2177, 2178, 2179, + 2182, 2185, 2186, 2189, 2192, 2195, 2196, 2197, 2198, 2199, + 2200, 2203, 2206, 2207, 2208, 2209, 2212, 2215, 2216, 2219, + 2222, 2223, 2226, 2229, 2230, 2233, 2236, 2237, 2240, 2243, + 2244, 2245, 2246, 2249, 2252, 2253, 2254, 2257, 2258, 2259, + 2262, 2265, 2268, 2269, 2270, 2271, 2274, 2275, 2278, 2281, + 2284, 2285, 2286, 2287, 2288, 2289, 2290, 2291, 2292, 2293, + 2294, 2295, 2296, 2297, 2300, 2303, 2304, 2307, 2310, 2311, + 2312, 2315, 2318, 2319, 2320, 2321, 2324, 2325, 2326, 2329, + 2332, 2333, 2334, 2335, 2336, 2337, 2338, 2341, 2344, 2347, + 2348, 2351, 2352, 2353, 2356, 2360, 2363, 2364, 2365, 2366, + 2367, 2370, 2374, 2375, 2378, 2379, 2382, 2383, 2386, 2387, + 2390, 2391, 2394, 2397, 2398, 2399, 2402, 2405, 2406, 2407, + 2408, 2411, 2414, 2415, 2416, 2417, 2418, 2419, 2422, 2425, + 2428, 2431, 2432, 2433, 2434, 2437, 2440, 2441, 2442, 2443, + 2444, 2445, 2446, 2447, 2448, 2449, 2450, 2451, 2452, 2453, + 2454, 2455, 2458, 2461, 2464, 2465, 2466, 2467, 2468, 2471, + 2472, 2475, 2476, 2479, 2482, 2485, 2486, 2487, 2488, 2489, + 2490, 2493, 2496, 2497, 2498, 2501, 2504, 2505, 2506, 2507, + 2508, 2509, 2510, 2511, 2512, 2515, 2518, 2521, 2524, 2525, + 2528, 2531, 2532, 2533, 2534, 2535, 2536, 2537, 2538, 2539, + 2540, 2543, 2546, 2549, 2552, 2555, 2558, 2559, 2560, 2561, + 2564, 2567, 2568, 2569, 2570, 2571, 2572, 2573, 2576, 2579, + 2580, 2581, 2582, 2583, 2584, 2585, 2588, 2591, 2594, 2597 }; #endif @@ -3652,541 +3655,541 @@ switch (yyn) { case 2: -#line 505 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 508 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { PopC(); } -#line 3658 "y.tab.c" /* yacc.c:1646 */ +#line 3661 "y.tab.c" /* yacc.c:1646 */ break; case 11: -#line 520 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 523 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3664 "y.tab.c" /* yacc.c:1646 */ +#line 3667 "y.tab.c" /* yacc.c:1646 */ break; case 12: -#line 523 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 526 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3670 "y.tab.c" /* yacc.c:1646 */ +#line 3673 "y.tab.c" /* yacc.c:1646 */ break; case 13: -#line 527 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 530 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-3].s)); free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 3676 "y.tab.c" /* yacc.c:1646 */ +#line 3679 "y.tab.c" /* yacc.c:1646 */ break; case 25: -#line 551 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 554 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3682 "y.tab.c" /* yacc.c:1646 */ +#line 3685 "y.tab.c" /* yacc.c:1646 */ break; case 34: -#line 568 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 571 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[-3].ps)); free((yyvsp[-2].s)); } -#line 3688 "y.tab.c" /* yacc.c:1646 */ +#line 3691 "y.tab.c" /* yacc.c:1646 */ break; case 36: -#line 572 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 575 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3694 "y.tab.c" /* yacc.c:1646 */ +#line 3697 "y.tab.c" /* yacc.c:1646 */ break; case 47: -#line 597 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 600 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3700 "y.tab.c" /* yacc.c:1646 */ +#line 3703 "y.tab.c" /* yacc.c:1646 */ break; case 69: -#line 645 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 648 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-3].s)); free((yyvsp[-2].s)); } -#line 3706 "y.tab.c" /* yacc.c:1646 */ +#line 3709 "y.tab.c" /* yacc.c:1646 */ break; case 70: -#line 648 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 651 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3712 "y.tab.c" /* yacc.c:1646 */ +#line 3715 "y.tab.c" /* yacc.c:1646 */ break; case 80: -#line 666 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 669 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3718 "y.tab.c" /* yacc.c:1646 */ +#line 3721 "y.tab.c" /* yacc.c:1646 */ break; case 84: -#line 676 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 679 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3724 "y.tab.c" /* yacc.c:1646 */ +#line 3727 "y.tab.c" /* yacc.c:1646 */ break; case 91: -#line 691 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 694 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3730 "y.tab.c" /* yacc.c:1646 */ +#line 3733 "y.tab.c" /* yacc.c:1646 */ break; case 102: -#line 714 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 717 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3736 "y.tab.c" /* yacc.c:1646 */ +#line 3739 "y.tab.c" /* yacc.c:1646 */ break; case 140: -#line 774 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 777 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3742 "y.tab.c" /* yacc.c:1646 */ +#line 3745 "y.tab.c" /* yacc.c:1646 */ break; case 147: -#line 789 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 792 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); } -#line 3748 "y.tab.c" /* yacc.c:1646 */ +#line 3751 "y.tab.c" /* yacc.c:1646 */ break; case 150: -#line 796 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 799 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); } -#line 3754 "y.tab.c" /* yacc.c:1646 */ +#line 3757 "y.tab.c" /* yacc.c:1646 */ break; case 182: -#line 866 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 869 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3760 "y.tab.c" /* yacc.c:1646 */ +#line 3763 "y.tab.c" /* yacc.c:1646 */ break; case 184: -#line 870 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 873 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3766 "y.tab.c" /* yacc.c:1646 */ +#line 3769 "y.tab.c" /* yacc.c:1646 */ break; case 240: -#line 974 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 977 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3772 "y.tab.c" /* yacc.c:1646 */ +#line 3775 "y.tab.c" /* yacc.c:1646 */ break; case 247: -#line 987 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 990 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3778 "y.tab.c" /* yacc.c:1646 */ +#line 3781 "y.tab.c" /* yacc.c:1646 */ break; case 278: -#line 1034 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1037 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3784 "y.tab.c" /* yacc.c:1646 */ +#line 3787 "y.tab.c" /* yacc.c:1646 */ break; case 279: -#line 1037 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1040 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3790 "y.tab.c" /* yacc.c:1646 */ +#line 3793 "y.tab.c" /* yacc.c:1646 */ break; case 333: -#line 1123 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1126 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-3].s)); free((yyvsp[-2].s)); } -#line 3796 "y.tab.c" /* yacc.c:1646 */ +#line 3799 "y.tab.c" /* yacc.c:1646 */ break; case 336: -#line 1130 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1133 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3802 "y.tab.c" /* yacc.c:1646 */ +#line 3805 "y.tab.c" /* yacc.c:1646 */ break; case 337: -#line 1133 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1136 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3808 "y.tab.c" /* yacc.c:1646 */ +#line 3811 "y.tab.c" /* yacc.c:1646 */ break; case 344: -#line 1146 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1149 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); } -#line 3814 "y.tab.c" /* yacc.c:1646 */ +#line 3817 "y.tab.c" /* yacc.c:1646 */ break; case 346: -#line 1150 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1153 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3820 "y.tab.c" /* yacc.c:1646 */ +#line 3823 "y.tab.c" /* yacc.c:1646 */ break; case 347: -#line 1151 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1154 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3826 "y.tab.c" /* yacc.c:1646 */ +#line 3829 "y.tab.c" /* yacc.c:1646 */ break; case 348: -#line 1152 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1155 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3832 "y.tab.c" /* yacc.c:1646 */ +#line 3835 "y.tab.c" /* yacc.c:1646 */ break; case 369: -#line 1193 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1196 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[-2].s); } -#line 3838 "y.tab.c" /* yacc.c:1646 */ +#line 3841 "y.tab.c" /* yacc.c:1646 */ break; case 371: -#line 1197 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1200 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3844 "y.tab.c" /* yacc.c:1646 */ +#line 3847 "y.tab.c" /* yacc.c:1646 */ break; case 374: -#line 1204 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1207 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3850 "y.tab.c" /* yacc.c:1646 */ +#line 3853 "y.tab.c" /* yacc.c:1646 */ break; case 381: -#line 1215 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1218 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3856 "y.tab.c" /* yacc.c:1646 */ +#line 3859 "y.tab.c" /* yacc.c:1646 */ break; case 384: -#line 1222 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1225 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3862 "y.tab.c" /* yacc.c:1646 */ +#line 3865 "y.tab.c" /* yacc.c:1646 */ break; case 388: -#line 1228 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1231 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3868 "y.tab.c" /* yacc.c:1646 */ +#line 3871 "y.tab.c" /* yacc.c:1646 */ break; case 390: -#line 1232 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1235 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3874 "y.tab.c" /* yacc.c:1646 */ +#line 3877 "y.tab.c" /* yacc.c:1646 */ break; case 393: -#line 1239 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1242 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3880 "y.tab.c" /* yacc.c:1646 */ +#line 3883 "y.tab.c" /* yacc.c:1646 */ break; case 397: -#line 1247 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1250 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3886 "y.tab.c" /* yacc.c:1646 */ +#line 3889 "y.tab.c" /* yacc.c:1646 */ break; case 408: -#line 1262 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1265 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { pair_list_free((yyvsp[0].pl)); } -#line 3892 "y.tab.c" /* yacc.c:1646 */ +#line 3895 "y.tab.c" /* yacc.c:1646 */ break; case 437: -#line 1312 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1315 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.pl) = new_pair_list((yyvsp[-1].ps)); } -#line 3898 "y.tab.c" /* yacc.c:1646 */ +#line 3901 "y.tab.c" /* yacc.c:1646 */ break; case 438: -#line 1315 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1318 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=NULL; } -#line 3904 "y.tab.c" /* yacc.c:1646 */ +#line 3907 "y.tab.c" /* yacc.c:1646 */ break; case 439: -#line 1316 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1319 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyvsp[0].ps)->next = (yyvsp[-1].ps); (yyval.ps) = (yyvsp[0].ps); } -#line 3910 "y.tab.c" /* yacc.c:1646 */ +#line 3913 "y.tab.c" /* yacc.c:1646 */ break; case 455: -#line 1342 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1345 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3916 "y.tab.c" /* yacc.c:1646 */ +#line 3919 "y.tab.c" /* yacc.c:1646 */ break; case 459: -#line 1352 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1355 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3922 "y.tab.c" /* yacc.c:1646 */ +#line 3925 "y.tab.c" /* yacc.c:1646 */ break; case 460: -#line 1355 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1358 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3928 "y.tab.c" /* yacc.c:1646 */ +#line 3931 "y.tab.c" /* yacc.c:1646 */ break; case 462: -#line 1361 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1364 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3934 "y.tab.c" /* yacc.c:1646 */ +#line 3937 "y.tab.c" /* yacc.c:1646 */ break; case 463: -#line 1364 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1367 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3940 "y.tab.c" /* yacc.c:1646 */ +#line 3943 "y.tab.c" /* yacc.c:1646 */ break; case 483: -#line 1406 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1409 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3946 "y.tab.c" /* yacc.c:1646 */ +#line 3949 "y.tab.c" /* yacc.c:1646 */ break; case 484: -#line 1409 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1412 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3952 "y.tab.c" /* yacc.c:1646 */ +#line 3955 "y.tab.c" /* yacc.c:1646 */ break; case 492: -#line 1423 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1426 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3958 "y.tab.c" /* yacc.c:1646 */ +#line 3961 "y.tab.c" /* yacc.c:1646 */ break; case 506: -#line 1451 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1454 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3964 "y.tab.c" /* yacc.c:1646 */ +#line 3967 "y.tab.c" /* yacc.c:1646 */ break; case 507: -#line 1454 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1457 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3970 "y.tab.c" /* yacc.c:1646 */ +#line 3973 "y.tab.c" /* yacc.c:1646 */ break; case 514: -#line 1469 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1472 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3976 "y.tab.c" /* yacc.c:1646 */ +#line 3979 "y.tab.c" /* yacc.c:1646 */ break; case 549: -#line 1524 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1527 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3982 "y.tab.c" /* yacc.c:1646 */ +#line 3985 "y.tab.c" /* yacc.c:1646 */ break; case 555: -#line 1536 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1539 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3988 "y.tab.c" /* yacc.c:1646 */ +#line 3991 "y.tab.c" /* yacc.c:1646 */ break; case 560: -#line 1545 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1548 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); } -#line 3994 "y.tab.c" /* yacc.c:1646 */ +#line 3997 "y.tab.c" /* yacc.c:1646 */ break; case 561: -#line 1548 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1551 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4000 "y.tab.c" /* yacc.c:1646 */ +#line 4003 "y.tab.c" /* yacc.c:1646 */ break; case 562: -#line 1549 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1552 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4006 "y.tab.c" /* yacc.c:1646 */ +#line 4009 "y.tab.c" /* yacc.c:1646 */ break; case 582: -#line 1591 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1594 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4012 "y.tab.c" /* yacc.c:1646 */ +#line 4015 "y.tab.c" /* yacc.c:1646 */ break; case 585: -#line 1594 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1597 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { pair_list_free((yyvsp[0].pl)); } -#line 4018 "y.tab.c" /* yacc.c:1646 */ +#line 4021 "y.tab.c" /* yacc.c:1646 */ break; case 586: -#line 1597 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1600 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[-1].s); } -#line 4024 "y.tab.c" /* yacc.c:1646 */ +#line 4027 "y.tab.c" /* yacc.c:1646 */ break; case 587: -#line 1600 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1603 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4030 "y.tab.c" /* yacc.c:1646 */ +#line 4033 "y.tab.c" /* yacc.c:1646 */ break; case 589: -#line 1604 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1607 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); } -#line 4036 "y.tab.c" /* yacc.c:1646 */ +#line 4039 "y.tab.c" /* yacc.c:1646 */ break; case 590: -#line 1605 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1608 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); } -#line 4042 "y.tab.c" /* yacc.c:1646 */ +#line 4045 "y.tab.c" /* yacc.c:1646 */ break; case 591: -#line 1606 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1609 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=(yyvsp[0].ps); } -#line 4048 "y.tab.c" /* yacc.c:1646 */ +#line 4051 "y.tab.c" /* yacc.c:1646 */ break; case 592: -#line 1609 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1612 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4054 "y.tab.c" /* yacc.c:1646 */ +#line 4057 "y.tab.c" /* yacc.c:1646 */ break; case 593: -#line 1610 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1613 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4060 "y.tab.c" /* yacc.c:1646 */ +#line 4063 "y.tab.c" /* yacc.c:1646 */ break; case 594: -#line 1613 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1616 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { define_pcb_net((yyvsp[-2].ps), (yyvsp[-1].pl)); } -#line 4066 "y.tab.c" /* yacc.c:1646 */ +#line 4069 "y.tab.c" /* yacc.c:1646 */ break; case 595: -#line 1616 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1619 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.pl)=(yyvsp[0].pl); } -#line 4072 "y.tab.c" /* yacc.c:1646 */ +#line 4075 "y.tab.c" /* yacc.c:1646 */ break; case 611: -#line 1638 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1641 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[-2].ps)); } -#line 4078 "y.tab.c" /* yacc.c:1646 */ +#line 4081 "y.tab.c" /* yacc.c:1646 */ break; case 632: -#line 1675 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1678 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=(yyvsp[0].ps); } -#line 4084 "y.tab.c" /* yacc.c:1646 */ +#line 4087 "y.tab.c" /* yacc.c:1646 */ break; case 633: -#line 1676 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1679 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=NULL; } -#line 4090 "y.tab.c" /* yacc.c:1646 */ +#line 4093 "y.tab.c" /* yacc.c:1646 */ break; case 634: -#line 1680 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1683 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4096 "y.tab.c" /* yacc.c:1646 */ +#line 4099 "y.tab.c" /* yacc.c:1646 */ break; case 639: -#line 1689 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1692 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4102 "y.tab.c" /* yacc.c:1646 */ +#line 4105 "y.tab.c" /* yacc.c:1646 */ break; case 644: -#line 1700 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1703 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4108 "y.tab.c" /* yacc.c:1646 */ +#line 4111 "y.tab.c" /* yacc.c:1646 */ break; case 698: -#line 1802 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1805 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-3].s)); } -#line 4114 "y.tab.c" /* yacc.c:1646 */ +#line 4117 "y.tab.c" /* yacc.c:1646 */ break; case 701: -#line 1809 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1812 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 4120 "y.tab.c" /* yacc.c:1646 */ +#line 4123 "y.tab.c" /* yacc.c:1646 */ break; case 727: -#line 1861 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1864 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 4126 "y.tab.c" /* yacc.c:1646 */ +#line 4129 "y.tab.c" /* yacc.c:1646 */ break; case 730: -#line 1868 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1871 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4132 "y.tab.c" /* yacc.c:1646 */ +#line 4135 "y.tab.c" /* yacc.c:1646 */ break; case 747: -#line 1903 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1906 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 4138 "y.tab.c" /* yacc.c:1646 */ +#line 4141 "y.tab.c" /* yacc.c:1646 */ break; case 766: -#line 1934 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1937 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4144 "y.tab.c" /* yacc.c:1646 */ +#line 4147 "y.tab.c" /* yacc.c:1646 */ break; case 789: -#line 1969 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1972 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4150 "y.tab.c" /* yacc.c:1646 */ +#line 4153 "y.tab.c" /* yacc.c:1646 */ break; case 791: -#line 1975 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1978 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4156 "y.tab.c" /* yacc.c:1646 */ +#line 4159 "y.tab.c" /* yacc.c:1646 */ break; case 803: -#line 1991 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 1994 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4162 "y.tab.c" /* yacc.c:1646 */ +#line 4165 "y.tab.c" /* yacc.c:1646 */ break; case 818: -#line 2010 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2013 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4168 "y.tab.c" /* yacc.c:1646 */ +#line 4171 "y.tab.c" /* yacc.c:1646 */ break; case 823: -#line 2021 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2024 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4174 "y.tab.c" /* yacc.c:1646 */ +#line 4177 "y.tab.c" /* yacc.c:1646 */ break; case 827: -#line 2027 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2030 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4180 "y.tab.c" /* yacc.c:1646 */ +#line 4183 "y.tab.c" /* yacc.c:1646 */ break; case 829: -#line 2031 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2034 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4186 "y.tab.c" /* yacc.c:1646 */ +#line 4189 "y.tab.c" /* yacc.c:1646 */ break; case 831: -#line 2036 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2039 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { if ((yyvsp[-1].ps)) { @@ -4199,251 +4202,251 @@ (yyval.ps) = new_str_pair(NULL,(yyvsp[-2].s)); } } -#line 4203 "y.tab.c" /* yacc.c:1646 */ +#line 4206 "y.tab.c" /* yacc.c:1646 */ break; case 832: -#line 2050 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2053 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=NULL; } -#line 4209 "y.tab.c" /* yacc.c:1646 */ +#line 4212 "y.tab.c" /* yacc.c:1646 */ break; case 833: -#line 2051 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2054 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=(yyvsp[0].ps); } -#line 4215 "y.tab.c" /* yacc.c:1646 */ +#line 4218 "y.tab.c" /* yacc.c:1646 */ break; case 834: -#line 2052 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2055 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); } -#line 4221 "y.tab.c" /* yacc.c:1646 */ +#line 4224 "y.tab.c" /* yacc.c:1646 */ break; case 835: -#line 2053 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2056 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=NULL; } -#line 4227 "y.tab.c" /* yacc.c:1646 */ +#line 4230 "y.tab.c" /* yacc.c:1646 */ break; case 848: -#line 2080 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2083 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4233 "y.tab.c" /* yacc.c:1646 */ +#line 4236 "y.tab.c" /* yacc.c:1646 */ break; case 849: -#line 2083 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2086 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4239 "y.tab.c" /* yacc.c:1646 */ +#line 4242 "y.tab.c" /* yacc.c:1646 */ break; case 881: -#line 2136 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2139 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.ps) = new_str_pair((yyvsp[-2].s),(yyvsp[-1].s)); } -#line 4245 "y.tab.c" /* yacc.c:1646 */ +#line 4248 "y.tab.c" /* yacc.c:1646 */ break; case 882: -#line 2139 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2142 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4251 "y.tab.c" /* yacc.c:1646 */ +#line 4254 "y.tab.c" /* yacc.c:1646 */ break; case 883: -#line 2140 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2143 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4257 "y.tab.c" /* yacc.c:1646 */ +#line 4260 "y.tab.c" /* yacc.c:1646 */ break; case 884: -#line 2143 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2146 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4263 "y.tab.c" /* yacc.c:1646 */ +#line 4266 "y.tab.c" /* yacc.c:1646 */ break; case 885: -#line 2144 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2147 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=NULL; } -#line 4269 "y.tab.c" /* yacc.c:1646 */ +#line 4272 "y.tab.c" /* yacc.c:1646 */ break; case 889: -#line 2154 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2157 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4275 "y.tab.c" /* yacc.c:1646 */ +#line 4278 "y.tab.c" /* yacc.c:1646 */ break; case 891: -#line 2160 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2163 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4281 "y.tab.c" /* yacc.c:1646 */ +#line 4284 "y.tab.c" /* yacc.c:1646 */ break; case 892: -#line 2161 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2164 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 4287 "y.tab.c" /* yacc.c:1646 */ +#line 4290 "y.tab.c" /* yacc.c:1646 */ break; case 893: -#line 2164 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2167 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 4293 "y.tab.c" /* yacc.c:1646 */ +#line 4296 "y.tab.c" /* yacc.c:1646 */ break; case 894: -#line 2167 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2170 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 4299 "y.tab.c" /* yacc.c:1646 */ +#line 4302 "y.tab.c" /* yacc.c:1646 */ break; case 896: -#line 2173 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2176 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4305 "y.tab.c" /* yacc.c:1646 */ +#line 4308 "y.tab.c" /* yacc.c:1646 */ break; case 898: -#line 2175 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2178 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4311 "y.tab.c" /* yacc.c:1646 */ +#line 4314 "y.tab.c" /* yacc.c:1646 */ break; case 903: -#line 2186 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2189 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4317 "y.tab.c" /* yacc.c:1646 */ +#line 4320 "y.tab.c" /* yacc.c:1646 */ break; case 935: -#line 2250 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2253 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4323 "y.tab.c" /* yacc.c:1646 */ +#line 4326 "y.tab.c" /* yacc.c:1646 */ break; case 943: -#line 2266 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2269 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4329 "y.tab.c" /* yacc.c:1646 */ +#line 4332 "y.tab.c" /* yacc.c:1646 */ break; case 946: -#line 2271 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2274 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4335 "y.tab.c" /* yacc.c:1646 */ +#line 4338 "y.tab.c" /* yacc.c:1646 */ break; case 973: -#line 2316 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2319 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4341 "y.tab.c" /* yacc.c:1646 */ +#line 4344 "y.tab.c" /* yacc.c:1646 */ break; case 987: -#line 2338 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2341 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 4347 "y.tab.c" /* yacc.c:1646 */ +#line 4350 "y.tab.c" /* yacc.c:1646 */ break; case 994: -#line 2354 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2357 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-6].s)); free((yyvsp[-5].s)); free((yyvsp[-4].s)); free((yyvsp[-3].s)); free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 4353 "y.tab.c" /* yacc.c:1646 */ +#line 4356 "y.tab.c" /* yacc.c:1646 */ break; case 1054: -#line 2461 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2464 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4359 "y.tab.c" /* yacc.c:1646 */ +#line 4362 "y.tab.c" /* yacc.c:1646 */ break; case 1055: -#line 2462 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2465 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4365 "y.tab.c" /* yacc.c:1646 */ +#line 4368 "y.tab.c" /* yacc.c:1646 */ break; case 1056: -#line 2463 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2466 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4371 "y.tab.c" /* yacc.c:1646 */ +#line 4374 "y.tab.c" /* yacc.c:1646 */ break; case 1057: -#line 2464 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2467 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4377 "y.tab.c" /* yacc.c:1646 */ +#line 4380 "y.tab.c" /* yacc.c:1646 */ break; case 1059: -#line 2468 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2471 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4383 "y.tab.c" /* yacc.c:1646 */ +#line 4386 "y.tab.c" /* yacc.c:1646 */ break; case 1061: -#line 2472 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2475 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4389 "y.tab.c" /* yacc.c:1646 */ +#line 4392 "y.tab.c" /* yacc.c:1646 */ break; case 1063: -#line 2476 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2479 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 4395 "y.tab.c" /* yacc.c:1646 */ +#line 4398 "y.tab.c" /* yacc.c:1646 */ break; case 1085: -#line 2512 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2515 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4401 "y.tab.c" /* yacc.c:1646 */ +#line 4404 "y.tab.c" /* yacc.c:1646 */ break; case 1086: -#line 2515 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2518 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4407 "y.tab.c" /* yacc.c:1646 */ +#line 4410 "y.tab.c" /* yacc.c:1646 */ break; case 1107: -#line 2556 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2559 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4413 "y.tab.c" /* yacc.c:1646 */ +#line 4416 "y.tab.c" /* yacc.c:1646 */ break; case 1109: -#line 2558 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2561 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { pair_list_free((yyvsp[0].pl)); } -#line 4419 "y.tab.c" /* yacc.c:1646 */ +#line 4422 "y.tab.c" /* yacc.c:1646 */ break; case 1126: -#line 2585 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2588 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4425 "y.tab.c" /* yacc.c:1646 */ +#line 4428 "y.tab.c" /* yacc.c:1646 */ break; case 1127: -#line 2588 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2591 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4431 "y.tab.c" /* yacc.c:1646 */ +#line 4434 "y.tab.c" /* yacc.c:1646 */ break; case 1128: -#line 2591 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2594 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4437 "y.tab.c" /* yacc.c:1646 */ +#line 4440 "y.tab.c" /* yacc.c:1646 */ break; case 1129: -#line 2594 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ +#line 2597 "../src_plugins/edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4443 "y.tab.c" /* yacc.c:1646 */ +#line 4446 "y.tab.c" /* yacc.c:1646 */ break; -#line 4447 "y.tab.c" /* yacc.c:1646 */ +#line 4450 "y.tab.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4671,7 +4674,7 @@ #endif return yyresult; } -#line 2597 "../src_plugins/edif/edif.y" /* yacc.c:1906 */ +#line 2600 "../src_plugins/edif/edif.y" /* yacc.c:1906 */ /* * xmalloc: Index: trunk/src_plugins/edif/edif.y =================================================================== --- trunk/src_plugins/edif/edif.y (revision 1218) +++ trunk/src_plugins/edif/edif.y (revision 1219) @@ -28,10 +28,13 @@ #include "global.h" #include "data.h" +#include "error.h" + /* from mymem.h, not include because of the malloc junk */ -LibraryMenuTypePtr GetLibraryMenuMemory (LibraryTypePtr); -LibraryEntryTypePtr GetLibraryEntryMemory (LibraryMenuTypePtr); +LibraryMenuTypePtr GetLibraryMenuMemory(LibraryTypePtr, int *idx); +LibraryEntryTypePtr GetLibraryEntryMemory(LibraryMenuTypePtr); + /* * Local definitions. */ @@ -99,7 +102,7 @@ char* buf; char* p; LibraryEntryTypePtr entry; - LibraryMenuTypePtr menu = GetLibraryMenuMemory (&PCB->NetlistLib); + LibraryMenuTypePtr menu = GetLibraryMenuMemory (PCB->NetlistLib, NULL); if ( !name->str1 ) { @@ -188,7 +191,7 @@ static void PopC(void); %} -%name-prefix="edif" +%name-prefix "edif" %union { char* s; Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c (revision 1218) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_plugin.c (revision 1219) @@ -155,7 +155,7 @@ fprintf(stderr, "gpmi dirs: lg=%s lh=%s wh=%s w=%s hh=%s\n", libdirg, libdirh, wdirh, wdir, hdirh); /* first add package search path to all host-specific plugin dirs - This is needed because a script installed in ~/.pcb/plugins/*.conf + This is needed because a script installed in ~/.pcb/plugins/ *.conf (added automatically from, the gui) could depend on a package being anywhere else */ Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 1218) +++ trunk/src_plugins/renumber/renumber.c (revision 1219) @@ -31,6 +31,8 @@ #include "change.h" #include "error.h" #include "undo.h" +#include "misc.h" +#include "set.h" #include "pcb-printf.h" @@ -298,7 +300,7 @@ if (changed) { /* update the netlist */ - AddNetlistLibToUndoList(&(PCB->NetlistLib)); + AddNetlistLibToUndoList(PCB->NetlistLib); /* iterate over each net */ for (i = 0; i < PCB->NetlistLib[WTF].MenuN; i++) {