Index: edif.c
===================================================================
--- edif.c	(revision 23711)
+++ edif.c	(revision 23712)
@@ -263,7 +263,7 @@
  static void yyerror(const char *);
  static void PopC(void);
 
-#line 268 "edif.c" /* yacc.c:339  */
+#line 267 "edif.c" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -598,13 +598,13 @@
 typedef union YYSTYPE YYSTYPE;
 union YYSTYPE
 {
-#line 197 "edif.y" /* yacc.c:355  */
+#line 196 "edif.y" /* yacc.c:355  */
 
     char* s;
     pair_list* pl;
     str_pair* ps;
 
-#line 609 "edif.c" /* yacc.c:355  */
+#line 608 "edif.c" /* yacc.c:355  */
 };
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
@@ -619,7 +619,7 @@
 
 /* Copy the second part of user declarations.  */
 
-#line 624 "edif.c" /* yacc.c:358  */
+#line 623 "edif.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -945,119 +945,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,   508,   508,   511,   514,   515,   516,   517,   518,   519,
+     520,   523,   526,   529,   533,   536,   537,   540,   543,   544,
+     545,   546,   547,   548,   551,   554,   555,   558,   561,   562,
+     563,   564,   565,   568,   571,   574,   575,   578,   581,   584,
+     585,   586,   587,   588,   591,   594,   597,   600,   603,   606,
+     609,   610,   611,   614,   617,   618,   621,   622,   625,   628,
+     629,   630,   631,   634,   637,   638,   641,   644,   645,   648,
+     651,   654,   657,   660,   661,   662,   663,   664,   665,   666,
+     669,   672,   675,   676,   679,   682,   685,   686,   687,   690,
+     693,   694,   695,   698,   699,   700,   703,   706,   707,   710,
+     713,   716,   717,   720,   723,   724,   725,   726,   727,   728,
+     729,   730,   733,   736,   739,   740,   741,   742,   743,   744,
+     745,   746,   747,   748,   749,   750,   751,   752,   753,   754,
+     755,   756,   759,   762,   763,   766,   769,   770,   771,   774,
+     777,   778,   781,   784,   787,   788,   789,   792,   795,   796,
+     799,   802,   803,   806,   809,   810,   813,   816,   817,   820,
+     823,   824,   827,   830,   831,   834,   837,   838,   841,   844,
+     845,   848,   851,   852,   853,   856,   859,   860,   861,   862,
+     863,   866,   869,   870,   873,   876,   879,   880,   881,   882,
+     883,   884,   885,   886,   887,   888,   889,   890,   891,   892,
+     893,   896,   899,   900,   901,   902,   905,   908,   909,   910,
+     913,   916,   917,   920,   921,   924,   925,   928,   929,   932,
+     935,   936,   939,   942,   943,   946,   949,   953,   954,   955,
+     956,   959,   962,   963,   964,   967,   971,   972,   973,   976,
+     977,   978,   979,   982,   983,   984,   987,   990,   991,   992,
+     993,   994,   995,   996,   999,  1002,  1005,  1006,  1007,  1008,
+    1009,  1012,  1015,  1018,  1021,  1022,  1023,  1024,  1025,  1026,
+    1027,  1028,  1029,  1030,  1031,  1032,  1033,  1034,  1037,  1040,
+    1043,  1046,  1047,  1048,  1051,  1054,  1055,  1056,  1057,  1058,
+    1059,  1060,  1061,  1062,  1063,  1064,  1065,  1066,  1069,  1072,
+    1073,  1076,  1079,  1080,  1081,  1082,  1083,  1084,  1085,  1086,
+    1087,  1088,  1089,  1092,  1095,  1096,  1097,  1098,  1101,  1102,
+    1103,  1104,  1105,  1108,  1111,  1112,  1113,  1114,  1117,  1120,
+    1121,  1122,  1123,  1126,  1129,  1132,  1133,  1136,  1137,  1138,
+    1139,  1142,  1145,  1146,  1149,  1152,  1153,  1154,  1155,  1156,
+    1159,  1162,  1165,  1168,  1171,  1174,  1175,  1178,  1181,  1184,
+    1185,  1186,  1187,  1188,  1189,  1190,  1191,  1192,  1193,  1196,
+    1199,  1200,  1201,  1204,  1207,  1208,  1209,  1210,  1211,  1214,
+    1217,  1218,  1221,  1224,  1225,  1226,  1227,  1228,  1231,  1232,
+    1235,  1236,  1239,  1242,  1243,  1246,  1249,  1250,  1251,  1252,
+    1255,  1258,  1259,  1260,  1261,  1262,  1263,  1264,  1265,  1266,
+    1267,  1268,  1269,  1270,  1271,  1272,  1273,  1274,  1277,  1281,
+    1282,  1283,  1284,  1287,  1290,  1291,  1292,  1293,  1296,  1299,
+    1300,  1301,  1302,  1305,  1308,  1309,  1312,  1315,  1318,  1319,
+    1320,  1321,  1324,  1327,  1328,  1329,  1330,  1331,  1332,  1333,
+    1334,  1335,  1338,  1341,  1342,  1345,  1348,  1351,  1352,  1355,
+    1358,  1361,  1364,  1367,  1370,  1373,  1374,  1375,  1376,  1377,
+    1380,  1383,  1386,  1387,  1390,  1393,  1394,  1395,  1398,  1401,
+    1402,  1405,  1408,  1409,  1412,  1413,  1414,  1417,  1418,  1419,
+    1422,  1425,  1426,  1427,  1428,  1431,  1434,  1435,  1436,  1437,
+    1440,  1443,  1444,  1447,  1450,  1451,  1454,  1457,  1460,  1463,
+    1464,  1465,  1468,  1471,  1472,  1473,  1474,  1477,  1480,  1481,
+    1482,  1483,  1486,  1489,  1490,  1493,  1496,  1497,  1498,  1499,
+    1500,  1501,  1502,  1503,  1504,  1505,  1506,  1507,  1508,  1509,
+    1510,  1513,  1516,  1517,  1518,  1519,  1520,  1523,  1526,  1527,
+    1530,  1531,  1532,  1535,  1538,  1539,  1540,  1543,  1544,  1545,
+    1548,  1551,  1552,  1555,  1558,  1559,  1560,  1561,  1564,  1567,
+    1568,  1571,  1572,  1575,  1578,  1579,  1580,  1583,  1586,  1587,
+    1590,  1593,  1594,  1595,  1596,  1597,  1600,  1603,  1604,  1607,
+    1608,  1609,  1612,  1613,  1616,  1619,  1620,  1621,  1622,  1623,
+    1624,  1625,  1626,  1627,  1628,  1631,  1634,  1635,  1636,  1637,
+    1638,  1641,  1644,  1645,  1646,  1647,  1648,  1649,  1652,  1655,
+    1656,  1657,  1660,  1663,  1664,  1665,  1668,  1671,  1672,  1673,
+    1674,  1675,  1678,  1679,  1683,  1684,  1687,  1690,  1691,  1692,
+    1693,  1696,  1699,  1702,  1703,  1704,  1707,  1710,  1711,  1712,
+    1715,  1718,  1719,  1720,  1721,  1724,  1727,  1728,  1729,  1730,
+    1733,  1736,  1737,  1740,  1743,  1744,  1745,  1746,  1749,  1752,
+    1753,  1754,  1755,  1756,  1759,  1762,  1765,  1766,  1769,  1772,
+    1773,  1774,  1775,  1776,  1777,  1778,  1779,  1782,  1785,  1789,
+    1790,  1791,  1792,  1795,  1799,  1800,  1801,  1802,  1805,  1808,
+    1809,  1812,  1815,  1818,  1819,  1820,  1821,  1822,  1823,  1824,
+    1825,  1826,  1827,  1830,  1833,  1836,  1837,  1840,  1843,  1844,
+    1847,  1850,  1853,  1854,  1857,  1860,  1861,  1864,  1867,  1870,
+    1871,  1872,  1873,  1876,  1879,  1880,  1883,  1886,  1887,  1888,
+    1889,  1892,  1895,  1896,  1899,  1902,  1903,  1906,  1909,  1912,
+    1913,  1916,  1919,  1920,  1921,  1922,  1923,  1924,  1925,  1926,
+    1927,  1928,  1929,  1930,  1931,  1934,  1937,  1938,  1939,  1940,
+    1941,  1942,  1943,  1944,  1945,  1946,  1949,  1952,  1953,  1954,
+    1955,  1958,  1961,  1962,  1963,  1964,  1967,  1970,  1971,  1972,
+    1975,  1978,  1979,  1980,  1981,  1982,  1983,  1984,  1985,  1986,
+    1987,  1988,  1991,  1994,  1995,  1996,  1997,  1998,  1999,  2000,
+    2001,  2002,  2003,  2004,  2005,  2006,  2009,  2012,  2013,  2014,
+    2017,  2020,  2023,  2024,  2025,  2026,  2027,  2030,  2031,  2034,
+    2035,  2038,  2053,  2054,  2055,  2056,  2059,  2062,  2063,  2066,
+    2069,  2070,  2073,  2076,  2077,  2078,  2079,  2080,  2083,  2086,
+    2089,  2092,  2093,  2094,  2095,  2096,  2097,  2098,  2099,  2100,
+    2101,  2102,  2103,  2106,  2107,  2108,  2109,  2110,  2111,  2114,
+    2117,  2118,  2119,  2122,  2125,  2126,  2129,  2132,  2133,  2134,
+    2135,  2138,  2142,  2143,  2146,  2147,  2150,  2153,  2154,  2157,
+    2160,  2163,  2164,  2167,  2170,  2173,  2176,  2177,  2178,  2179,
+    2182,  2185,  2186,  2189,  2192,  2195,  2196,  2197,  2198,  2199,
+    2200,  2203,  2206,  2207,  2208,  2209,  2212,  2215,  2216,  2219,
+    2222,  2223,  2226,  2229,  2230,  2233,  2236,  2237,  2240,  2243,
+    2244,  2245,  2246,  2249,  2252,  2253,  2254,  2257,  2258,  2259,
+    2262,  2265,  2268,  2269,  2270,  2271,  2274,  2275,  2278,  2281,
+    2284,  2285,  2286,  2287,  2288,  2289,  2290,  2291,  2292,  2293,
+    2294,  2295,  2296,  2297,  2300,  2303,  2304,  2307,  2310,  2311,
+    2312,  2315,  2318,  2319,  2320,  2321,  2324,  2325,  2326,  2329,
+    2332,  2333,  2334,  2335,  2336,  2337,  2338,  2341,  2344,  2347,
+    2348,  2351,  2352,  2353,  2356,  2360,  2363,  2364,  2365,  2366,
+    2367,  2370,  2374,  2375,  2378,  2379,  2382,  2383,  2386,  2387,
+    2390,  2391,  2394,  2397,  2398,  2399,  2402,  2405,  2406,  2407,
+    2408,  2411,  2414,  2415,  2416,  2417,  2418,  2419,  2422,  2425,
+    2428,  2431,  2432,  2433,  2434,  2437,  2440,  2441,  2442,  2443,
+    2444,  2445,  2446,  2447,  2448,  2449,  2450,  2451,  2452,  2453,
+    2454,  2455,  2458,  2461,  2464,  2465,  2466,  2467,  2468,  2471,
+    2472,  2475,  2476,  2479,  2482,  2485,  2486,  2487,  2488,  2489,
+    2490,  2493,  2496,  2497,  2498,  2501,  2504,  2505,  2506,  2507,
+    2508,  2509,  2510,  2511,  2512,  2515,  2518,  2521,  2524,  2525,
+    2528,  2531,  2532,  2533,  2534,  2535,  2536,  2537,  2538,  2539,
+    2540,  2543,  2546,  2549,  2552,  2555,  2558,  2559,  2560,  2561,
+    2564,  2567,  2568,  2569,  2570,  2571,  2572,  2573,  2576,  2579,
+    2580,  2581,  2582,  2583,  2584,  2585,  2588,  2591,  2594,  2597
 };
 #endif
 
@@ -3365,541 +3365,541 @@
   switch (yyn)
     {
         case 2:
-#line 509 "edif.y" /* yacc.c:1646  */
+#line 508 "edif.y" /* yacc.c:1646  */
     { PopC(); }
-#line 3372 "edif.c" /* yacc.c:1646  */
+#line 3371 "edif.c" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 524 "edif.y" /* yacc.c:1646  */
+#line 523 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3378 "edif.c" /* yacc.c:1646  */
+#line 3377 "edif.c" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 527 "edif.y" /* yacc.c:1646  */
+#line 526 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3384 "edif.c" /* yacc.c:1646  */
+#line 3383 "edif.c" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 531 "edif.y" /* yacc.c:1646  */
+#line 530 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-3].s)); free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 3390 "edif.c" /* yacc.c:1646  */
+#line 3389 "edif.c" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 555 "edif.y" /* yacc.c:1646  */
+#line 554 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3396 "edif.c" /* yacc.c:1646  */
+#line 3395 "edif.c" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 572 "edif.y" /* yacc.c:1646  */
+#line 571 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[-3].ps)); free((yyvsp[-2].s)); }
-#line 3402 "edif.c" /* yacc.c:1646  */
+#line 3401 "edif.c" /* yacc.c:1646  */
     break;
 
   case 36:
-#line 576 "edif.y" /* yacc.c:1646  */
+#line 575 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3408 "edif.c" /* yacc.c:1646  */
+#line 3407 "edif.c" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 601 "edif.y" /* yacc.c:1646  */
+#line 600 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3414 "edif.c" /* yacc.c:1646  */
+#line 3413 "edif.c" /* yacc.c:1646  */
     break;
 
   case 69:
-#line 649 "edif.y" /* yacc.c:1646  */
+#line 648 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-3].s)); free((yyvsp[-2].s)); }
-#line 3420 "edif.c" /* yacc.c:1646  */
+#line 3419 "edif.c" /* yacc.c:1646  */
     break;
 
   case 70:
-#line 652 "edif.y" /* yacc.c:1646  */
+#line 651 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3426 "edif.c" /* yacc.c:1646  */
+#line 3425 "edif.c" /* yacc.c:1646  */
     break;
 
   case 80:
-#line 670 "edif.y" /* yacc.c:1646  */
+#line 669 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3432 "edif.c" /* yacc.c:1646  */
+#line 3431 "edif.c" /* yacc.c:1646  */
     break;
 
   case 84:
-#line 680 "edif.y" /* yacc.c:1646  */
+#line 679 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3438 "edif.c" /* yacc.c:1646  */
+#line 3437 "edif.c" /* yacc.c:1646  */
     break;
 
   case 91:
-#line 695 "edif.y" /* yacc.c:1646  */
+#line 694 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3444 "edif.c" /* yacc.c:1646  */
+#line 3443 "edif.c" /* yacc.c:1646  */
     break;
 
   case 102:
-#line 718 "edif.y" /* yacc.c:1646  */
+#line 717 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3450 "edif.c" /* yacc.c:1646  */
+#line 3449 "edif.c" /* yacc.c:1646  */
     break;
 
   case 140:
-#line 778 "edif.y" /* yacc.c:1646  */
+#line 777 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3456 "edif.c" /* yacc.c:1646  */
+#line 3455 "edif.c" /* yacc.c:1646  */
     break;
 
   case 147:
-#line 793 "edif.y" /* yacc.c:1646  */
+#line 792 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); }
-#line 3462 "edif.c" /* yacc.c:1646  */
+#line 3461 "edif.c" /* yacc.c:1646  */
     break;
 
   case 150:
-#line 800 "edif.y" /* yacc.c:1646  */
+#line 799 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); }
-#line 3468 "edif.c" /* yacc.c:1646  */
+#line 3467 "edif.c" /* yacc.c:1646  */
     break;
 
   case 182:
-#line 870 "edif.y" /* yacc.c:1646  */
+#line 869 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3474 "edif.c" /* yacc.c:1646  */
+#line 3473 "edif.c" /* yacc.c:1646  */
     break;
 
   case 184:
-#line 874 "edif.y" /* yacc.c:1646  */
+#line 873 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3480 "edif.c" /* yacc.c:1646  */
+#line 3479 "edif.c" /* yacc.c:1646  */
     break;
 
   case 240:
-#line 978 "edif.y" /* yacc.c:1646  */
+#line 977 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3486 "edif.c" /* yacc.c:1646  */
+#line 3485 "edif.c" /* yacc.c:1646  */
     break;
 
   case 247:
-#line 991 "edif.y" /* yacc.c:1646  */
+#line 990 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3492 "edif.c" /* yacc.c:1646  */
+#line 3491 "edif.c" /* yacc.c:1646  */
     break;
 
   case 278:
-#line 1038 "edif.y" /* yacc.c:1646  */
+#line 1037 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3498 "edif.c" /* yacc.c:1646  */
+#line 3497 "edif.c" /* yacc.c:1646  */
     break;
 
   case 279:
-#line 1041 "edif.y" /* yacc.c:1646  */
+#line 1040 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3504 "edif.c" /* yacc.c:1646  */
+#line 3503 "edif.c" /* yacc.c:1646  */
     break;
 
   case 333:
-#line 1127 "edif.y" /* yacc.c:1646  */
+#line 1126 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-3].s)); free((yyvsp[-2].s)); }
-#line 3510 "edif.c" /* yacc.c:1646  */
+#line 3509 "edif.c" /* yacc.c:1646  */
     break;
 
   case 336:
-#line 1134 "edif.y" /* yacc.c:1646  */
+#line 1133 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3516 "edif.c" /* yacc.c:1646  */
+#line 3515 "edif.c" /* yacc.c:1646  */
     break;
 
   case 337:
-#line 1137 "edif.y" /* yacc.c:1646  */
+#line 1136 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3522 "edif.c" /* yacc.c:1646  */
+#line 3521 "edif.c" /* yacc.c:1646  */
     break;
 
   case 344:
-#line 1150 "edif.y" /* yacc.c:1646  */
+#line 1149 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); }
-#line 3528 "edif.c" /* yacc.c:1646  */
+#line 3527 "edif.c" /* yacc.c:1646  */
     break;
 
   case 346:
-#line 1154 "edif.y" /* yacc.c:1646  */
+#line 1153 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3534 "edif.c" /* yacc.c:1646  */
+#line 3533 "edif.c" /* yacc.c:1646  */
     break;
 
   case 347:
-#line 1155 "edif.y" /* yacc.c:1646  */
+#line 1154 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3540 "edif.c" /* yacc.c:1646  */
+#line 3539 "edif.c" /* yacc.c:1646  */
     break;
 
   case 348:
-#line 1156 "edif.y" /* yacc.c:1646  */
+#line 1155 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3546 "edif.c" /* yacc.c:1646  */
+#line 3545 "edif.c" /* yacc.c:1646  */
     break;
 
   case 369:
-#line 1197 "edif.y" /* yacc.c:1646  */
+#line 1196 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[-2].s); }
-#line 3552 "edif.c" /* yacc.c:1646  */
+#line 3551 "edif.c" /* yacc.c:1646  */
     break;
 
   case 371:
-#line 1201 "edif.y" /* yacc.c:1646  */
+#line 1200 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3558 "edif.c" /* yacc.c:1646  */
+#line 3557 "edif.c" /* yacc.c:1646  */
     break;
 
   case 374:
-#line 1208 "edif.y" /* yacc.c:1646  */
+#line 1207 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3564 "edif.c" /* yacc.c:1646  */
+#line 3563 "edif.c" /* yacc.c:1646  */
     break;
 
   case 381:
-#line 1219 "edif.y" /* yacc.c:1646  */
+#line 1218 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3570 "edif.c" /* yacc.c:1646  */
+#line 3569 "edif.c" /* yacc.c:1646  */
     break;
 
   case 384:
-#line 1226 "edif.y" /* yacc.c:1646  */
+#line 1225 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3576 "edif.c" /* yacc.c:1646  */
+#line 3575 "edif.c" /* yacc.c:1646  */
     break;
 
   case 388:
-#line 1232 "edif.y" /* yacc.c:1646  */
+#line 1231 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3582 "edif.c" /* yacc.c:1646  */
+#line 3581 "edif.c" /* yacc.c:1646  */
     break;
 
   case 390:
-#line 1236 "edif.y" /* yacc.c:1646  */
+#line 1235 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3588 "edif.c" /* yacc.c:1646  */
+#line 3587 "edif.c" /* yacc.c:1646  */
     break;
 
   case 393:
-#line 1243 "edif.y" /* yacc.c:1646  */
+#line 1242 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3594 "edif.c" /* yacc.c:1646  */
+#line 3593 "edif.c" /* yacc.c:1646  */
     break;
 
   case 397:
-#line 1251 "edif.y" /* yacc.c:1646  */
+#line 1250 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3600 "edif.c" /* yacc.c:1646  */
+#line 3599 "edif.c" /* yacc.c:1646  */
     break;
 
   case 408:
-#line 1266 "edif.y" /* yacc.c:1646  */
+#line 1265 "edif.y" /* yacc.c:1646  */
     { pair_list_free((yyvsp[0].pl)); }
-#line 3606 "edif.c" /* yacc.c:1646  */
+#line 3605 "edif.c" /* yacc.c:1646  */
     break;
 
   case 437:
-#line 1316 "edif.y" /* yacc.c:1646  */
+#line 1315 "edif.y" /* yacc.c:1646  */
     { (yyval.pl) = new_pair_list((yyvsp[-1].ps)); }
-#line 3612 "edif.c" /* yacc.c:1646  */
+#line 3611 "edif.c" /* yacc.c:1646  */
     break;
 
   case 438:
-#line 1319 "edif.y" /* yacc.c:1646  */
+#line 1318 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=NULL; }
-#line 3618 "edif.c" /* yacc.c:1646  */
+#line 3617 "edif.c" /* yacc.c:1646  */
     break;
 
   case 439:
-#line 1320 "edif.y" /* yacc.c:1646  */
+#line 1319 "edif.y" /* yacc.c:1646  */
     { (yyvsp[0].ps)->next = (yyvsp[-1].ps); (yyval.ps) = (yyvsp[0].ps); }
-#line 3624 "edif.c" /* yacc.c:1646  */
+#line 3623 "edif.c" /* yacc.c:1646  */
     break;
 
   case 455:
-#line 1346 "edif.y" /* yacc.c:1646  */
+#line 1345 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3630 "edif.c" /* yacc.c:1646  */
+#line 3629 "edif.c" /* yacc.c:1646  */
     break;
 
   case 459:
-#line 1356 "edif.y" /* yacc.c:1646  */
+#line 1355 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3636 "edif.c" /* yacc.c:1646  */
+#line 3635 "edif.c" /* yacc.c:1646  */
     break;
 
   case 460:
-#line 1359 "edif.y" /* yacc.c:1646  */
+#line 1358 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3642 "edif.c" /* yacc.c:1646  */
+#line 3641 "edif.c" /* yacc.c:1646  */
     break;
 
   case 462:
-#line 1365 "edif.y" /* yacc.c:1646  */
+#line 1364 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3648 "edif.c" /* yacc.c:1646  */
+#line 3647 "edif.c" /* yacc.c:1646  */
     break;
 
   case 463:
-#line 1368 "edif.y" /* yacc.c:1646  */
+#line 1367 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3654 "edif.c" /* yacc.c:1646  */
+#line 3653 "edif.c" /* yacc.c:1646  */
     break;
 
   case 483:
-#line 1410 "edif.y" /* yacc.c:1646  */
+#line 1409 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3660 "edif.c" /* yacc.c:1646  */
+#line 3659 "edif.c" /* yacc.c:1646  */
     break;
 
   case 484:
-#line 1413 "edif.y" /* yacc.c:1646  */
+#line 1412 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3666 "edif.c" /* yacc.c:1646  */
+#line 3665 "edif.c" /* yacc.c:1646  */
     break;
 
   case 492:
-#line 1427 "edif.y" /* yacc.c:1646  */
+#line 1426 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3672 "edif.c" /* yacc.c:1646  */
+#line 3671 "edif.c" /* yacc.c:1646  */
     break;
 
   case 506:
-#line 1455 "edif.y" /* yacc.c:1646  */
+#line 1454 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3678 "edif.c" /* yacc.c:1646  */
+#line 3677 "edif.c" /* yacc.c:1646  */
     break;
 
   case 507:
-#line 1458 "edif.y" /* yacc.c:1646  */
+#line 1457 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3684 "edif.c" /* yacc.c:1646  */
+#line 3683 "edif.c" /* yacc.c:1646  */
     break;
 
   case 514:
-#line 1473 "edif.y" /* yacc.c:1646  */
+#line 1472 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3690 "edif.c" /* yacc.c:1646  */
+#line 3689 "edif.c" /* yacc.c:1646  */
     break;
 
   case 549:
-#line 1528 "edif.y" /* yacc.c:1646  */
+#line 1527 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3696 "edif.c" /* yacc.c:1646  */
+#line 3695 "edif.c" /* yacc.c:1646  */
     break;
 
   case 555:
-#line 1540 "edif.y" /* yacc.c:1646  */
+#line 1539 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3702 "edif.c" /* yacc.c:1646  */
+#line 3701 "edif.c" /* yacc.c:1646  */
     break;
 
   case 560:
-#line 1549 "edif.y" /* yacc.c:1646  */
+#line 1548 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); }
-#line 3708 "edif.c" /* yacc.c:1646  */
+#line 3707 "edif.c" /* yacc.c:1646  */
     break;
 
   case 561:
-#line 1552 "edif.y" /* yacc.c:1646  */
+#line 1551 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3714 "edif.c" /* yacc.c:1646  */
+#line 3713 "edif.c" /* yacc.c:1646  */
     break;
 
   case 562:
-#line 1553 "edif.y" /* yacc.c:1646  */
+#line 1552 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3720 "edif.c" /* yacc.c:1646  */
+#line 3719 "edif.c" /* yacc.c:1646  */
     break;
 
   case 582:
-#line 1595 "edif.y" /* yacc.c:1646  */
+#line 1594 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3726 "edif.c" /* yacc.c:1646  */
+#line 3725 "edif.c" /* yacc.c:1646  */
     break;
 
   case 585:
-#line 1598 "edif.y" /* yacc.c:1646  */
+#line 1597 "edif.y" /* yacc.c:1646  */
     { pair_list_free((yyvsp[0].pl)); }
-#line 3732 "edif.c" /* yacc.c:1646  */
+#line 3731 "edif.c" /* yacc.c:1646  */
     break;
 
   case 586:
-#line 1601 "edif.y" /* yacc.c:1646  */
+#line 1600 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[-1].s); }
-#line 3738 "edif.c" /* yacc.c:1646  */
+#line 3737 "edif.c" /* yacc.c:1646  */
     break;
 
   case 587:
-#line 1604 "edif.y" /* yacc.c:1646  */
+#line 1603 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3744 "edif.c" /* yacc.c:1646  */
+#line 3743 "edif.c" /* yacc.c:1646  */
     break;
 
   case 589:
-#line 1608 "edif.y" /* yacc.c:1646  */
+#line 1607 "edif.y" /* yacc.c:1646  */
     { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); }
-#line 3750 "edif.c" /* yacc.c:1646  */
+#line 3749 "edif.c" /* yacc.c:1646  */
     break;
 
   case 590:
-#line 1609 "edif.y" /* yacc.c:1646  */
+#line 1608 "edif.y" /* yacc.c:1646  */
     { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); }
-#line 3756 "edif.c" /* yacc.c:1646  */
+#line 3755 "edif.c" /* yacc.c:1646  */
     break;
 
   case 591:
-#line 1610 "edif.y" /* yacc.c:1646  */
+#line 1609 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=(yyvsp[0].ps); }
-#line 3762 "edif.c" /* yacc.c:1646  */
+#line 3761 "edif.c" /* yacc.c:1646  */
     break;
 
   case 592:
-#line 1613 "edif.y" /* yacc.c:1646  */
+#line 1612 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3768 "edif.c" /* yacc.c:1646  */
+#line 3767 "edif.c" /* yacc.c:1646  */
     break;
 
   case 593:
-#line 1614 "edif.y" /* yacc.c:1646  */
+#line 1613 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3774 "edif.c" /* yacc.c:1646  */
+#line 3773 "edif.c" /* yacc.c:1646  */
     break;
 
   case 594:
-#line 1617 "edif.y" /* yacc.c:1646  */
+#line 1616 "edif.y" /* yacc.c:1646  */
     { define_pcb_net((yyvsp[-2].ps), (yyvsp[-1].pl)); }
-#line 3780 "edif.c" /* yacc.c:1646  */
+#line 3779 "edif.c" /* yacc.c:1646  */
     break;
 
   case 595:
-#line 1620 "edif.y" /* yacc.c:1646  */
+#line 1619 "edif.y" /* yacc.c:1646  */
     { (yyval.pl)=(yyvsp[0].pl); }
-#line 3786 "edif.c" /* yacc.c:1646  */
+#line 3785 "edif.c" /* yacc.c:1646  */
     break;
 
   case 611:
-#line 1642 "edif.y" /* yacc.c:1646  */
+#line 1641 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[-2].ps)); }
-#line 3792 "edif.c" /* yacc.c:1646  */
+#line 3791 "edif.c" /* yacc.c:1646  */
     break;
 
   case 632:
-#line 1679 "edif.y" /* yacc.c:1646  */
+#line 1678 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=(yyvsp[0].ps); }
-#line 3798 "edif.c" /* yacc.c:1646  */
+#line 3797 "edif.c" /* yacc.c:1646  */
     break;
 
   case 633:
-#line 1680 "edif.y" /* yacc.c:1646  */
+#line 1679 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=NULL; }
-#line 3804 "edif.c" /* yacc.c:1646  */
+#line 3803 "edif.c" /* yacc.c:1646  */
     break;
 
   case 634:
-#line 1684 "edif.y" /* yacc.c:1646  */
+#line 1683 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3810 "edif.c" /* yacc.c:1646  */
+#line 3809 "edif.c" /* yacc.c:1646  */
     break;
 
   case 639:
-#line 1693 "edif.y" /* yacc.c:1646  */
+#line 1692 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3816 "edif.c" /* yacc.c:1646  */
+#line 3815 "edif.c" /* yacc.c:1646  */
     break;
 
   case 644:
-#line 1704 "edif.y" /* yacc.c:1646  */
+#line 1703 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3822 "edif.c" /* yacc.c:1646  */
+#line 3821 "edif.c" /* yacc.c:1646  */
     break;
 
   case 698:
-#line 1806 "edif.y" /* yacc.c:1646  */
+#line 1805 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-3].s)); }
-#line 3828 "edif.c" /* yacc.c:1646  */
+#line 3827 "edif.c" /* yacc.c:1646  */
     break;
 
   case 701:
-#line 1813 "edif.y" /* yacc.c:1646  */
+#line 1812 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3834 "edif.c" /* yacc.c:1646  */
+#line 3833 "edif.c" /* yacc.c:1646  */
     break;
 
   case 727:
-#line 1865 "edif.y" /* yacc.c:1646  */
+#line 1864 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3840 "edif.c" /* yacc.c:1646  */
+#line 3839 "edif.c" /* yacc.c:1646  */
     break;
 
   case 730:
-#line 1872 "edif.y" /* yacc.c:1646  */
+#line 1871 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3846 "edif.c" /* yacc.c:1646  */
+#line 3845 "edif.c" /* yacc.c:1646  */
     break;
 
   case 747:
-#line 1907 "edif.y" /* yacc.c:1646  */
+#line 1906 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 3852 "edif.c" /* yacc.c:1646  */
+#line 3851 "edif.c" /* yacc.c:1646  */
     break;
 
   case 766:
-#line 1938 "edif.y" /* yacc.c:1646  */
+#line 1937 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3858 "edif.c" /* yacc.c:1646  */
+#line 3857 "edif.c" /* yacc.c:1646  */
     break;
 
   case 789:
-#line 1973 "edif.y" /* yacc.c:1646  */
+#line 1972 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3864 "edif.c" /* yacc.c:1646  */
+#line 3863 "edif.c" /* yacc.c:1646  */
     break;
 
   case 791:
-#line 1979 "edif.y" /* yacc.c:1646  */
+#line 1978 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3870 "edif.c" /* yacc.c:1646  */
+#line 3869 "edif.c" /* yacc.c:1646  */
     break;
 
   case 803:
-#line 1995 "edif.y" /* yacc.c:1646  */
+#line 1994 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3876 "edif.c" /* yacc.c:1646  */
+#line 3875 "edif.c" /* yacc.c:1646  */
     break;
 
   case 818:
-#line 2014 "edif.y" /* yacc.c:1646  */
+#line 2013 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3882 "edif.c" /* yacc.c:1646  */
+#line 3881 "edif.c" /* yacc.c:1646  */
     break;
 
   case 823:
-#line 2025 "edif.y" /* yacc.c:1646  */
+#line 2024 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3888 "edif.c" /* yacc.c:1646  */
+#line 3887 "edif.c" /* yacc.c:1646  */
     break;
 
   case 827:
-#line 2031 "edif.y" /* yacc.c:1646  */
+#line 2030 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3894 "edif.c" /* yacc.c:1646  */
+#line 3893 "edif.c" /* yacc.c:1646  */
     break;
 
   case 829:
-#line 2035 "edif.y" /* yacc.c:1646  */
+#line 2034 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3900 "edif.c" /* yacc.c:1646  */
+#line 3899 "edif.c" /* yacc.c:1646  */
     break;
 
   case 831:
-#line 2040 "edif.y" /* yacc.c:1646  */
+#line 2039 "edif.y" /* yacc.c:1646  */
     {
     if ((yyvsp[-1].ps))
     {
@@ -3912,251 +3912,251 @@
 	(yyval.ps) = new_str_pair(NULL,(yyvsp[-2].s));
     }
 }
-#line 3917 "edif.c" /* yacc.c:1646  */
+#line 3916 "edif.c" /* yacc.c:1646  */
     break;
 
   case 832:
-#line 2054 "edif.y" /* yacc.c:1646  */
+#line 2053 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=NULL; }
-#line 3923 "edif.c" /* yacc.c:1646  */
+#line 3922 "edif.c" /* yacc.c:1646  */
     break;
 
   case 833:
-#line 2055 "edif.y" /* yacc.c:1646  */
+#line 2054 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=(yyvsp[0].ps); }
-#line 3929 "edif.c" /* yacc.c:1646  */
+#line 3928 "edif.c" /* yacc.c:1646  */
     break;
 
   case 834:
-#line 2056 "edif.y" /* yacc.c:1646  */
+#line 2055 "edif.y" /* yacc.c:1646  */
     { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); }
-#line 3935 "edif.c" /* yacc.c:1646  */
+#line 3934 "edif.c" /* yacc.c:1646  */
     break;
 
   case 835:
-#line 2057 "edif.y" /* yacc.c:1646  */
+#line 2056 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=NULL; }
-#line 3941 "edif.c" /* yacc.c:1646  */
+#line 3940 "edif.c" /* yacc.c:1646  */
     break;
 
   case 848:
-#line 2084 "edif.y" /* yacc.c:1646  */
+#line 2083 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3947 "edif.c" /* yacc.c:1646  */
+#line 3946 "edif.c" /* yacc.c:1646  */
     break;
 
   case 849:
-#line 2087 "edif.y" /* yacc.c:1646  */
+#line 2086 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3953 "edif.c" /* yacc.c:1646  */
+#line 3952 "edif.c" /* yacc.c:1646  */
     break;
 
   case 881:
-#line 2140 "edif.y" /* yacc.c:1646  */
+#line 2139 "edif.y" /* yacc.c:1646  */
     { (yyval.ps) = new_str_pair((yyvsp[-2].s),(yyvsp[-1].s)); }
-#line 3959 "edif.c" /* yacc.c:1646  */
+#line 3958 "edif.c" /* yacc.c:1646  */
     break;
 
   case 882:
-#line 2143 "edif.y" /* yacc.c:1646  */
+#line 2142 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3965 "edif.c" /* yacc.c:1646  */
+#line 3964 "edif.c" /* yacc.c:1646  */
     break;
 
   case 883:
-#line 2144 "edif.y" /* yacc.c:1646  */
+#line 2143 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3971 "edif.c" /* yacc.c:1646  */
+#line 3970 "edif.c" /* yacc.c:1646  */
     break;
 
   case 884:
-#line 2147 "edif.y" /* yacc.c:1646  */
+#line 2146 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3977 "edif.c" /* yacc.c:1646  */
+#line 3976 "edif.c" /* yacc.c:1646  */
     break;
 
   case 885:
-#line 2148 "edif.y" /* yacc.c:1646  */
+#line 2147 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=NULL; }
-#line 3983 "edif.c" /* yacc.c:1646  */
+#line 3982 "edif.c" /* yacc.c:1646  */
     break;
 
   case 889:
-#line 2158 "edif.y" /* yacc.c:1646  */
+#line 2157 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3989 "edif.c" /* yacc.c:1646  */
+#line 3988 "edif.c" /* yacc.c:1646  */
     break;
 
   case 891:
-#line 2164 "edif.y" /* yacc.c:1646  */
+#line 2163 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3995 "edif.c" /* yacc.c:1646  */
+#line 3994 "edif.c" /* yacc.c:1646  */
     break;
 
   case 892:
-#line 2165 "edif.y" /* yacc.c:1646  */
+#line 2164 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 4001 "edif.c" /* yacc.c:1646  */
+#line 4000 "edif.c" /* yacc.c:1646  */
     break;
 
   case 893:
-#line 2168 "edif.y" /* yacc.c:1646  */
+#line 2167 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 4007 "edif.c" /* yacc.c:1646  */
+#line 4006 "edif.c" /* yacc.c:1646  */
     break;
 
   case 894:
-#line 2171 "edif.y" /* yacc.c:1646  */
+#line 2170 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 4013 "edif.c" /* yacc.c:1646  */
+#line 4012 "edif.c" /* yacc.c:1646  */
     break;
 
   case 896:
-#line 2177 "edif.y" /* yacc.c:1646  */
+#line 2176 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4019 "edif.c" /* yacc.c:1646  */
+#line 4018 "edif.c" /* yacc.c:1646  */
     break;
 
   case 898:
-#line 2179 "edif.y" /* yacc.c:1646  */
+#line 2178 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4025 "edif.c" /* yacc.c:1646  */
+#line 4024 "edif.c" /* yacc.c:1646  */
     break;
 
   case 903:
-#line 2190 "edif.y" /* yacc.c:1646  */
+#line 2189 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4031 "edif.c" /* yacc.c:1646  */
+#line 4030 "edif.c" /* yacc.c:1646  */
     break;
 
   case 935:
-#line 2254 "edif.y" /* yacc.c:1646  */
+#line 2253 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4037 "edif.c" /* yacc.c:1646  */
+#line 4036 "edif.c" /* yacc.c:1646  */
     break;
 
   case 943:
-#line 2270 "edif.y" /* yacc.c:1646  */
+#line 2269 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4043 "edif.c" /* yacc.c:1646  */
+#line 4042 "edif.c" /* yacc.c:1646  */
     break;
 
   case 946:
-#line 2275 "edif.y" /* yacc.c:1646  */
+#line 2274 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4049 "edif.c" /* yacc.c:1646  */
+#line 4048 "edif.c" /* yacc.c:1646  */
     break;
 
   case 973:
-#line 2320 "edif.y" /* yacc.c:1646  */
+#line 2319 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4055 "edif.c" /* yacc.c:1646  */
+#line 4054 "edif.c" /* yacc.c:1646  */
     break;
 
   case 987:
-#line 2342 "edif.y" /* yacc.c:1646  */
+#line 2341 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 4061 "edif.c" /* yacc.c:1646  */
+#line 4060 "edif.c" /* yacc.c:1646  */
     break;
 
   case 994:
-#line 2358 "edif.y" /* yacc.c:1646  */
+#line 2357 "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.c" /* yacc.c:1646  */
+#line 4066 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1054:
-#line 2465 "edif.y" /* yacc.c:1646  */
+#line 2464 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4073 "edif.c" /* yacc.c:1646  */
+#line 4072 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1055:
-#line 2466 "edif.y" /* yacc.c:1646  */
+#line 2465 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4079 "edif.c" /* yacc.c:1646  */
+#line 4078 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1056:
-#line 2467 "edif.y" /* yacc.c:1646  */
+#line 2466 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4085 "edif.c" /* yacc.c:1646  */
+#line 4084 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1057:
-#line 2468 "edif.y" /* yacc.c:1646  */
+#line 2467 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4091 "edif.c" /* yacc.c:1646  */
+#line 4090 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1059:
-#line 2472 "edif.y" /* yacc.c:1646  */
+#line 2471 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4097 "edif.c" /* yacc.c:1646  */
+#line 4096 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1061:
-#line 2476 "edif.y" /* yacc.c:1646  */
+#line 2475 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4103 "edif.c" /* yacc.c:1646  */
+#line 4102 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1063:
-#line 2480 "edif.y" /* yacc.c:1646  */
+#line 2479 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 4109 "edif.c" /* yacc.c:1646  */
+#line 4108 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1085:
-#line 2516 "edif.y" /* yacc.c:1646  */
+#line 2515 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4115 "edif.c" /* yacc.c:1646  */
+#line 4114 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1086:
-#line 2519 "edif.y" /* yacc.c:1646  */
+#line 2518 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4121 "edif.c" /* yacc.c:1646  */
+#line 4120 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1107:
-#line 2560 "edif.y" /* yacc.c:1646  */
+#line 2559 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4127 "edif.c" /* yacc.c:1646  */
+#line 4126 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1109:
-#line 2562 "edif.y" /* yacc.c:1646  */
+#line 2561 "edif.y" /* yacc.c:1646  */
     { pair_list_free((yyvsp[0].pl)); }
-#line 4133 "edif.c" /* yacc.c:1646  */
+#line 4132 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1126:
-#line 2589 "edif.y" /* yacc.c:1646  */
+#line 2588 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 4139 "edif.c" /* yacc.c:1646  */
+#line 4138 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1127:
-#line 2592 "edif.y" /* yacc.c:1646  */
+#line 2591 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 4145 "edif.c" /* yacc.c:1646  */
+#line 4144 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1128:
-#line 2595 "edif.y" /* yacc.c:1646  */
+#line 2594 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 4151 "edif.c" /* yacc.c:1646  */
+#line 4150 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1129:
-#line 2598 "edif.y" /* yacc.c:1646  */
+#line 2597 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 4157 "edif.c" /* yacc.c:1646  */
+#line 4156 "edif.c" /* yacc.c:1646  */
     break;
 
 
-#line 4161 "edif.c" /* yacc.c:1646  */
+#line 4160 "edif.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4384,7 +4384,7 @@
 #endif
   return yyresult;
 }
-#line 2601 "edif.y" /* yacc.c:1906  */
+#line 2600 "edif.y" /* yacc.c:1906  */
 
 /*
  *	xmalloc:
@@ -6234,7 +6234,7 @@
 
 int ReadEdifNetlist(char *filename)
 {
-	pcb_message(PCB_MSG_INFO, "Importing edif netlist %s\n", filename);
+	pcb_message(PCB_MSG_INFO,"Importing edif netlist %s\n", filename);
 	ParseEDIF(filename, NULL);
 
 	return 0;
Index: edif.h
===================================================================
--- edif.h	(revision 23711)
+++ edif.h	(revision 23712)
@@ -345,7 +345,7 @@
 typedef union YYSTYPE YYSTYPE;
 union YYSTYPE
 {
-#line 197 "edif.y" /* yacc.c:1909  */
+#line 196 "edif.y" /* yacc.c:1909  */
 
     char* s;
     pair_list* pl;
Index: edif.y
===================================================================
--- edif.y	(revision 23711)
+++ edif.y	(revision 23712)
@@ -4446,7 +4446,7 @@
 
 int ReadEdifNetlist(char *filename)
 {
-	pcb_message(PCB_MS’G_INFO,"Importing edif netlist %s\n", filename);
+	pcb_message(PCB_MSG_INFO,"Importing edif netlist %s\n", filename);
 	ParseEDIF(filename, NULL);
 
 	return 0;