Index: edif.c =================================================================== --- edif.c (revision 2527) +++ edif.c (revision 2528) @@ -103,6 +103,7 @@ #include "data.h" #include "error.h" #include "plugins.h" +#include "compat_misc.h" /* from mymem.h, not include because of the malloc junk */ LibraryMenuTypePtr GetLibraryMenuMemory(LibraryTypePtr, int *idx); @@ -187,7 +188,7 @@ pair_list_free(nodes); return; } - menu->Name = strdup (name->str1); + menu->Name = pcb_strdup (name->str1); free(name->str1); /* if renamed str2 also exists and must be freed */ if ( name->str2 ) free(name->str2); @@ -251,7 +252,7 @@ free(node->str1); free(node->str2); entry = GetLibraryEntryMemory (menu); - entry->ListEntry = strdup(buf); + entry->ListEntry = pcb_strdup(buf); done_node = node; node = node->next; free(done_node); @@ -264,7 +265,7 @@ static void yyerror(const char *); static void PopC(void); -#line 268 "edif.tab.c" /* yacc.c:339 */ +#line 269 "edif.tab.c" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -599,13 +600,13 @@ typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 197 "../../src_plugins/import_edif/edif.y" /* yacc.c:355 */ +#line 198 "../../src_plugins/import_edif/edif.y" /* yacc.c:355 */ char* s; pair_list* pl; str_pair* ps; -#line 609 "edif.tab.c" /* yacc.c:355 */ +#line 610 "edif.tab.c" /* yacc.c:355 */ }; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 @@ -620,7 +621,7 @@ /* Copy the second part of user declarations. */ -#line 624 "edif.tab.c" /* yacc.c:358 */ +#line 625 "edif.tab.c" /* yacc.c:358 */ #ifdef short # undef short @@ -946,119 +947,119 @@ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 509, 509, 512, 515, 516, 517, 518, 519, 520, - 521, 524, 527, 530, 534, 537, 538, 541, 544, 545, - 546, 547, 548, 549, 552, 555, 556, 559, 562, 563, - 564, 565, 566, 569, 572, 575, 576, 579, 582, 585, - 586, 587, 588, 589, 592, 595, 598, 601, 604, 607, - 610, 611, 612, 615, 618, 619, 622, 623, 626, 629, - 630, 631, 632, 635, 638, 639, 642, 645, 646, 649, - 652, 655, 658, 661, 662, 663, 664, 665, 666, 667, - 670, 673, 676, 677, 680, 683, 686, 687, 688, 691, - 694, 695, 696, 699, 700, 701, 704, 707, 708, 711, - 714, 717, 718, 721, 724, 725, 726, 727, 728, 729, - 730, 731, 734, 737, 740, 741, 742, 743, 744, 745, - 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, - 756, 757, 760, 763, 764, 767, 770, 771, 772, 775, - 778, 779, 782, 785, 788, 789, 790, 793, 796, 797, - 800, 803, 804, 807, 810, 811, 814, 817, 818, 821, - 824, 825, 828, 831, 832, 835, 838, 839, 842, 845, - 846, 849, 852, 853, 854, 857, 860, 861, 862, 863, - 864, 867, 870, 871, 874, 877, 880, 881, 882, 883, - 884, 885, 886, 887, 888, 889, 890, 891, 892, 893, - 894, 897, 900, 901, 902, 903, 906, 909, 910, 911, - 914, 917, 918, 921, 922, 925, 926, 929, 930, 933, - 936, 937, 940, 943, 944, 947, 950, 954, 955, 956, - 957, 960, 963, 964, 965, 968, 972, 973, 974, 977, - 978, 979, 980, 983, 984, 985, 988, 991, 992, 993, - 994, 995, 996, 997, 1000, 1003, 1006, 1007, 1008, 1009, - 1010, 1013, 1016, 1019, 1022, 1023, 1024, 1025, 1026, 1027, - 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1038, 1041, - 1044, 1047, 1048, 1049, 1052, 1055, 1056, 1057, 1058, 1059, - 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1070, 1073, - 1074, 1077, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087, - 1088, 1089, 1090, 1093, 1096, 1097, 1098, 1099, 1102, 1103, - 1104, 1105, 1106, 1109, 1112, 1113, 1114, 1115, 1118, 1121, - 1122, 1123, 1124, 1127, 1130, 1133, 1134, 1137, 1138, 1139, - 1140, 1143, 1146, 1147, 1150, 1153, 1154, 1155, 1156, 1157, - 1160, 1163, 1166, 1169, 1172, 1175, 1176, 1179, 1182, 1185, - 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, 1194, 1197, - 1200, 1201, 1202, 1205, 1208, 1209, 1210, 1211, 1212, 1215, - 1218, 1219, 1222, 1225, 1226, 1227, 1228, 1229, 1232, 1233, - 1236, 1237, 1240, 1243, 1244, 1247, 1250, 1251, 1252, 1253, - 1256, 1259, 1260, 1261, 1262, 1263, 1264, 1265, 1266, 1267, - 1268, 1269, 1270, 1271, 1272, 1273, 1274, 1275, 1278, 1282, - 1283, 1284, 1285, 1288, 1291, 1292, 1293, 1294, 1297, 1300, - 1301, 1302, 1303, 1306, 1309, 1310, 1313, 1316, 1319, 1320, - 1321, 1322, 1325, 1328, 1329, 1330, 1331, 1332, 1333, 1334, - 1335, 1336, 1339, 1342, 1343, 1346, 1349, 1352, 1353, 1356, - 1359, 1362, 1365, 1368, 1371, 1374, 1375, 1376, 1377, 1378, - 1381, 1384, 1387, 1388, 1391, 1394, 1395, 1396, 1399, 1402, - 1403, 1406, 1409, 1410, 1413, 1414, 1415, 1418, 1419, 1420, - 1423, 1426, 1427, 1428, 1429, 1432, 1435, 1436, 1437, 1438, - 1441, 1444, 1445, 1448, 1451, 1452, 1455, 1458, 1461, 1464, - 1465, 1466, 1469, 1472, 1473, 1474, 1475, 1478, 1481, 1482, - 1483, 1484, 1487, 1490, 1491, 1494, 1497, 1498, 1499, 1500, - 1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508, 1509, 1510, - 1511, 1514, 1517, 1518, 1519, 1520, 1521, 1524, 1527, 1528, - 1531, 1532, 1533, 1536, 1539, 1540, 1541, 1544, 1545, 1546, - 1549, 1552, 1553, 1556, 1559, 1560, 1561, 1562, 1565, 1568, - 1569, 1572, 1573, 1576, 1579, 1580, 1581, 1584, 1587, 1588, - 1591, 1594, 1595, 1596, 1597, 1598, 1601, 1604, 1605, 1608, - 1609, 1610, 1613, 1614, 1617, 1620, 1621, 1622, 1623, 1624, - 1625, 1626, 1627, 1628, 1629, 1632, 1635, 1636, 1637, 1638, - 1639, 1642, 1645, 1646, 1647, 1648, 1649, 1650, 1653, 1656, - 1657, 1658, 1661, 1664, 1665, 1666, 1669, 1672, 1673, 1674, - 1675, 1676, 1679, 1680, 1684, 1685, 1688, 1691, 1692, 1693, - 1694, 1697, 1700, 1703, 1704, 1705, 1708, 1711, 1712, 1713, - 1716, 1719, 1720, 1721, 1722, 1725, 1728, 1729, 1730, 1731, - 1734, 1737, 1738, 1741, 1744, 1745, 1746, 1747, 1750, 1753, - 1754, 1755, 1756, 1757, 1760, 1763, 1766, 1767, 1770, 1773, - 1774, 1775, 1776, 1777, 1778, 1779, 1780, 1783, 1786, 1790, - 1791, 1792, 1793, 1796, 1800, 1801, 1802, 1803, 1806, 1809, - 1810, 1813, 1816, 1819, 1820, 1821, 1822, 1823, 1824, 1825, - 1826, 1827, 1828, 1831, 1834, 1837, 1838, 1841, 1844, 1845, - 1848, 1851, 1854, 1855, 1858, 1861, 1862, 1865, 1868, 1871, - 1872, 1873, 1874, 1877, 1880, 1881, 1884, 1887, 1888, 1889, - 1890, 1893, 1896, 1897, 1900, 1903, 1904, 1907, 1910, 1913, - 1914, 1917, 1920, 1921, 1922, 1923, 1924, 1925, 1926, 1927, - 1928, 1929, 1930, 1931, 1932, 1935, 1938, 1939, 1940, 1941, - 1942, 1943, 1944, 1945, 1946, 1947, 1950, 1953, 1954, 1955, - 1956, 1959, 1962, 1963, 1964, 1965, 1968, 1971, 1972, 1973, - 1976, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, 1987, - 1988, 1989, 1992, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2010, 2013, 2014, 2015, - 2018, 2021, 2024, 2025, 2026, 2027, 2028, 2031, 2032, 2035, - 2036, 2039, 2054, 2055, 2056, 2057, 2060, 2063, 2064, 2067, - 2070, 2071, 2074, 2077, 2078, 2079, 2080, 2081, 2084, 2087, - 2090, 2093, 2094, 2095, 2096, 2097, 2098, 2099, 2100, 2101, - 2102, 2103, 2104, 2107, 2108, 2109, 2110, 2111, 2112, 2115, - 2118, 2119, 2120, 2123, 2126, 2127, 2130, 2133, 2134, 2135, - 2136, 2139, 2143, 2144, 2147, 2148, 2151, 2154, 2155, 2158, - 2161, 2164, 2165, 2168, 2171, 2174, 2177, 2178, 2179, 2180, - 2183, 2186, 2187, 2190, 2193, 2196, 2197, 2198, 2199, 2200, - 2201, 2204, 2207, 2208, 2209, 2210, 2213, 2216, 2217, 2220, - 2223, 2224, 2227, 2230, 2231, 2234, 2237, 2238, 2241, 2244, - 2245, 2246, 2247, 2250, 2253, 2254, 2255, 2258, 2259, 2260, - 2263, 2266, 2269, 2270, 2271, 2272, 2275, 2276, 2279, 2282, - 2285, 2286, 2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, - 2295, 2296, 2297, 2298, 2301, 2304, 2305, 2308, 2311, 2312, - 2313, 2316, 2319, 2320, 2321, 2322, 2325, 2326, 2327, 2330, - 2333, 2334, 2335, 2336, 2337, 2338, 2339, 2342, 2345, 2348, - 2349, 2352, 2353, 2354, 2357, 2361, 2364, 2365, 2366, 2367, - 2368, 2371, 2375, 2376, 2379, 2380, 2383, 2384, 2387, 2388, - 2391, 2392, 2395, 2398, 2399, 2400, 2403, 2406, 2407, 2408, - 2409, 2412, 2415, 2416, 2417, 2418, 2419, 2420, 2423, 2426, - 2429, 2432, 2433, 2434, 2435, 2438, 2441, 2442, 2443, 2444, - 2445, 2446, 2447, 2448, 2449, 2450, 2451, 2452, 2453, 2454, - 2455, 2456, 2459, 2462, 2465, 2466, 2467, 2468, 2469, 2472, - 2473, 2476, 2477, 2480, 2483, 2486, 2487, 2488, 2489, 2490, - 2491, 2494, 2497, 2498, 2499, 2502, 2505, 2506, 2507, 2508, - 2509, 2510, 2511, 2512, 2513, 2516, 2519, 2522, 2525, 2526, - 2529, 2532, 2533, 2534, 2535, 2536, 2537, 2538, 2539, 2540, - 2541, 2544, 2547, 2550, 2553, 2556, 2559, 2560, 2561, 2562, - 2565, 2568, 2569, 2570, 2571, 2572, 2573, 2574, 2577, 2580, - 2581, 2582, 2583, 2584, 2585, 2586, 2589, 2592, 2595, 2598 + 0, 510, 510, 513, 516, 517, 518, 519, 520, 521, + 522, 525, 528, 531, 535, 538, 539, 542, 545, 546, + 547, 548, 549, 550, 553, 556, 557, 560, 563, 564, + 565, 566, 567, 570, 573, 576, 577, 580, 583, 586, + 587, 588, 589, 590, 593, 596, 599, 602, 605, 608, + 611, 612, 613, 616, 619, 620, 623, 624, 627, 630, + 631, 632, 633, 636, 639, 640, 643, 646, 647, 650, + 653, 656, 659, 662, 663, 664, 665, 666, 667, 668, + 671, 674, 677, 678, 681, 684, 687, 688, 689, 692, + 695, 696, 697, 700, 701, 702, 705, 708, 709, 712, + 715, 718, 719, 722, 725, 726, 727, 728, 729, 730, + 731, 732, 735, 738, 741, 742, 743, 744, 745, 746, + 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, + 757, 758, 761, 764, 765, 768, 771, 772, 773, 776, + 779, 780, 783, 786, 789, 790, 791, 794, 797, 798, + 801, 804, 805, 808, 811, 812, 815, 818, 819, 822, + 825, 826, 829, 832, 833, 836, 839, 840, 843, 846, + 847, 850, 853, 854, 855, 858, 861, 862, 863, 864, + 865, 868, 871, 872, 875, 878, 881, 882, 883, 884, + 885, 886, 887, 888, 889, 890, 891, 892, 893, 894, + 895, 898, 901, 902, 903, 904, 907, 910, 911, 912, + 915, 918, 919, 922, 923, 926, 927, 930, 931, 934, + 937, 938, 941, 944, 945, 948, 951, 955, 956, 957, + 958, 961, 964, 965, 966, 969, 973, 974, 975, 978, + 979, 980, 981, 984, 985, 986, 989, 992, 993, 994, + 995, 996, 997, 998, 1001, 1004, 1007, 1008, 1009, 1010, + 1011, 1014, 1017, 1020, 1023, 1024, 1025, 1026, 1027, 1028, + 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1039, 1042, + 1045, 1048, 1049, 1050, 1053, 1056, 1057, 1058, 1059, 1060, + 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1071, 1074, + 1075, 1078, 1081, 1082, 1083, 1084, 1085, 1086, 1087, 1088, + 1089, 1090, 1091, 1094, 1097, 1098, 1099, 1100, 1103, 1104, + 1105, 1106, 1107, 1110, 1113, 1114, 1115, 1116, 1119, 1122, + 1123, 1124, 1125, 1128, 1131, 1134, 1135, 1138, 1139, 1140, + 1141, 1144, 1147, 1148, 1151, 1154, 1155, 1156, 1157, 1158, + 1161, 1164, 1167, 1170, 1173, 1176, 1177, 1180, 1183, 1186, + 1187, 1188, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 1198, + 1201, 1202, 1203, 1206, 1209, 1210, 1211, 1212, 1213, 1216, + 1219, 1220, 1223, 1226, 1227, 1228, 1229, 1230, 1233, 1234, + 1237, 1238, 1241, 1244, 1245, 1248, 1251, 1252, 1253, 1254, + 1257, 1260, 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1268, + 1269, 1270, 1271, 1272, 1273, 1274, 1275, 1276, 1279, 1283, + 1284, 1285, 1286, 1289, 1292, 1293, 1294, 1295, 1298, 1301, + 1302, 1303, 1304, 1307, 1310, 1311, 1314, 1317, 1320, 1321, + 1322, 1323, 1326, 1329, 1330, 1331, 1332, 1333, 1334, 1335, + 1336, 1337, 1340, 1343, 1344, 1347, 1350, 1353, 1354, 1357, + 1360, 1363, 1366, 1369, 1372, 1375, 1376, 1377, 1378, 1379, + 1382, 1385, 1388, 1389, 1392, 1395, 1396, 1397, 1400, 1403, + 1404, 1407, 1410, 1411, 1414, 1415, 1416, 1419, 1420, 1421, + 1424, 1427, 1428, 1429, 1430, 1433, 1436, 1437, 1438, 1439, + 1442, 1445, 1446, 1449, 1452, 1453, 1456, 1459, 1462, 1465, + 1466, 1467, 1470, 1473, 1474, 1475, 1476, 1479, 1482, 1483, + 1484, 1485, 1488, 1491, 1492, 1495, 1498, 1499, 1500, 1501, + 1502, 1503, 1504, 1505, 1506, 1507, 1508, 1509, 1510, 1511, + 1512, 1515, 1518, 1519, 1520, 1521, 1522, 1525, 1528, 1529, + 1532, 1533, 1534, 1537, 1540, 1541, 1542, 1545, 1546, 1547, + 1550, 1553, 1554, 1557, 1560, 1561, 1562, 1563, 1566, 1569, + 1570, 1573, 1574, 1577, 1580, 1581, 1582, 1585, 1588, 1589, + 1592, 1595, 1596, 1597, 1598, 1599, 1602, 1605, 1606, 1609, + 1610, 1611, 1614, 1615, 1618, 1621, 1622, 1623, 1624, 1625, + 1626, 1627, 1628, 1629, 1630, 1633, 1636, 1637, 1638, 1639, + 1640, 1643, 1646, 1647, 1648, 1649, 1650, 1651, 1654, 1657, + 1658, 1659, 1662, 1665, 1666, 1667, 1670, 1673, 1674, 1675, + 1676, 1677, 1680, 1681, 1685, 1686, 1689, 1692, 1693, 1694, + 1695, 1698, 1701, 1704, 1705, 1706, 1709, 1712, 1713, 1714, + 1717, 1720, 1721, 1722, 1723, 1726, 1729, 1730, 1731, 1732, + 1735, 1738, 1739, 1742, 1745, 1746, 1747, 1748, 1751, 1754, + 1755, 1756, 1757, 1758, 1761, 1764, 1767, 1768, 1771, 1774, + 1775, 1776, 1777, 1778, 1779, 1780, 1781, 1784, 1787, 1791, + 1792, 1793, 1794, 1797, 1801, 1802, 1803, 1804, 1807, 1810, + 1811, 1814, 1817, 1820, 1821, 1822, 1823, 1824, 1825, 1826, + 1827, 1828, 1829, 1832, 1835, 1838, 1839, 1842, 1845, 1846, + 1849, 1852, 1855, 1856, 1859, 1862, 1863, 1866, 1869, 1872, + 1873, 1874, 1875, 1878, 1881, 1882, 1885, 1888, 1889, 1890, + 1891, 1894, 1897, 1898, 1901, 1904, 1905, 1908, 1911, 1914, + 1915, 1918, 1921, 1922, 1923, 1924, 1925, 1926, 1927, 1928, + 1929, 1930, 1931, 1932, 1933, 1936, 1939, 1940, 1941, 1942, + 1943, 1944, 1945, 1946, 1947, 1948, 1951, 1954, 1955, 1956, + 1957, 1960, 1963, 1964, 1965, 1966, 1969, 1972, 1973, 1974, + 1977, 1980, 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1988, + 1989, 1990, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + 2003, 2004, 2005, 2006, 2007, 2008, 2011, 2014, 2015, 2016, + 2019, 2022, 2025, 2026, 2027, 2028, 2029, 2032, 2033, 2036, + 2037, 2040, 2055, 2056, 2057, 2058, 2061, 2064, 2065, 2068, + 2071, 2072, 2075, 2078, 2079, 2080, 2081, 2082, 2085, 2088, + 2091, 2094, 2095, 2096, 2097, 2098, 2099, 2100, 2101, 2102, + 2103, 2104, 2105, 2108, 2109, 2110, 2111, 2112, 2113, 2116, + 2119, 2120, 2121, 2124, 2127, 2128, 2131, 2134, 2135, 2136, + 2137, 2140, 2144, 2145, 2148, 2149, 2152, 2155, 2156, 2159, + 2162, 2165, 2166, 2169, 2172, 2175, 2178, 2179, 2180, 2181, + 2184, 2187, 2188, 2191, 2194, 2197, 2198, 2199, 2200, 2201, + 2202, 2205, 2208, 2209, 2210, 2211, 2214, 2217, 2218, 2221, + 2224, 2225, 2228, 2231, 2232, 2235, 2238, 2239, 2242, 2245, + 2246, 2247, 2248, 2251, 2254, 2255, 2256, 2259, 2260, 2261, + 2264, 2267, 2270, 2271, 2272, 2273, 2276, 2277, 2280, 2283, + 2286, 2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, + 2296, 2297, 2298, 2299, 2302, 2305, 2306, 2309, 2312, 2313, + 2314, 2317, 2320, 2321, 2322, 2323, 2326, 2327, 2328, 2331, + 2334, 2335, 2336, 2337, 2338, 2339, 2340, 2343, 2346, 2349, + 2350, 2353, 2354, 2355, 2358, 2362, 2365, 2366, 2367, 2368, + 2369, 2372, 2376, 2377, 2380, 2381, 2384, 2385, 2388, 2389, + 2392, 2393, 2396, 2399, 2400, 2401, 2404, 2407, 2408, 2409, + 2410, 2413, 2416, 2417, 2418, 2419, 2420, 2421, 2424, 2427, + 2430, 2433, 2434, 2435, 2436, 2439, 2442, 2443, 2444, 2445, + 2446, 2447, 2448, 2449, 2450, 2451, 2452, 2453, 2454, 2455, + 2456, 2457, 2460, 2463, 2466, 2467, 2468, 2469, 2470, 2473, + 2474, 2477, 2478, 2481, 2484, 2487, 2488, 2489, 2490, 2491, + 2492, 2495, 2498, 2499, 2500, 2503, 2506, 2507, 2508, 2509, + 2510, 2511, 2512, 2513, 2514, 2517, 2520, 2523, 2526, 2527, + 2530, 2533, 2534, 2535, 2536, 2537, 2538, 2539, 2540, 2541, + 2542, 2545, 2548, 2551, 2554, 2557, 2560, 2561, 2562, 2563, + 2566, 2569, 2570, 2571, 2572, 2573, 2574, 2575, 2578, 2581, + 2582, 2583, 2584, 2585, 2586, 2587, 2590, 2593, 2596, 2599 }; #endif @@ -3366,541 +3367,541 @@ switch (yyn) { case 2: -#line 509 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 510 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { PopC(); } -#line 3372 "edif.tab.c" /* yacc.c:1646 */ +#line 3373 "edif.tab.c" /* yacc.c:1646 */ break; case 11: -#line 524 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 525 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3378 "edif.tab.c" /* yacc.c:1646 */ +#line 3379 "edif.tab.c" /* yacc.c:1646 */ break; case 12: -#line 527 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 528 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3384 "edif.tab.c" /* yacc.c:1646 */ +#line 3385 "edif.tab.c" /* yacc.c:1646 */ break; case 13: -#line 531 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 532 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-3].s)); free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 3390 "edif.tab.c" /* yacc.c:1646 */ +#line 3391 "edif.tab.c" /* yacc.c:1646 */ break; case 25: -#line 555 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 556 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3396 "edif.tab.c" /* yacc.c:1646 */ +#line 3397 "edif.tab.c" /* yacc.c:1646 */ break; case 34: -#line 572 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 573 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[-3].ps)); free((yyvsp[-2].s)); } -#line 3402 "edif.tab.c" /* yacc.c:1646 */ +#line 3403 "edif.tab.c" /* yacc.c:1646 */ break; case 36: -#line 576 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 577 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3408 "edif.tab.c" /* yacc.c:1646 */ +#line 3409 "edif.tab.c" /* yacc.c:1646 */ break; case 47: -#line 601 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 602 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3414 "edif.tab.c" /* yacc.c:1646 */ +#line 3415 "edif.tab.c" /* yacc.c:1646 */ break; case 69: -#line 649 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 650 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-3].s)); free((yyvsp[-2].s)); } -#line 3420 "edif.tab.c" /* yacc.c:1646 */ +#line 3421 "edif.tab.c" /* yacc.c:1646 */ break; case 70: -#line 652 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 653 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3426 "edif.tab.c" /* yacc.c:1646 */ +#line 3427 "edif.tab.c" /* yacc.c:1646 */ break; case 80: -#line 670 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 671 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3432 "edif.tab.c" /* yacc.c:1646 */ +#line 3433 "edif.tab.c" /* yacc.c:1646 */ break; case 84: -#line 680 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 681 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3438 "edif.tab.c" /* yacc.c:1646 */ +#line 3439 "edif.tab.c" /* yacc.c:1646 */ break; case 91: -#line 695 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 696 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3444 "edif.tab.c" /* yacc.c:1646 */ +#line 3445 "edif.tab.c" /* yacc.c:1646 */ break; case 102: -#line 718 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 719 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3450 "edif.tab.c" /* yacc.c:1646 */ +#line 3451 "edif.tab.c" /* yacc.c:1646 */ break; case 140: -#line 778 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 779 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3456 "edif.tab.c" /* yacc.c:1646 */ +#line 3457 "edif.tab.c" /* yacc.c:1646 */ break; case 147: -#line 793 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 794 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); } -#line 3462 "edif.tab.c" /* yacc.c:1646 */ +#line 3463 "edif.tab.c" /* yacc.c:1646 */ break; case 150: -#line 800 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 801 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); } -#line 3468 "edif.tab.c" /* yacc.c:1646 */ +#line 3469 "edif.tab.c" /* yacc.c:1646 */ break; case 182: -#line 870 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 871 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3474 "edif.tab.c" /* yacc.c:1646 */ +#line 3475 "edif.tab.c" /* yacc.c:1646 */ break; case 184: -#line 874 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 875 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3480 "edif.tab.c" /* yacc.c:1646 */ +#line 3481 "edif.tab.c" /* yacc.c:1646 */ break; case 240: -#line 978 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 979 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3486 "edif.tab.c" /* yacc.c:1646 */ +#line 3487 "edif.tab.c" /* yacc.c:1646 */ break; case 247: -#line 991 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 992 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3492 "edif.tab.c" /* yacc.c:1646 */ +#line 3493 "edif.tab.c" /* yacc.c:1646 */ break; case 278: -#line 1038 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1039 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3498 "edif.tab.c" /* yacc.c:1646 */ +#line 3499 "edif.tab.c" /* yacc.c:1646 */ break; case 279: -#line 1041 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1042 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3504 "edif.tab.c" /* yacc.c:1646 */ +#line 3505 "edif.tab.c" /* yacc.c:1646 */ break; case 333: -#line 1127 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1128 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-3].s)); free((yyvsp[-2].s)); } -#line 3510 "edif.tab.c" /* yacc.c:1646 */ +#line 3511 "edif.tab.c" /* yacc.c:1646 */ break; case 336: -#line 1134 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1135 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3516 "edif.tab.c" /* yacc.c:1646 */ +#line 3517 "edif.tab.c" /* yacc.c:1646 */ break; case 337: -#line 1137 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1138 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3522 "edif.tab.c" /* yacc.c:1646 */ +#line 3523 "edif.tab.c" /* yacc.c:1646 */ break; case 344: -#line 1150 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1151 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); } -#line 3528 "edif.tab.c" /* yacc.c:1646 */ +#line 3529 "edif.tab.c" /* yacc.c:1646 */ break; case 346: -#line 1154 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1155 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3534 "edif.tab.c" /* yacc.c:1646 */ +#line 3535 "edif.tab.c" /* yacc.c:1646 */ break; case 347: -#line 1155 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1156 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3540 "edif.tab.c" /* yacc.c:1646 */ +#line 3541 "edif.tab.c" /* yacc.c:1646 */ break; case 348: -#line 1156 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1157 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3546 "edif.tab.c" /* yacc.c:1646 */ +#line 3547 "edif.tab.c" /* yacc.c:1646 */ break; case 369: -#line 1197 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1198 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[-2].s); } -#line 3552 "edif.tab.c" /* yacc.c:1646 */ +#line 3553 "edif.tab.c" /* yacc.c:1646 */ break; case 371: -#line 1201 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1202 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3558 "edif.tab.c" /* yacc.c:1646 */ +#line 3559 "edif.tab.c" /* yacc.c:1646 */ break; case 374: -#line 1208 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1209 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3564 "edif.tab.c" /* yacc.c:1646 */ +#line 3565 "edif.tab.c" /* yacc.c:1646 */ break; case 381: -#line 1219 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1220 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3570 "edif.tab.c" /* yacc.c:1646 */ +#line 3571 "edif.tab.c" /* yacc.c:1646 */ break; case 384: -#line 1226 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1227 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3576 "edif.tab.c" /* yacc.c:1646 */ +#line 3577 "edif.tab.c" /* yacc.c:1646 */ break; case 388: -#line 1232 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1233 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3582 "edif.tab.c" /* yacc.c:1646 */ +#line 3583 "edif.tab.c" /* yacc.c:1646 */ break; case 390: -#line 1236 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1237 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3588 "edif.tab.c" /* yacc.c:1646 */ +#line 3589 "edif.tab.c" /* yacc.c:1646 */ break; case 393: -#line 1243 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1244 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3594 "edif.tab.c" /* yacc.c:1646 */ +#line 3595 "edif.tab.c" /* yacc.c:1646 */ break; case 397: -#line 1251 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1252 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3600 "edif.tab.c" /* yacc.c:1646 */ +#line 3601 "edif.tab.c" /* yacc.c:1646 */ break; case 408: -#line 1266 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1267 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { pair_list_free((yyvsp[0].pl)); } -#line 3606 "edif.tab.c" /* yacc.c:1646 */ +#line 3607 "edif.tab.c" /* yacc.c:1646 */ break; case 437: -#line 1316 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1317 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.pl) = new_pair_list((yyvsp[-1].ps)); } -#line 3612 "edif.tab.c" /* yacc.c:1646 */ +#line 3613 "edif.tab.c" /* yacc.c:1646 */ break; case 438: -#line 1319 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1320 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=NULL; } -#line 3618 "edif.tab.c" /* yacc.c:1646 */ +#line 3619 "edif.tab.c" /* yacc.c:1646 */ break; case 439: -#line 1320 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1321 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyvsp[0].ps)->next = (yyvsp[-1].ps); (yyval.ps) = (yyvsp[0].ps); } -#line 3624 "edif.tab.c" /* yacc.c:1646 */ +#line 3625 "edif.tab.c" /* yacc.c:1646 */ break; case 455: -#line 1346 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1347 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3630 "edif.tab.c" /* yacc.c:1646 */ +#line 3631 "edif.tab.c" /* yacc.c:1646 */ break; case 459: -#line 1356 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1357 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3636 "edif.tab.c" /* yacc.c:1646 */ +#line 3637 "edif.tab.c" /* yacc.c:1646 */ break; case 460: -#line 1359 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1360 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3642 "edif.tab.c" /* yacc.c:1646 */ +#line 3643 "edif.tab.c" /* yacc.c:1646 */ break; case 462: -#line 1365 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1366 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3648 "edif.tab.c" /* yacc.c:1646 */ +#line 3649 "edif.tab.c" /* yacc.c:1646 */ break; case 463: -#line 1368 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1369 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3654 "edif.tab.c" /* yacc.c:1646 */ +#line 3655 "edif.tab.c" /* yacc.c:1646 */ break; case 483: -#line 1410 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1411 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3660 "edif.tab.c" /* yacc.c:1646 */ +#line 3661 "edif.tab.c" /* yacc.c:1646 */ break; case 484: -#line 1413 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1414 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3666 "edif.tab.c" /* yacc.c:1646 */ +#line 3667 "edif.tab.c" /* yacc.c:1646 */ break; case 492: -#line 1427 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1428 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3672 "edif.tab.c" /* yacc.c:1646 */ +#line 3673 "edif.tab.c" /* yacc.c:1646 */ break; case 506: -#line 1455 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1456 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3678 "edif.tab.c" /* yacc.c:1646 */ +#line 3679 "edif.tab.c" /* yacc.c:1646 */ break; case 507: -#line 1458 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1459 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3684 "edif.tab.c" /* yacc.c:1646 */ +#line 3685 "edif.tab.c" /* yacc.c:1646 */ break; case 514: -#line 1473 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1474 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3690 "edif.tab.c" /* yacc.c:1646 */ +#line 3691 "edif.tab.c" /* yacc.c:1646 */ break; case 549: -#line 1528 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1529 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3696 "edif.tab.c" /* yacc.c:1646 */ +#line 3697 "edif.tab.c" /* yacc.c:1646 */ break; case 555: -#line 1540 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1541 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3702 "edif.tab.c" /* yacc.c:1646 */ +#line 3703 "edif.tab.c" /* yacc.c:1646 */ break; case 560: -#line 1549 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1550 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); } -#line 3708 "edif.tab.c" /* yacc.c:1646 */ +#line 3709 "edif.tab.c" /* yacc.c:1646 */ break; case 561: -#line 1552 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1553 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3714 "edif.tab.c" /* yacc.c:1646 */ +#line 3715 "edif.tab.c" /* yacc.c:1646 */ break; case 562: -#line 1553 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1554 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3720 "edif.tab.c" /* yacc.c:1646 */ +#line 3721 "edif.tab.c" /* yacc.c:1646 */ break; case 582: -#line 1595 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1596 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3726 "edif.tab.c" /* yacc.c:1646 */ +#line 3727 "edif.tab.c" /* yacc.c:1646 */ break; case 585: -#line 1598 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1599 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { pair_list_free((yyvsp[0].pl)); } -#line 3732 "edif.tab.c" /* yacc.c:1646 */ +#line 3733 "edif.tab.c" /* yacc.c:1646 */ break; case 586: -#line 1601 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1602 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[-1].s); } -#line 3738 "edif.tab.c" /* yacc.c:1646 */ +#line 3739 "edif.tab.c" /* yacc.c:1646 */ break; case 587: -#line 1604 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1605 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3744 "edif.tab.c" /* yacc.c:1646 */ +#line 3745 "edif.tab.c" /* yacc.c:1646 */ break; case 589: -#line 1608 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1609 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); } -#line 3750 "edif.tab.c" /* yacc.c:1646 */ +#line 3751 "edif.tab.c" /* yacc.c:1646 */ break; case 590: -#line 1609 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1610 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); } -#line 3756 "edif.tab.c" /* yacc.c:1646 */ +#line 3757 "edif.tab.c" /* yacc.c:1646 */ break; case 591: -#line 1610 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1611 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=(yyvsp[0].ps); } -#line 3762 "edif.tab.c" /* yacc.c:1646 */ +#line 3763 "edif.tab.c" /* yacc.c:1646 */ break; case 592: -#line 1613 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1614 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3768 "edif.tab.c" /* yacc.c:1646 */ +#line 3769 "edif.tab.c" /* yacc.c:1646 */ break; case 593: -#line 1614 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1615 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3774 "edif.tab.c" /* yacc.c:1646 */ +#line 3775 "edif.tab.c" /* yacc.c:1646 */ break; case 594: -#line 1617 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1618 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { define_pcb_net((yyvsp[-2].ps), (yyvsp[-1].pl)); } -#line 3780 "edif.tab.c" /* yacc.c:1646 */ +#line 3781 "edif.tab.c" /* yacc.c:1646 */ break; case 595: -#line 1620 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1621 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.pl)=(yyvsp[0].pl); } -#line 3786 "edif.tab.c" /* yacc.c:1646 */ +#line 3787 "edif.tab.c" /* yacc.c:1646 */ break; case 611: -#line 1642 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1643 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[-2].ps)); } -#line 3792 "edif.tab.c" /* yacc.c:1646 */ +#line 3793 "edif.tab.c" /* yacc.c:1646 */ break; case 632: -#line 1679 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1680 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=(yyvsp[0].ps); } -#line 3798 "edif.tab.c" /* yacc.c:1646 */ +#line 3799 "edif.tab.c" /* yacc.c:1646 */ break; case 633: -#line 1680 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1681 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=NULL; } -#line 3804 "edif.tab.c" /* yacc.c:1646 */ +#line 3805 "edif.tab.c" /* yacc.c:1646 */ break; case 634: -#line 1684 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1685 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3810 "edif.tab.c" /* yacc.c:1646 */ +#line 3811 "edif.tab.c" /* yacc.c:1646 */ break; case 639: -#line 1693 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1694 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3816 "edif.tab.c" /* yacc.c:1646 */ +#line 3817 "edif.tab.c" /* yacc.c:1646 */ break; case 644: -#line 1704 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1705 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3822 "edif.tab.c" /* yacc.c:1646 */ +#line 3823 "edif.tab.c" /* yacc.c:1646 */ break; case 698: -#line 1806 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1807 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-3].s)); } -#line 3828 "edif.tab.c" /* yacc.c:1646 */ +#line 3829 "edif.tab.c" /* yacc.c:1646 */ break; case 701: -#line 1813 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1814 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3834 "edif.tab.c" /* yacc.c:1646 */ +#line 3835 "edif.tab.c" /* yacc.c:1646 */ break; case 727: -#line 1865 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1866 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3840 "edif.tab.c" /* yacc.c:1646 */ +#line 3841 "edif.tab.c" /* yacc.c:1646 */ break; case 730: -#line 1872 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1873 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3846 "edif.tab.c" /* yacc.c:1646 */ +#line 3847 "edif.tab.c" /* yacc.c:1646 */ break; case 747: -#line 1907 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1908 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 3852 "edif.tab.c" /* yacc.c:1646 */ +#line 3853 "edif.tab.c" /* yacc.c:1646 */ break; case 766: -#line 1938 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1939 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3858 "edif.tab.c" /* yacc.c:1646 */ +#line 3859 "edif.tab.c" /* yacc.c:1646 */ break; case 789: -#line 1973 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1974 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3864 "edif.tab.c" /* yacc.c:1646 */ +#line 3865 "edif.tab.c" /* yacc.c:1646 */ break; case 791: -#line 1979 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1980 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3870 "edif.tab.c" /* yacc.c:1646 */ +#line 3871 "edif.tab.c" /* yacc.c:1646 */ break; case 803: -#line 1995 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 1996 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3876 "edif.tab.c" /* yacc.c:1646 */ +#line 3877 "edif.tab.c" /* yacc.c:1646 */ break; case 818: -#line 2014 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2015 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3882 "edif.tab.c" /* yacc.c:1646 */ +#line 3883 "edif.tab.c" /* yacc.c:1646 */ break; case 823: -#line 2025 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2026 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3888 "edif.tab.c" /* yacc.c:1646 */ +#line 3889 "edif.tab.c" /* yacc.c:1646 */ break; case 827: -#line 2031 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2032 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3894 "edif.tab.c" /* yacc.c:1646 */ +#line 3895 "edif.tab.c" /* yacc.c:1646 */ break; case 829: -#line 2035 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2036 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3900 "edif.tab.c" /* yacc.c:1646 */ +#line 3901 "edif.tab.c" /* yacc.c:1646 */ break; case 831: -#line 2040 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2041 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { if ((yyvsp[-1].ps)) { @@ -3913,251 +3914,251 @@ (yyval.ps) = new_str_pair(NULL,(yyvsp[-2].s)); } } -#line 3917 "edif.tab.c" /* yacc.c:1646 */ +#line 3918 "edif.tab.c" /* yacc.c:1646 */ break; case 832: -#line 2054 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2055 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=NULL; } -#line 3923 "edif.tab.c" /* yacc.c:1646 */ +#line 3924 "edif.tab.c" /* yacc.c:1646 */ break; case 833: -#line 2055 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2056 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=(yyvsp[0].ps); } -#line 3929 "edif.tab.c" /* yacc.c:1646 */ +#line 3930 "edif.tab.c" /* yacc.c:1646 */ break; case 834: -#line 2056 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2057 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); } -#line 3935 "edif.tab.c" /* yacc.c:1646 */ +#line 3936 "edif.tab.c" /* yacc.c:1646 */ break; case 835: -#line 2057 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2058 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.ps)=NULL; } -#line 3941 "edif.tab.c" /* yacc.c:1646 */ +#line 3942 "edif.tab.c" /* yacc.c:1646 */ break; case 848: -#line 2084 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2085 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3947 "edif.tab.c" /* yacc.c:1646 */ +#line 3948 "edif.tab.c" /* yacc.c:1646 */ break; case 849: -#line 2087 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2088 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3953 "edif.tab.c" /* yacc.c:1646 */ +#line 3954 "edif.tab.c" /* yacc.c:1646 */ break; case 881: -#line 2140 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2141 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.ps) = new_str_pair((yyvsp[-2].s),(yyvsp[-1].s)); } -#line 3959 "edif.tab.c" /* yacc.c:1646 */ +#line 3960 "edif.tab.c" /* yacc.c:1646 */ break; case 882: -#line 2143 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2144 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3965 "edif.tab.c" /* yacc.c:1646 */ +#line 3966 "edif.tab.c" /* yacc.c:1646 */ break; case 883: -#line 2144 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2145 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3971 "edif.tab.c" /* yacc.c:1646 */ +#line 3972 "edif.tab.c" /* yacc.c:1646 */ break; case 884: -#line 2147 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2148 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3977 "edif.tab.c" /* yacc.c:1646 */ +#line 3978 "edif.tab.c" /* yacc.c:1646 */ break; case 885: -#line 2148 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2149 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=NULL; } -#line 3983 "edif.tab.c" /* yacc.c:1646 */ +#line 3984 "edif.tab.c" /* yacc.c:1646 */ break; case 889: -#line 2158 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2159 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3989 "edif.tab.c" /* yacc.c:1646 */ +#line 3990 "edif.tab.c" /* yacc.c:1646 */ break; case 891: -#line 2164 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2165 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3995 "edif.tab.c" /* yacc.c:1646 */ +#line 3996 "edif.tab.c" /* yacc.c:1646 */ break; case 892: -#line 2165 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2166 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 4001 "edif.tab.c" /* yacc.c:1646 */ +#line 4002 "edif.tab.c" /* yacc.c:1646 */ break; case 893: -#line 2168 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2169 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 4007 "edif.tab.c" /* yacc.c:1646 */ +#line 4008 "edif.tab.c" /* yacc.c:1646 */ break; case 894: -#line 2171 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2172 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 4013 "edif.tab.c" /* yacc.c:1646 */ +#line 4014 "edif.tab.c" /* yacc.c:1646 */ break; case 896: -#line 2177 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2178 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4019 "edif.tab.c" /* yacc.c:1646 */ +#line 4020 "edif.tab.c" /* yacc.c:1646 */ break; case 898: -#line 2179 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2180 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4025 "edif.tab.c" /* yacc.c:1646 */ +#line 4026 "edif.tab.c" /* yacc.c:1646 */ break; case 903: -#line 2190 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2191 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4031 "edif.tab.c" /* yacc.c:1646 */ +#line 4032 "edif.tab.c" /* yacc.c:1646 */ break; case 935: -#line 2254 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2255 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4037 "edif.tab.c" /* yacc.c:1646 */ +#line 4038 "edif.tab.c" /* yacc.c:1646 */ break; case 943: -#line 2270 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2271 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4043 "edif.tab.c" /* yacc.c:1646 */ +#line 4044 "edif.tab.c" /* yacc.c:1646 */ break; case 946: -#line 2275 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2276 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4049 "edif.tab.c" /* yacc.c:1646 */ +#line 4050 "edif.tab.c" /* yacc.c:1646 */ break; case 973: -#line 2320 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2321 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4055 "edif.tab.c" /* yacc.c:1646 */ +#line 4056 "edif.tab.c" /* yacc.c:1646 */ break; case 987: -#line 2342 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2343 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 4061 "edif.tab.c" /* yacc.c:1646 */ +#line 4062 "edif.tab.c" /* yacc.c:1646 */ break; case 994: -#line 2358 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2359 "../../src_plugins/import_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 4067 "edif.tab.c" /* yacc.c:1646 */ +#line 4068 "edif.tab.c" /* yacc.c:1646 */ break; case 1054: -#line 2465 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2466 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4073 "edif.tab.c" /* yacc.c:1646 */ +#line 4074 "edif.tab.c" /* yacc.c:1646 */ break; case 1055: -#line 2466 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2467 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4079 "edif.tab.c" /* yacc.c:1646 */ +#line 4080 "edif.tab.c" /* yacc.c:1646 */ break; case 1056: -#line 2467 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2468 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4085 "edif.tab.c" /* yacc.c:1646 */ +#line 4086 "edif.tab.c" /* yacc.c:1646 */ break; case 1057: -#line 2468 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2469 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4091 "edif.tab.c" /* yacc.c:1646 */ +#line 4092 "edif.tab.c" /* yacc.c:1646 */ break; case 1059: -#line 2472 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2473 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4097 "edif.tab.c" /* yacc.c:1646 */ +#line 4098 "edif.tab.c" /* yacc.c:1646 */ break; case 1061: -#line 2476 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2477 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4103 "edif.tab.c" /* yacc.c:1646 */ +#line 4104 "edif.tab.c" /* yacc.c:1646 */ break; case 1063: -#line 2480 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2481 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 4109 "edif.tab.c" /* yacc.c:1646 */ +#line 4110 "edif.tab.c" /* yacc.c:1646 */ break; case 1085: -#line 2516 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2517 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4115 "edif.tab.c" /* yacc.c:1646 */ +#line 4116 "edif.tab.c" /* yacc.c:1646 */ break; case 1086: -#line 2519 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2520 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4121 "edif.tab.c" /* yacc.c:1646 */ +#line 4122 "edif.tab.c" /* yacc.c:1646 */ break; case 1107: -#line 2560 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2561 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4127 "edif.tab.c" /* yacc.c:1646 */ +#line 4128 "edif.tab.c" /* yacc.c:1646 */ break; case 1109: -#line 2562 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2563 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { pair_list_free((yyvsp[0].pl)); } -#line 4133 "edif.tab.c" /* yacc.c:1646 */ +#line 4134 "edif.tab.c" /* yacc.c:1646 */ break; case 1126: -#line 2589 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2590 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4139 "edif.tab.c" /* yacc.c:1646 */ +#line 4140 "edif.tab.c" /* yacc.c:1646 */ break; case 1127: -#line 2592 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2593 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4145 "edif.tab.c" /* yacc.c:1646 */ +#line 4146 "edif.tab.c" /* yacc.c:1646 */ break; case 1128: -#line 2595 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2596 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4151 "edif.tab.c" /* yacc.c:1646 */ +#line 4152 "edif.tab.c" /* yacc.c:1646 */ break; case 1129: -#line 2598 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ +#line 2599 "../../src_plugins/import_edif/edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4157 "edif.tab.c" /* yacc.c:1646 */ +#line 4158 "edif.tab.c" /* yacc.c:1646 */ break; -#line 4161 "edif.tab.c" /* yacc.c:1646 */ +#line 4162 "edif.tab.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4385,7 +4386,7 @@ #endif return yyresult; } -#line 2601 "../../src_plugins/import_edif/edif.y" /* yacc.c:1906 */ +#line 2602 "../../src_plugins/import_edif/edif.y" /* yacc.c:1906 */ /* * xmalloc: Index: edif.h =================================================================== --- edif.h (revision 2527) +++ edif.h (revision 2528) @@ -345,7 +345,7 @@ typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 197 "../../src_plugins/import_edif/edif.y" /* yacc.c:1909 */ +#line 198 "../../src_plugins/import_edif/edif.y" /* yacc.c:1909 */ char* s; pair_list* pl; Index: edif.y =================================================================== --- edif.y (revision 2527) +++ edif.y (revision 2528) @@ -30,6 +30,7 @@ #include "data.h" #include "error.h" #include "plugins.h" +#include "compat_misc.h" /* from mymem.h, not include because of the malloc junk */ LibraryMenuTypePtr GetLibraryMenuMemory(LibraryTypePtr, int *idx); @@ -114,7 +115,7 @@ pair_list_free(nodes); return; } - menu->Name = strdup (name->str1); + menu->Name = pcb_strdup (name->str1); free(name->str1); /* if renamed str2 also exists and must be freed */ if ( name->str2 ) free(name->str2); @@ -178,7 +179,7 @@ free(node->str1); free(node->str2); entry = GetLibraryEntryMemory (menu); - entry->ListEntry = strdup(buf); + entry->ListEntry = pcb_strdup(buf); done_node = node; node = node->next; free(done_node);