Index: edif.c =================================================================== --- edif.c (revision 23327) +++ edif.c (revision 23328) @@ -102,7 +102,6 @@ #include "math_helper.h" #include "board.h" #include "data.h" -#include "library.h" #include "error.h" #include "plugins.h" #include "compat_misc.h" @@ -269,7 +268,7 @@ static void yyerror(const char *); static void PopC(void); -#line 273 "edif.c" /* yacc.c:339 */ +#line 272 "edif.c" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -604,13 +603,13 @@ typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 202 "edif.y" /* yacc.c:355 */ +#line 201 "edif.y" /* yacc.c:355 */ char* s; pair_list* pl; str_pair* ps; -#line 614 "edif.c" /* yacc.c:355 */ +#line 613 "edif.c" /* yacc.c:355 */ }; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 @@ -625,7 +624,7 @@ /* Copy the second part of user declarations. */ -#line 629 "edif.c" /* yacc.c:358 */ +#line 628 "edif.c" /* yacc.c:358 */ #ifdef short # undef short @@ -951,119 +950,119 @@ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 514, 514, 517, 520, 521, 522, 523, 524, 525, - 526, 529, 532, 535, 539, 542, 543, 546, 549, 550, - 551, 552, 553, 554, 557, 560, 561, 564, 567, 568, - 569, 570, 571, 574, 577, 580, 581, 584, 587, 590, - 591, 592, 593, 594, 597, 600, 603, 606, 609, 612, - 615, 616, 617, 620, 623, 624, 627, 628, 631, 634, - 635, 636, 637, 640, 643, 644, 647, 650, 651, 654, - 657, 660, 663, 666, 667, 668, 669, 670, 671, 672, - 675, 678, 681, 682, 685, 688, 691, 692, 693, 696, - 699, 700, 701, 704, 705, 706, 709, 712, 713, 716, - 719, 722, 723, 726, 729, 730, 731, 732, 733, 734, - 735, 736, 739, 742, 745, 746, 747, 748, 749, 750, - 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, - 761, 762, 765, 768, 769, 772, 775, 776, 777, 780, - 783, 784, 787, 790, 793, 794, 795, 798, 801, 802, - 805, 808, 809, 812, 815, 816, 819, 822, 823, 826, - 829, 830, 833, 836, 837, 840, 843, 844, 847, 850, - 851, 854, 857, 858, 859, 862, 865, 866, 867, 868, - 869, 872, 875, 876, 879, 882, 885, 886, 887, 888, - 889, 890, 891, 892, 893, 894, 895, 896, 897, 898, - 899, 902, 905, 906, 907, 908, 911, 914, 915, 916, - 919, 922, 923, 926, 927, 930, 931, 934, 935, 938, - 941, 942, 945, 948, 949, 952, 955, 959, 960, 961, - 962, 965, 968, 969, 970, 973, 977, 978, 979, 982, - 983, 984, 985, 988, 989, 990, 993, 996, 997, 998, - 999, 1000, 1001, 1002, 1005, 1008, 1011, 1012, 1013, 1014, - 1015, 1018, 1021, 1024, 1027, 1028, 1029, 1030, 1031, 1032, - 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1043, 1046, - 1049, 1052, 1053, 1054, 1057, 1060, 1061, 1062, 1063, 1064, - 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1075, 1078, - 1079, 1082, 1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, - 1093, 1094, 1095, 1098, 1101, 1102, 1103, 1104, 1107, 1108, - 1109, 1110, 1111, 1114, 1117, 1118, 1119, 1120, 1123, 1126, - 1127, 1128, 1129, 1132, 1135, 1138, 1139, 1142, 1143, 1144, - 1145, 1148, 1151, 1152, 1155, 1158, 1159, 1160, 1161, 1162, - 1165, 1168, 1171, 1174, 1177, 1180, 1181, 1184, 1187, 1190, - 1191, 1192, 1193, 1194, 1195, 1196, 1197, 1198, 1199, 1202, - 1205, 1206, 1207, 1210, 1213, 1214, 1215, 1216, 1217, 1220, - 1223, 1224, 1227, 1230, 1231, 1232, 1233, 1234, 1237, 1238, - 1241, 1242, 1245, 1248, 1249, 1252, 1255, 1256, 1257, 1258, - 1261, 1264, 1265, 1266, 1267, 1268, 1269, 1270, 1271, 1272, - 1273, 1274, 1275, 1276, 1277, 1278, 1279, 1280, 1283, 1287, - 1288, 1289, 1290, 1293, 1296, 1297, 1298, 1299, 1302, 1305, - 1306, 1307, 1308, 1311, 1314, 1315, 1318, 1321, 1324, 1325, - 1326, 1327, 1330, 1333, 1334, 1335, 1336, 1337, 1338, 1339, - 1340, 1341, 1344, 1347, 1348, 1351, 1354, 1357, 1358, 1361, - 1364, 1367, 1370, 1373, 1376, 1379, 1380, 1381, 1382, 1383, - 1386, 1389, 1392, 1393, 1396, 1399, 1400, 1401, 1404, 1407, - 1408, 1411, 1414, 1415, 1418, 1419, 1420, 1423, 1424, 1425, - 1428, 1431, 1432, 1433, 1434, 1437, 1440, 1441, 1442, 1443, - 1446, 1449, 1450, 1453, 1456, 1457, 1460, 1463, 1466, 1469, - 1470, 1471, 1474, 1477, 1478, 1479, 1480, 1483, 1486, 1487, - 1488, 1489, 1492, 1495, 1496, 1499, 1502, 1503, 1504, 1505, - 1506, 1507, 1508, 1509, 1510, 1511, 1512, 1513, 1514, 1515, - 1516, 1519, 1522, 1523, 1524, 1525, 1526, 1529, 1532, 1533, - 1536, 1537, 1538, 1541, 1544, 1545, 1546, 1549, 1550, 1551, - 1554, 1557, 1558, 1561, 1564, 1565, 1566, 1567, 1570, 1573, - 1574, 1577, 1578, 1581, 1584, 1585, 1586, 1589, 1592, 1593, - 1596, 1599, 1600, 1601, 1602, 1603, 1606, 1609, 1610, 1613, - 1614, 1615, 1618, 1619, 1622, 1625, 1626, 1627, 1628, 1629, - 1630, 1631, 1632, 1633, 1634, 1637, 1640, 1641, 1642, 1643, - 1644, 1647, 1650, 1651, 1652, 1653, 1654, 1655, 1658, 1661, - 1662, 1663, 1666, 1669, 1670, 1671, 1674, 1677, 1678, 1679, - 1680, 1681, 1684, 1685, 1689, 1690, 1693, 1696, 1697, 1698, - 1699, 1702, 1705, 1708, 1709, 1710, 1713, 1716, 1717, 1718, - 1721, 1724, 1725, 1726, 1727, 1730, 1733, 1734, 1735, 1736, - 1739, 1742, 1743, 1746, 1749, 1750, 1751, 1752, 1755, 1758, - 1759, 1760, 1761, 1762, 1765, 1768, 1771, 1772, 1775, 1778, - 1779, 1780, 1781, 1782, 1783, 1784, 1785, 1788, 1791, 1795, - 1796, 1797, 1798, 1801, 1805, 1806, 1807, 1808, 1811, 1814, - 1815, 1818, 1821, 1824, 1825, 1826, 1827, 1828, 1829, 1830, - 1831, 1832, 1833, 1836, 1839, 1842, 1843, 1846, 1849, 1850, - 1853, 1856, 1859, 1860, 1863, 1866, 1867, 1870, 1873, 1876, - 1877, 1878, 1879, 1882, 1885, 1886, 1889, 1892, 1893, 1894, - 1895, 1898, 1901, 1902, 1905, 1908, 1909, 1912, 1915, 1918, - 1919, 1922, 1925, 1926, 1927, 1928, 1929, 1930, 1931, 1932, - 1933, 1934, 1935, 1936, 1937, 1940, 1943, 1944, 1945, 1946, - 1947, 1948, 1949, 1950, 1951, 1952, 1955, 1958, 1959, 1960, - 1961, 1964, 1967, 1968, 1969, 1970, 1973, 1976, 1977, 1978, - 1981, 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1992, - 1993, 1994, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2012, 2015, 2018, 2019, 2020, - 2023, 2026, 2029, 2030, 2031, 2032, 2033, 2036, 2037, 2040, - 2041, 2044, 2059, 2060, 2061, 2062, 2065, 2068, 2069, 2072, - 2075, 2076, 2079, 2082, 2083, 2084, 2085, 2086, 2089, 2092, - 2095, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106, - 2107, 2108, 2109, 2112, 2113, 2114, 2115, 2116, 2117, 2120, - 2123, 2124, 2125, 2128, 2131, 2132, 2135, 2138, 2139, 2140, - 2141, 2144, 2148, 2149, 2152, 2153, 2156, 2159, 2160, 2163, - 2166, 2169, 2170, 2173, 2176, 2179, 2182, 2183, 2184, 2185, - 2188, 2191, 2192, 2195, 2198, 2201, 2202, 2203, 2204, 2205, - 2206, 2209, 2212, 2213, 2214, 2215, 2218, 2221, 2222, 2225, - 2228, 2229, 2232, 2235, 2236, 2239, 2242, 2243, 2246, 2249, - 2250, 2251, 2252, 2255, 2258, 2259, 2260, 2263, 2264, 2265, - 2268, 2271, 2274, 2275, 2276, 2277, 2280, 2281, 2284, 2287, - 2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297, 2298, 2299, - 2300, 2301, 2302, 2303, 2306, 2309, 2310, 2313, 2316, 2317, - 2318, 2321, 2324, 2325, 2326, 2327, 2330, 2331, 2332, 2335, - 2338, 2339, 2340, 2341, 2342, 2343, 2344, 2347, 2350, 2353, - 2354, 2357, 2358, 2359, 2362, 2366, 2369, 2370, 2371, 2372, - 2373, 2376, 2380, 2381, 2384, 2385, 2388, 2389, 2392, 2393, - 2396, 2397, 2400, 2403, 2404, 2405, 2408, 2411, 2412, 2413, - 2414, 2417, 2420, 2421, 2422, 2423, 2424, 2425, 2428, 2431, - 2434, 2437, 2438, 2439, 2440, 2443, 2446, 2447, 2448, 2449, - 2450, 2451, 2452, 2453, 2454, 2455, 2456, 2457, 2458, 2459, - 2460, 2461, 2464, 2467, 2470, 2471, 2472, 2473, 2474, 2477, - 2478, 2481, 2482, 2485, 2488, 2491, 2492, 2493, 2494, 2495, - 2496, 2499, 2502, 2503, 2504, 2507, 2510, 2511, 2512, 2513, - 2514, 2515, 2516, 2517, 2518, 2521, 2524, 2527, 2530, 2531, - 2534, 2537, 2538, 2539, 2540, 2541, 2542, 2543, 2544, 2545, - 2546, 2549, 2552, 2555, 2558, 2561, 2564, 2565, 2566, 2567, - 2570, 2573, 2574, 2575, 2576, 2577, 2578, 2579, 2582, 2585, - 2586, 2587, 2588, 2589, 2590, 2591, 2594, 2597, 2600, 2603 + 0, 513, 513, 516, 519, 520, 521, 522, 523, 524, + 525, 528, 531, 534, 538, 541, 542, 545, 548, 549, + 550, 551, 552, 553, 556, 559, 560, 563, 566, 567, + 568, 569, 570, 573, 576, 579, 580, 583, 586, 589, + 590, 591, 592, 593, 596, 599, 602, 605, 608, 611, + 614, 615, 616, 619, 622, 623, 626, 627, 630, 633, + 634, 635, 636, 639, 642, 643, 646, 649, 650, 653, + 656, 659, 662, 665, 666, 667, 668, 669, 670, 671, + 674, 677, 680, 681, 684, 687, 690, 691, 692, 695, + 698, 699, 700, 703, 704, 705, 708, 711, 712, 715, + 718, 721, 722, 725, 728, 729, 730, 731, 732, 733, + 734, 735, 738, 741, 744, 745, 746, 747, 748, 749, + 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, + 760, 761, 764, 767, 768, 771, 774, 775, 776, 779, + 782, 783, 786, 789, 792, 793, 794, 797, 800, 801, + 804, 807, 808, 811, 814, 815, 818, 821, 822, 825, + 828, 829, 832, 835, 836, 839, 842, 843, 846, 849, + 850, 853, 856, 857, 858, 861, 864, 865, 866, 867, + 868, 871, 874, 875, 878, 881, 884, 885, 886, 887, + 888, 889, 890, 891, 892, 893, 894, 895, 896, 897, + 898, 901, 904, 905, 906, 907, 910, 913, 914, 915, + 918, 921, 922, 925, 926, 929, 930, 933, 934, 937, + 940, 941, 944, 947, 948, 951, 954, 958, 959, 960, + 961, 964, 967, 968, 969, 972, 976, 977, 978, 981, + 982, 983, 984, 987, 988, 989, 992, 995, 996, 997, + 998, 999, 1000, 1001, 1004, 1007, 1010, 1011, 1012, 1013, + 1014, 1017, 1020, 1023, 1026, 1027, 1028, 1029, 1030, 1031, + 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1042, 1045, + 1048, 1051, 1052, 1053, 1056, 1059, 1060, 1061, 1062, 1063, + 1064, 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1074, 1077, + 1078, 1081, 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091, + 1092, 1093, 1094, 1097, 1100, 1101, 1102, 1103, 1106, 1107, + 1108, 1109, 1110, 1113, 1116, 1117, 1118, 1119, 1122, 1125, + 1126, 1127, 1128, 1131, 1134, 1137, 1138, 1141, 1142, 1143, + 1144, 1147, 1150, 1151, 1154, 1157, 1158, 1159, 1160, 1161, + 1164, 1167, 1170, 1173, 1176, 1179, 1180, 1183, 1186, 1189, + 1190, 1191, 1192, 1193, 1194, 1195, 1196, 1197, 1198, 1201, + 1204, 1205, 1206, 1209, 1212, 1213, 1214, 1215, 1216, 1219, + 1222, 1223, 1226, 1229, 1230, 1231, 1232, 1233, 1236, 1237, + 1240, 1241, 1244, 1247, 1248, 1251, 1254, 1255, 1256, 1257, + 1260, 1263, 1264, 1265, 1266, 1267, 1268, 1269, 1270, 1271, + 1272, 1273, 1274, 1275, 1276, 1277, 1278, 1279, 1282, 1286, + 1287, 1288, 1289, 1292, 1295, 1296, 1297, 1298, 1301, 1304, + 1305, 1306, 1307, 1310, 1313, 1314, 1317, 1320, 1323, 1324, + 1325, 1326, 1329, 1332, 1333, 1334, 1335, 1336, 1337, 1338, + 1339, 1340, 1343, 1346, 1347, 1350, 1353, 1356, 1357, 1360, + 1363, 1366, 1369, 1372, 1375, 1378, 1379, 1380, 1381, 1382, + 1385, 1388, 1391, 1392, 1395, 1398, 1399, 1400, 1403, 1406, + 1407, 1410, 1413, 1414, 1417, 1418, 1419, 1422, 1423, 1424, + 1427, 1430, 1431, 1432, 1433, 1436, 1439, 1440, 1441, 1442, + 1445, 1448, 1449, 1452, 1455, 1456, 1459, 1462, 1465, 1468, + 1469, 1470, 1473, 1476, 1477, 1478, 1479, 1482, 1485, 1486, + 1487, 1488, 1491, 1494, 1495, 1498, 1501, 1502, 1503, 1504, + 1505, 1506, 1507, 1508, 1509, 1510, 1511, 1512, 1513, 1514, + 1515, 1518, 1521, 1522, 1523, 1524, 1525, 1528, 1531, 1532, + 1535, 1536, 1537, 1540, 1543, 1544, 1545, 1548, 1549, 1550, + 1553, 1556, 1557, 1560, 1563, 1564, 1565, 1566, 1569, 1572, + 1573, 1576, 1577, 1580, 1583, 1584, 1585, 1588, 1591, 1592, + 1595, 1598, 1599, 1600, 1601, 1602, 1605, 1608, 1609, 1612, + 1613, 1614, 1617, 1618, 1621, 1624, 1625, 1626, 1627, 1628, + 1629, 1630, 1631, 1632, 1633, 1636, 1639, 1640, 1641, 1642, + 1643, 1646, 1649, 1650, 1651, 1652, 1653, 1654, 1657, 1660, + 1661, 1662, 1665, 1668, 1669, 1670, 1673, 1676, 1677, 1678, + 1679, 1680, 1683, 1684, 1688, 1689, 1692, 1695, 1696, 1697, + 1698, 1701, 1704, 1707, 1708, 1709, 1712, 1715, 1716, 1717, + 1720, 1723, 1724, 1725, 1726, 1729, 1732, 1733, 1734, 1735, + 1738, 1741, 1742, 1745, 1748, 1749, 1750, 1751, 1754, 1757, + 1758, 1759, 1760, 1761, 1764, 1767, 1770, 1771, 1774, 1777, + 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1787, 1790, 1794, + 1795, 1796, 1797, 1800, 1804, 1805, 1806, 1807, 1810, 1813, + 1814, 1817, 1820, 1823, 1824, 1825, 1826, 1827, 1828, 1829, + 1830, 1831, 1832, 1835, 1838, 1841, 1842, 1845, 1848, 1849, + 1852, 1855, 1858, 1859, 1862, 1865, 1866, 1869, 1872, 1875, + 1876, 1877, 1878, 1881, 1884, 1885, 1888, 1891, 1892, 1893, + 1894, 1897, 1900, 1901, 1904, 1907, 1908, 1911, 1914, 1917, + 1918, 1921, 1924, 1925, 1926, 1927, 1928, 1929, 1930, 1931, + 1932, 1933, 1934, 1935, 1936, 1939, 1942, 1943, 1944, 1945, + 1946, 1947, 1948, 1949, 1950, 1951, 1954, 1957, 1958, 1959, + 1960, 1963, 1966, 1967, 1968, 1969, 1972, 1975, 1976, 1977, + 1980, 1983, 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, + 1992, 1993, 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006, 2007, 2008, 2009, 2010, 2011, 2014, 2017, 2018, 2019, + 2022, 2025, 2028, 2029, 2030, 2031, 2032, 2035, 2036, 2039, + 2040, 2043, 2058, 2059, 2060, 2061, 2064, 2067, 2068, 2071, + 2074, 2075, 2078, 2081, 2082, 2083, 2084, 2085, 2088, 2091, + 2094, 2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, + 2106, 2107, 2108, 2111, 2112, 2113, 2114, 2115, 2116, 2119, + 2122, 2123, 2124, 2127, 2130, 2131, 2134, 2137, 2138, 2139, + 2140, 2143, 2147, 2148, 2151, 2152, 2155, 2158, 2159, 2162, + 2165, 2168, 2169, 2172, 2175, 2178, 2181, 2182, 2183, 2184, + 2187, 2190, 2191, 2194, 2197, 2200, 2201, 2202, 2203, 2204, + 2205, 2208, 2211, 2212, 2213, 2214, 2217, 2220, 2221, 2224, + 2227, 2228, 2231, 2234, 2235, 2238, 2241, 2242, 2245, 2248, + 2249, 2250, 2251, 2254, 2257, 2258, 2259, 2262, 2263, 2264, + 2267, 2270, 2273, 2274, 2275, 2276, 2279, 2280, 2283, 2286, + 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2296, 2297, 2298, + 2299, 2300, 2301, 2302, 2305, 2308, 2309, 2312, 2315, 2316, + 2317, 2320, 2323, 2324, 2325, 2326, 2329, 2330, 2331, 2334, + 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2346, 2349, 2352, + 2353, 2356, 2357, 2358, 2361, 2365, 2368, 2369, 2370, 2371, + 2372, 2375, 2379, 2380, 2383, 2384, 2387, 2388, 2391, 2392, + 2395, 2396, 2399, 2402, 2403, 2404, 2407, 2410, 2411, 2412, + 2413, 2416, 2419, 2420, 2421, 2422, 2423, 2424, 2427, 2430, + 2433, 2436, 2437, 2438, 2439, 2442, 2445, 2446, 2447, 2448, + 2449, 2450, 2451, 2452, 2453, 2454, 2455, 2456, 2457, 2458, + 2459, 2460, 2463, 2466, 2469, 2470, 2471, 2472, 2473, 2476, + 2477, 2480, 2481, 2484, 2487, 2490, 2491, 2492, 2493, 2494, + 2495, 2498, 2501, 2502, 2503, 2506, 2509, 2510, 2511, 2512, + 2513, 2514, 2515, 2516, 2517, 2520, 2523, 2526, 2529, 2530, + 2533, 2536, 2537, 2538, 2539, 2540, 2541, 2542, 2543, 2544, + 2545, 2548, 2551, 2554, 2557, 2560, 2563, 2564, 2565, 2566, + 2569, 2572, 2573, 2574, 2575, 2576, 2577, 2578, 2581, 2584, + 2585, 2586, 2587, 2588, 2589, 2590, 2593, 2596, 2599, 2602 }; #endif @@ -3371,541 +3370,541 @@ switch (yyn) { case 2: -#line 514 "edif.y" /* yacc.c:1646 */ +#line 513 "edif.y" /* yacc.c:1646 */ { PopC(); } -#line 3377 "edif.c" /* yacc.c:1646 */ +#line 3376 "edif.c" /* yacc.c:1646 */ break; case 11: -#line 529 "edif.y" /* yacc.c:1646 */ +#line 528 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3383 "edif.c" /* yacc.c:1646 */ +#line 3382 "edif.c" /* yacc.c:1646 */ break; case 12: -#line 532 "edif.y" /* yacc.c:1646 */ +#line 531 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3389 "edif.c" /* yacc.c:1646 */ +#line 3388 "edif.c" /* yacc.c:1646 */ break; case 13: -#line 536 "edif.y" /* yacc.c:1646 */ +#line 535 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-3].s)); free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 3395 "edif.c" /* yacc.c:1646 */ +#line 3394 "edif.c" /* yacc.c:1646 */ break; case 25: -#line 560 "edif.y" /* yacc.c:1646 */ +#line 559 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3401 "edif.c" /* yacc.c:1646 */ +#line 3400 "edif.c" /* yacc.c:1646 */ break; case 34: -#line 577 "edif.y" /* yacc.c:1646 */ +#line 576 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[-3].ps)); free((yyvsp[-2].s)); } -#line 3407 "edif.c" /* yacc.c:1646 */ +#line 3406 "edif.c" /* yacc.c:1646 */ break; case 36: -#line 581 "edif.y" /* yacc.c:1646 */ +#line 580 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3413 "edif.c" /* yacc.c:1646 */ +#line 3412 "edif.c" /* yacc.c:1646 */ break; case 47: -#line 606 "edif.y" /* yacc.c:1646 */ +#line 605 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3419 "edif.c" /* yacc.c:1646 */ +#line 3418 "edif.c" /* yacc.c:1646 */ break; case 69: -#line 654 "edif.y" /* yacc.c:1646 */ +#line 653 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-3].s)); free((yyvsp[-2].s)); } -#line 3425 "edif.c" /* yacc.c:1646 */ +#line 3424 "edif.c" /* yacc.c:1646 */ break; case 70: -#line 657 "edif.y" /* yacc.c:1646 */ +#line 656 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3431 "edif.c" /* yacc.c:1646 */ +#line 3430 "edif.c" /* yacc.c:1646 */ break; case 80: -#line 675 "edif.y" /* yacc.c:1646 */ +#line 674 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3437 "edif.c" /* yacc.c:1646 */ +#line 3436 "edif.c" /* yacc.c:1646 */ break; case 84: -#line 685 "edif.y" /* yacc.c:1646 */ +#line 684 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3443 "edif.c" /* yacc.c:1646 */ +#line 3442 "edif.c" /* yacc.c:1646 */ break; case 91: -#line 700 "edif.y" /* yacc.c:1646 */ +#line 699 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3449 "edif.c" /* yacc.c:1646 */ +#line 3448 "edif.c" /* yacc.c:1646 */ break; case 102: -#line 723 "edif.y" /* yacc.c:1646 */ +#line 722 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3455 "edif.c" /* yacc.c:1646 */ +#line 3454 "edif.c" /* yacc.c:1646 */ break; case 140: -#line 783 "edif.y" /* yacc.c:1646 */ +#line 782 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3461 "edif.c" /* yacc.c:1646 */ +#line 3460 "edif.c" /* yacc.c:1646 */ break; case 147: -#line 798 "edif.y" /* yacc.c:1646 */ +#line 797 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); } -#line 3467 "edif.c" /* yacc.c:1646 */ +#line 3466 "edif.c" /* yacc.c:1646 */ break; case 150: -#line 805 "edif.y" /* yacc.c:1646 */ +#line 804 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); } -#line 3473 "edif.c" /* yacc.c:1646 */ +#line 3472 "edif.c" /* yacc.c:1646 */ break; case 182: -#line 875 "edif.y" /* yacc.c:1646 */ +#line 874 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3479 "edif.c" /* yacc.c:1646 */ +#line 3478 "edif.c" /* yacc.c:1646 */ break; case 184: -#line 879 "edif.y" /* yacc.c:1646 */ +#line 878 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3485 "edif.c" /* yacc.c:1646 */ +#line 3484 "edif.c" /* yacc.c:1646 */ break; case 240: -#line 983 "edif.y" /* yacc.c:1646 */ +#line 982 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3491 "edif.c" /* yacc.c:1646 */ +#line 3490 "edif.c" /* yacc.c:1646 */ break; case 247: -#line 996 "edif.y" /* yacc.c:1646 */ +#line 995 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3497 "edif.c" /* yacc.c:1646 */ +#line 3496 "edif.c" /* yacc.c:1646 */ break; case 278: -#line 1043 "edif.y" /* yacc.c:1646 */ +#line 1042 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3503 "edif.c" /* yacc.c:1646 */ +#line 3502 "edif.c" /* yacc.c:1646 */ break; case 279: -#line 1046 "edif.y" /* yacc.c:1646 */ +#line 1045 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3509 "edif.c" /* yacc.c:1646 */ +#line 3508 "edif.c" /* yacc.c:1646 */ break; case 333: -#line 1132 "edif.y" /* yacc.c:1646 */ +#line 1131 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-3].s)); free((yyvsp[-2].s)); } -#line 3515 "edif.c" /* yacc.c:1646 */ +#line 3514 "edif.c" /* yacc.c:1646 */ break; case 336: -#line 1139 "edif.y" /* yacc.c:1646 */ +#line 1138 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3521 "edif.c" /* yacc.c:1646 */ +#line 3520 "edif.c" /* yacc.c:1646 */ break; case 337: -#line 1142 "edif.y" /* yacc.c:1646 */ +#line 1141 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3527 "edif.c" /* yacc.c:1646 */ +#line 3526 "edif.c" /* yacc.c:1646 */ break; case 344: -#line 1155 "edif.y" /* yacc.c:1646 */ +#line 1154 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); } -#line 3533 "edif.c" /* yacc.c:1646 */ +#line 3532 "edif.c" /* yacc.c:1646 */ break; case 346: -#line 1159 "edif.y" /* yacc.c:1646 */ +#line 1158 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3539 "edif.c" /* yacc.c:1646 */ +#line 3538 "edif.c" /* yacc.c:1646 */ break; case 347: -#line 1160 "edif.y" /* yacc.c:1646 */ +#line 1159 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3545 "edif.c" /* yacc.c:1646 */ +#line 3544 "edif.c" /* yacc.c:1646 */ break; case 348: -#line 1161 "edif.y" /* yacc.c:1646 */ +#line 1160 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3551 "edif.c" /* yacc.c:1646 */ +#line 3550 "edif.c" /* yacc.c:1646 */ break; case 369: -#line 1202 "edif.y" /* yacc.c:1646 */ +#line 1201 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[-2].s); } -#line 3557 "edif.c" /* yacc.c:1646 */ +#line 3556 "edif.c" /* yacc.c:1646 */ break; case 371: -#line 1206 "edif.y" /* yacc.c:1646 */ +#line 1205 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3563 "edif.c" /* yacc.c:1646 */ +#line 3562 "edif.c" /* yacc.c:1646 */ break; case 374: -#line 1213 "edif.y" /* yacc.c:1646 */ +#line 1212 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3569 "edif.c" /* yacc.c:1646 */ +#line 3568 "edif.c" /* yacc.c:1646 */ break; case 381: -#line 1224 "edif.y" /* yacc.c:1646 */ +#line 1223 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3575 "edif.c" /* yacc.c:1646 */ +#line 3574 "edif.c" /* yacc.c:1646 */ break; case 384: -#line 1231 "edif.y" /* yacc.c:1646 */ +#line 1230 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3581 "edif.c" /* yacc.c:1646 */ +#line 3580 "edif.c" /* yacc.c:1646 */ break; case 388: -#line 1237 "edif.y" /* yacc.c:1646 */ +#line 1236 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3587 "edif.c" /* yacc.c:1646 */ +#line 3586 "edif.c" /* yacc.c:1646 */ break; case 390: -#line 1241 "edif.y" /* yacc.c:1646 */ +#line 1240 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3593 "edif.c" /* yacc.c:1646 */ +#line 3592 "edif.c" /* yacc.c:1646 */ break; case 393: -#line 1248 "edif.y" /* yacc.c:1646 */ +#line 1247 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3599 "edif.c" /* yacc.c:1646 */ +#line 3598 "edif.c" /* yacc.c:1646 */ break; case 397: -#line 1256 "edif.y" /* yacc.c:1646 */ +#line 1255 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3605 "edif.c" /* yacc.c:1646 */ +#line 3604 "edif.c" /* yacc.c:1646 */ break; case 408: -#line 1271 "edif.y" /* yacc.c:1646 */ +#line 1270 "edif.y" /* yacc.c:1646 */ { pair_list_free((yyvsp[0].pl)); } -#line 3611 "edif.c" /* yacc.c:1646 */ +#line 3610 "edif.c" /* yacc.c:1646 */ break; case 437: -#line 1321 "edif.y" /* yacc.c:1646 */ +#line 1320 "edif.y" /* yacc.c:1646 */ { (yyval.pl) = new_pair_list((yyvsp[-1].ps)); } -#line 3617 "edif.c" /* yacc.c:1646 */ +#line 3616 "edif.c" /* yacc.c:1646 */ break; case 438: -#line 1324 "edif.y" /* yacc.c:1646 */ +#line 1323 "edif.y" /* yacc.c:1646 */ { (yyval.ps)=NULL; } -#line 3623 "edif.c" /* yacc.c:1646 */ +#line 3622 "edif.c" /* yacc.c:1646 */ break; case 439: -#line 1325 "edif.y" /* yacc.c:1646 */ +#line 1324 "edif.y" /* yacc.c:1646 */ { (yyvsp[0].ps)->next = (yyvsp[-1].ps); (yyval.ps) = (yyvsp[0].ps); } -#line 3629 "edif.c" /* yacc.c:1646 */ +#line 3628 "edif.c" /* yacc.c:1646 */ break; case 455: -#line 1351 "edif.y" /* yacc.c:1646 */ +#line 1350 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3635 "edif.c" /* yacc.c:1646 */ +#line 3634 "edif.c" /* yacc.c:1646 */ break; case 459: -#line 1361 "edif.y" /* yacc.c:1646 */ +#line 1360 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3641 "edif.c" /* yacc.c:1646 */ +#line 3640 "edif.c" /* yacc.c:1646 */ break; case 460: -#line 1364 "edif.y" /* yacc.c:1646 */ +#line 1363 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3647 "edif.c" /* yacc.c:1646 */ +#line 3646 "edif.c" /* yacc.c:1646 */ break; case 462: -#line 1370 "edif.y" /* yacc.c:1646 */ +#line 1369 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3653 "edif.c" /* yacc.c:1646 */ +#line 3652 "edif.c" /* yacc.c:1646 */ break; case 463: -#line 1373 "edif.y" /* yacc.c:1646 */ +#line 1372 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3659 "edif.c" /* yacc.c:1646 */ +#line 3658 "edif.c" /* yacc.c:1646 */ break; case 483: -#line 1415 "edif.y" /* yacc.c:1646 */ +#line 1414 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3665 "edif.c" /* yacc.c:1646 */ +#line 3664 "edif.c" /* yacc.c:1646 */ break; case 484: -#line 1418 "edif.y" /* yacc.c:1646 */ +#line 1417 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3671 "edif.c" /* yacc.c:1646 */ +#line 3670 "edif.c" /* yacc.c:1646 */ break; case 492: -#line 1432 "edif.y" /* yacc.c:1646 */ +#line 1431 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3677 "edif.c" /* yacc.c:1646 */ +#line 3676 "edif.c" /* yacc.c:1646 */ break; case 506: -#line 1460 "edif.y" /* yacc.c:1646 */ +#line 1459 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3683 "edif.c" /* yacc.c:1646 */ +#line 3682 "edif.c" /* yacc.c:1646 */ break; case 507: -#line 1463 "edif.y" /* yacc.c:1646 */ +#line 1462 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3689 "edif.c" /* yacc.c:1646 */ +#line 3688 "edif.c" /* yacc.c:1646 */ break; case 514: -#line 1478 "edif.y" /* yacc.c:1646 */ +#line 1477 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3695 "edif.c" /* yacc.c:1646 */ +#line 3694 "edif.c" /* yacc.c:1646 */ break; case 549: -#line 1533 "edif.y" /* yacc.c:1646 */ +#line 1532 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3701 "edif.c" /* yacc.c:1646 */ +#line 3700 "edif.c" /* yacc.c:1646 */ break; case 555: -#line 1545 "edif.y" /* yacc.c:1646 */ +#line 1544 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3707 "edif.c" /* yacc.c:1646 */ +#line 3706 "edif.c" /* yacc.c:1646 */ break; case 560: -#line 1554 "edif.y" /* yacc.c:1646 */ +#line 1553 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); } -#line 3713 "edif.c" /* yacc.c:1646 */ +#line 3712 "edif.c" /* yacc.c:1646 */ break; case 561: -#line 1557 "edif.y" /* yacc.c:1646 */ +#line 1556 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3719 "edif.c" /* yacc.c:1646 */ +#line 3718 "edif.c" /* yacc.c:1646 */ break; case 562: -#line 1558 "edif.y" /* yacc.c:1646 */ +#line 1557 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3725 "edif.c" /* yacc.c:1646 */ +#line 3724 "edif.c" /* yacc.c:1646 */ break; case 582: -#line 1600 "edif.y" /* yacc.c:1646 */ +#line 1599 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3731 "edif.c" /* yacc.c:1646 */ +#line 3730 "edif.c" /* yacc.c:1646 */ break; case 585: -#line 1603 "edif.y" /* yacc.c:1646 */ +#line 1602 "edif.y" /* yacc.c:1646 */ { pair_list_free((yyvsp[0].pl)); } -#line 3737 "edif.c" /* yacc.c:1646 */ +#line 3736 "edif.c" /* yacc.c:1646 */ break; case 586: -#line 1606 "edif.y" /* yacc.c:1646 */ +#line 1605 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[-1].s); } -#line 3743 "edif.c" /* yacc.c:1646 */ +#line 3742 "edif.c" /* yacc.c:1646 */ break; case 587: -#line 1609 "edif.y" /* yacc.c:1646 */ +#line 1608 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3749 "edif.c" /* yacc.c:1646 */ +#line 3748 "edif.c" /* yacc.c:1646 */ break; case 589: -#line 1613 "edif.y" /* yacc.c:1646 */ +#line 1612 "edif.y" /* yacc.c:1646 */ { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); } -#line 3755 "edif.c" /* yacc.c:1646 */ +#line 3754 "edif.c" /* yacc.c:1646 */ break; case 590: -#line 1614 "edif.y" /* yacc.c:1646 */ +#line 1613 "edif.y" /* yacc.c:1646 */ { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); } -#line 3761 "edif.c" /* yacc.c:1646 */ +#line 3760 "edif.c" /* yacc.c:1646 */ break; case 591: -#line 1615 "edif.y" /* yacc.c:1646 */ +#line 1614 "edif.y" /* yacc.c:1646 */ { (yyval.ps)=(yyvsp[0].ps); } -#line 3767 "edif.c" /* yacc.c:1646 */ +#line 3766 "edif.c" /* yacc.c:1646 */ break; case 592: -#line 1618 "edif.y" /* yacc.c:1646 */ +#line 1617 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3773 "edif.c" /* yacc.c:1646 */ +#line 3772 "edif.c" /* yacc.c:1646 */ break; case 593: -#line 1619 "edif.y" /* yacc.c:1646 */ +#line 1618 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3779 "edif.c" /* yacc.c:1646 */ +#line 3778 "edif.c" /* yacc.c:1646 */ break; case 594: -#line 1622 "edif.y" /* yacc.c:1646 */ +#line 1621 "edif.y" /* yacc.c:1646 */ { define_pcb_net((yyvsp[-2].ps), (yyvsp[-1].pl)); } -#line 3785 "edif.c" /* yacc.c:1646 */ +#line 3784 "edif.c" /* yacc.c:1646 */ break; case 595: -#line 1625 "edif.y" /* yacc.c:1646 */ +#line 1624 "edif.y" /* yacc.c:1646 */ { (yyval.pl)=(yyvsp[0].pl); } -#line 3791 "edif.c" /* yacc.c:1646 */ +#line 3790 "edif.c" /* yacc.c:1646 */ break; case 611: -#line 1647 "edif.y" /* yacc.c:1646 */ +#line 1646 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[-2].ps)); } -#line 3797 "edif.c" /* yacc.c:1646 */ +#line 3796 "edif.c" /* yacc.c:1646 */ break; case 632: -#line 1684 "edif.y" /* yacc.c:1646 */ +#line 1683 "edif.y" /* yacc.c:1646 */ { (yyval.ps)=(yyvsp[0].ps); } -#line 3803 "edif.c" /* yacc.c:1646 */ +#line 3802 "edif.c" /* yacc.c:1646 */ break; case 633: -#line 1685 "edif.y" /* yacc.c:1646 */ +#line 1684 "edif.y" /* yacc.c:1646 */ { (yyval.ps)=NULL; } -#line 3809 "edif.c" /* yacc.c:1646 */ +#line 3808 "edif.c" /* yacc.c:1646 */ break; case 634: -#line 1689 "edif.y" /* yacc.c:1646 */ +#line 1688 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3815 "edif.c" /* yacc.c:1646 */ +#line 3814 "edif.c" /* yacc.c:1646 */ break; case 639: -#line 1698 "edif.y" /* yacc.c:1646 */ +#line 1697 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3821 "edif.c" /* yacc.c:1646 */ +#line 3820 "edif.c" /* yacc.c:1646 */ break; case 644: -#line 1709 "edif.y" /* yacc.c:1646 */ +#line 1708 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3827 "edif.c" /* yacc.c:1646 */ +#line 3826 "edif.c" /* yacc.c:1646 */ break; case 698: -#line 1811 "edif.y" /* yacc.c:1646 */ +#line 1810 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-3].s)); } -#line 3833 "edif.c" /* yacc.c:1646 */ +#line 3832 "edif.c" /* yacc.c:1646 */ break; case 701: -#line 1818 "edif.y" /* yacc.c:1646 */ +#line 1817 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3839 "edif.c" /* yacc.c:1646 */ +#line 3838 "edif.c" /* yacc.c:1646 */ break; case 727: -#line 1870 "edif.y" /* yacc.c:1646 */ +#line 1869 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 3845 "edif.c" /* yacc.c:1646 */ +#line 3844 "edif.c" /* yacc.c:1646 */ break; case 730: -#line 1877 "edif.y" /* yacc.c:1646 */ +#line 1876 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3851 "edif.c" /* yacc.c:1646 */ +#line 3850 "edif.c" /* yacc.c:1646 */ break; case 747: -#line 1912 "edif.y" /* yacc.c:1646 */ +#line 1911 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 3857 "edif.c" /* yacc.c:1646 */ +#line 3856 "edif.c" /* yacc.c:1646 */ break; case 766: -#line 1943 "edif.y" /* yacc.c:1646 */ +#line 1942 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3863 "edif.c" /* yacc.c:1646 */ +#line 3862 "edif.c" /* yacc.c:1646 */ break; case 789: -#line 1978 "edif.y" /* yacc.c:1646 */ +#line 1977 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3869 "edif.c" /* yacc.c:1646 */ +#line 3868 "edif.c" /* yacc.c:1646 */ break; case 791: -#line 1984 "edif.y" /* yacc.c:1646 */ +#line 1983 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3875 "edif.c" /* yacc.c:1646 */ +#line 3874 "edif.c" /* yacc.c:1646 */ break; case 803: -#line 2000 "edif.y" /* yacc.c:1646 */ +#line 1999 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3881 "edif.c" /* yacc.c:1646 */ +#line 3880 "edif.c" /* yacc.c:1646 */ break; case 818: -#line 2019 "edif.y" /* yacc.c:1646 */ +#line 2018 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3887 "edif.c" /* yacc.c:1646 */ +#line 3886 "edif.c" /* yacc.c:1646 */ break; case 823: -#line 2030 "edif.y" /* yacc.c:1646 */ +#line 2029 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3893 "edif.c" /* yacc.c:1646 */ +#line 3892 "edif.c" /* yacc.c:1646 */ break; case 827: -#line 2036 "edif.y" /* yacc.c:1646 */ +#line 2035 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3899 "edif.c" /* yacc.c:1646 */ +#line 3898 "edif.c" /* yacc.c:1646 */ break; case 829: -#line 2040 "edif.y" /* yacc.c:1646 */ +#line 2039 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3905 "edif.c" /* yacc.c:1646 */ +#line 3904 "edif.c" /* yacc.c:1646 */ break; case 831: -#line 2045 "edif.y" /* yacc.c:1646 */ +#line 2044 "edif.y" /* yacc.c:1646 */ { if ((yyvsp[-1].ps)) { @@ -3918,251 +3917,251 @@ (yyval.ps) = new_str_pair(NULL,(yyvsp[-2].s)); } } -#line 3922 "edif.c" /* yacc.c:1646 */ +#line 3921 "edif.c" /* yacc.c:1646 */ break; case 832: -#line 2059 "edif.y" /* yacc.c:1646 */ +#line 2058 "edif.y" /* yacc.c:1646 */ { (yyval.ps)=NULL; } -#line 3928 "edif.c" /* yacc.c:1646 */ +#line 3927 "edif.c" /* yacc.c:1646 */ break; case 833: -#line 2060 "edif.y" /* yacc.c:1646 */ +#line 2059 "edif.y" /* yacc.c:1646 */ { (yyval.ps)=(yyvsp[0].ps); } -#line 3934 "edif.c" /* yacc.c:1646 */ +#line 3933 "edif.c" /* yacc.c:1646 */ break; case 834: -#line 2061 "edif.y" /* yacc.c:1646 */ +#line 2060 "edif.y" /* yacc.c:1646 */ { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); } -#line 3940 "edif.c" /* yacc.c:1646 */ +#line 3939 "edif.c" /* yacc.c:1646 */ break; case 835: -#line 2062 "edif.y" /* yacc.c:1646 */ +#line 2061 "edif.y" /* yacc.c:1646 */ { (yyval.ps)=NULL; } -#line 3946 "edif.c" /* yacc.c:1646 */ +#line 3945 "edif.c" /* yacc.c:1646 */ break; case 848: -#line 2089 "edif.y" /* yacc.c:1646 */ +#line 2088 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3952 "edif.c" /* yacc.c:1646 */ +#line 3951 "edif.c" /* yacc.c:1646 */ break; case 849: -#line 2092 "edif.y" /* yacc.c:1646 */ +#line 2091 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 3958 "edif.c" /* yacc.c:1646 */ +#line 3957 "edif.c" /* yacc.c:1646 */ break; case 881: -#line 2145 "edif.y" /* yacc.c:1646 */ +#line 2144 "edif.y" /* yacc.c:1646 */ { (yyval.ps) = new_str_pair((yyvsp[-2].s),(yyvsp[-1].s)); } -#line 3964 "edif.c" /* yacc.c:1646 */ +#line 3963 "edif.c" /* yacc.c:1646 */ break; case 882: -#line 2148 "edif.y" /* yacc.c:1646 */ +#line 2147 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3970 "edif.c" /* yacc.c:1646 */ +#line 3969 "edif.c" /* yacc.c:1646 */ break; case 883: -#line 2149 "edif.y" /* yacc.c:1646 */ +#line 2148 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3976 "edif.c" /* yacc.c:1646 */ +#line 3975 "edif.c" /* yacc.c:1646 */ break; case 884: -#line 2152 "edif.y" /* yacc.c:1646 */ +#line 2151 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 3982 "edif.c" /* yacc.c:1646 */ +#line 3981 "edif.c" /* yacc.c:1646 */ break; case 885: -#line 2153 "edif.y" /* yacc.c:1646 */ +#line 2152 "edif.y" /* yacc.c:1646 */ { (yyval.s)=NULL; } -#line 3988 "edif.c" /* yacc.c:1646 */ +#line 3987 "edif.c" /* yacc.c:1646 */ break; case 889: -#line 2163 "edif.y" /* yacc.c:1646 */ +#line 2162 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 3994 "edif.c" /* yacc.c:1646 */ +#line 3993 "edif.c" /* yacc.c:1646 */ break; case 891: -#line 2169 "edif.y" /* yacc.c:1646 */ +#line 2168 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4000 "edif.c" /* yacc.c:1646 */ +#line 3999 "edif.c" /* yacc.c:1646 */ break; case 892: -#line 2170 "edif.y" /* yacc.c:1646 */ +#line 2169 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 4006 "edif.c" /* yacc.c:1646 */ +#line 4005 "edif.c" /* yacc.c:1646 */ break; case 893: -#line 2173 "edif.y" /* yacc.c:1646 */ +#line 2172 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 4012 "edif.c" /* yacc.c:1646 */ +#line 4011 "edif.c" /* yacc.c:1646 */ break; case 894: -#line 2176 "edif.y" /* yacc.c:1646 */ +#line 2175 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-2].s)); free((yyvsp[-1].s)); } -#line 4018 "edif.c" /* yacc.c:1646 */ +#line 4017 "edif.c" /* yacc.c:1646 */ break; case 896: -#line 2182 "edif.y" /* yacc.c:1646 */ +#line 2181 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4024 "edif.c" /* yacc.c:1646 */ +#line 4023 "edif.c" /* yacc.c:1646 */ break; case 898: -#line 2184 "edif.y" /* yacc.c:1646 */ +#line 2183 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4030 "edif.c" /* yacc.c:1646 */ +#line 4029 "edif.c" /* yacc.c:1646 */ break; case 903: -#line 2195 "edif.y" /* yacc.c:1646 */ +#line 2194 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4036 "edif.c" /* yacc.c:1646 */ +#line 4035 "edif.c" /* yacc.c:1646 */ break; case 935: -#line 2259 "edif.y" /* yacc.c:1646 */ +#line 2258 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4042 "edif.c" /* yacc.c:1646 */ +#line 4041 "edif.c" /* yacc.c:1646 */ break; case 943: -#line 2275 "edif.y" /* yacc.c:1646 */ +#line 2274 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4048 "edif.c" /* yacc.c:1646 */ +#line 4047 "edif.c" /* yacc.c:1646 */ break; case 946: -#line 2280 "edif.y" /* yacc.c:1646 */ +#line 2279 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4054 "edif.c" /* yacc.c:1646 */ +#line 4053 "edif.c" /* yacc.c:1646 */ break; case 973: -#line 2325 "edif.y" /* yacc.c:1646 */ +#line 2324 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4060 "edif.c" /* yacc.c:1646 */ +#line 4059 "edif.c" /* yacc.c:1646 */ break; case 987: -#line 2347 "edif.y" /* yacc.c:1646 */ +#line 2346 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 4066 "edif.c" /* yacc.c:1646 */ +#line 4065 "edif.c" /* yacc.c:1646 */ break; case 994: -#line 2363 "edif.y" /* yacc.c:1646 */ +#line 2362 "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 4072 "edif.c" /* yacc.c:1646 */ +#line 4071 "edif.c" /* yacc.c:1646 */ break; case 1054: -#line 2470 "edif.y" /* yacc.c:1646 */ +#line 2469 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4078 "edif.c" /* yacc.c:1646 */ +#line 4077 "edif.c" /* yacc.c:1646 */ break; case 1055: -#line 2471 "edif.y" /* yacc.c:1646 */ +#line 2470 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4084 "edif.c" /* yacc.c:1646 */ +#line 4083 "edif.c" /* yacc.c:1646 */ break; case 1056: -#line 2472 "edif.y" /* yacc.c:1646 */ +#line 2471 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4090 "edif.c" /* yacc.c:1646 */ +#line 4089 "edif.c" /* yacc.c:1646 */ break; case 1057: -#line 2473 "edif.y" /* yacc.c:1646 */ +#line 2472 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4096 "edif.c" /* yacc.c:1646 */ +#line 4095 "edif.c" /* yacc.c:1646 */ break; case 1059: -#line 2477 "edif.y" /* yacc.c:1646 */ +#line 2476 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4102 "edif.c" /* yacc.c:1646 */ +#line 4101 "edif.c" /* yacc.c:1646 */ break; case 1061: -#line 2481 "edif.y" /* yacc.c:1646 */ +#line 2480 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4108 "edif.c" /* yacc.c:1646 */ +#line 4107 "edif.c" /* yacc.c:1646 */ break; case 1063: -#line 2485 "edif.y" /* yacc.c:1646 */ +#line 2484 "edif.y" /* yacc.c:1646 */ { free((yyvsp[-1].s)); } -#line 4114 "edif.c" /* yacc.c:1646 */ +#line 4113 "edif.c" /* yacc.c:1646 */ break; case 1085: -#line 2521 "edif.y" /* yacc.c:1646 */ +#line 2520 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4120 "edif.c" /* yacc.c:1646 */ +#line 4119 "edif.c" /* yacc.c:1646 */ break; case 1086: -#line 2524 "edif.y" /* yacc.c:1646 */ +#line 2523 "edif.y" /* yacc.c:1646 */ { free((yyvsp[0].s)); } -#line 4126 "edif.c" /* yacc.c:1646 */ +#line 4125 "edif.c" /* yacc.c:1646 */ break; case 1107: -#line 2565 "edif.y" /* yacc.c:1646 */ +#line 2564 "edif.y" /* yacc.c:1646 */ { str_pair_free((yyvsp[0].ps)); } -#line 4132 "edif.c" /* yacc.c:1646 */ +#line 4131 "edif.c" /* yacc.c:1646 */ break; case 1109: -#line 2567 "edif.y" /* yacc.c:1646 */ +#line 2566 "edif.y" /* yacc.c:1646 */ { pair_list_free((yyvsp[0].pl)); } -#line 4138 "edif.c" /* yacc.c:1646 */ +#line 4137 "edif.c" /* yacc.c:1646 */ break; case 1126: -#line 2594 "edif.y" /* yacc.c:1646 */ +#line 2593 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4144 "edif.c" /* yacc.c:1646 */ +#line 4143 "edif.c" /* yacc.c:1646 */ break; case 1127: -#line 2597 "edif.y" /* yacc.c:1646 */ +#line 2596 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4150 "edif.c" /* yacc.c:1646 */ +#line 4149 "edif.c" /* yacc.c:1646 */ break; case 1128: -#line 2600 "edif.y" /* yacc.c:1646 */ +#line 2599 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4156 "edif.c" /* yacc.c:1646 */ +#line 4155 "edif.c" /* yacc.c:1646 */ break; case 1129: -#line 2603 "edif.y" /* yacc.c:1646 */ +#line 2602 "edif.y" /* yacc.c:1646 */ { (yyval.s)=(yyvsp[0].s); } -#line 4162 "edif.c" /* yacc.c:1646 */ +#line 4161 "edif.c" /* yacc.c:1646 */ break; -#line 4166 "edif.c" /* yacc.c:1646 */ +#line 4165 "edif.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -4390,7 +4389,7 @@ #endif return yyresult; } -#line 2606 "edif.y" /* yacc.c:1906 */ +#line 2605 "edif.y" /* yacc.c:1906 */ /* * xmalloc: Index: edif.h =================================================================== --- edif.h (revision 23327) +++ edif.h (revision 23328) @@ -345,7 +345,7 @@ typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 202 "edif.y" /* yacc.c:1909 */ +#line 201 "edif.y" /* yacc.c:1909 */ char* s; pair_list* pl; Index: edif.y =================================================================== --- edif.y (revision 23327) +++ edif.y (revision 23328) @@ -29,7 +29,6 @@ #include "math_helper.h" #include "board.h" #include "data.h" -#include "library.h" #include "error.h" #include "plugins.h" #include "compat_misc.h" Index: import_edif.c =================================================================== --- import_edif.c (revision 23327) +++ import_edif.c (revision 23328) @@ -32,7 +32,6 @@ #include "data.h" #include "plugins.h" #include "plug_import.h" -#include "netlist.h" #include "rats_patch.h" /* for pcb_sort_library only */