Index: edif.c
===================================================================
--- edif.c	(revision 4506)
+++ edif.c	(revision 4507)
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -100,7 +100,9 @@
 #include <ctype.h>
 
 #include "global.h"
+#include "board.h"
 #include "data.h"
+#include "library.h"
 #include "error.h"
 #include "plugins.h"
 #include "compat_misc.h"
@@ -266,7 +268,7 @@
  static void yyerror(const char *);
  static void PopC(void);
 
-#line 270 "edif.c" /* yacc.c:339  */
+#line 272 "edif.c" /* yacc.c:339  */
 
 # ifndef YY_NULLPTR
 #  if defined __cplusplus && 201103L <= __cplusplus
@@ -598,17 +600,19 @@
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
-#line 199 "edif.y" /* yacc.c:355  */
+#line 201 "edif.y" /* yacc.c:355  */
 
     char* s;
     pair_list* pl;
     str_pair* ps;
 
-#line 611 "edif.c" /* yacc.c:355  */
+#line 613 "edif.c" /* yacc.c:355  */
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
@@ -622,7 +626,7 @@
 
 /* Copy the second part of user declarations.  */
 
-#line 626 "edif.c" /* yacc.c:358  */
+#line 630 "edif.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -948,119 +952,119 @@
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   511,   511,   514,   517,   518,   519,   520,   521,   522,
-     523,   526,   529,   532,   536,   539,   540,   543,   546,   547,
-     548,   549,   550,   551,   554,   557,   558,   561,   564,   565,
-     566,   567,   568,   571,   574,   577,   578,   581,   584,   587,
-     588,   589,   590,   591,   594,   597,   600,   603,   606,   609,
-     612,   613,   614,   617,   620,   621,   624,   625,   628,   631,
-     632,   633,   634,   637,   640,   641,   644,   647,   648,   651,
-     654,   657,   660,   663,   664,   665,   666,   667,   668,   669,
-     672,   675,   678,   679,   682,   685,   688,   689,   690,   693,
-     696,   697,   698,   701,   702,   703,   706,   709,   710,   713,
-     716,   719,   720,   723,   726,   727,   728,   729,   730,   731,
-     732,   733,   736,   739,   742,   743,   744,   745,   746,   747,
-     748,   749,   750,   751,   752,   753,   754,   755,   756,   757,
-     758,   759,   762,   765,   766,   769,   772,   773,   774,   777,
-     780,   781,   784,   787,   790,   791,   792,   795,   798,   799,
-     802,   805,   806,   809,   812,   813,   816,   819,   820,   823,
-     826,   827,   830,   833,   834,   837,   840,   841,   844,   847,
-     848,   851,   854,   855,   856,   859,   862,   863,   864,   865,
-     866,   869,   872,   873,   876,   879,   882,   883,   884,   885,
-     886,   887,   888,   889,   890,   891,   892,   893,   894,   895,
-     896,   899,   902,   903,   904,   905,   908,   911,   912,   913,
-     916,   919,   920,   923,   924,   927,   928,   931,   932,   935,
-     938,   939,   942,   945,   946,   949,   952,   956,   957,   958,
-     959,   962,   965,   966,   967,   970,   974,   975,   976,   979,
-     980,   981,   982,   985,   986,   987,   990,   993,   994,   995,
-     996,   997,   998,   999,  1002,  1005,  1008,  1009,  1010,  1011,
-    1012,  1015,  1018,  1021,  1024,  1025,  1026,  1027,  1028,  1029,
-    1030,  1031,  1032,  1033,  1034,  1035,  1036,  1037,  1040,  1043,
-    1046,  1049,  1050,  1051,  1054,  1057,  1058,  1059,  1060,  1061,
-    1062,  1063,  1064,  1065,  1066,  1067,  1068,  1069,  1072,  1075,
-    1076,  1079,  1082,  1083,  1084,  1085,  1086,  1087,  1088,  1089,
-    1090,  1091,  1092,  1095,  1098,  1099,  1100,  1101,  1104,  1105,
-    1106,  1107,  1108,  1111,  1114,  1115,  1116,  1117,  1120,  1123,
-    1124,  1125,  1126,  1129,  1132,  1135,  1136,  1139,  1140,  1141,
-    1142,  1145,  1148,  1149,  1152,  1155,  1156,  1157,  1158,  1159,
-    1162,  1165,  1168,  1171,  1174,  1177,  1178,  1181,  1184,  1187,
-    1188,  1189,  1190,  1191,  1192,  1193,  1194,  1195,  1196,  1199,
-    1202,  1203,  1204,  1207,  1210,  1211,  1212,  1213,  1214,  1217,
-    1220,  1221,  1224,  1227,  1228,  1229,  1230,  1231,  1234,  1235,
-    1238,  1239,  1242,  1245,  1246,  1249,  1252,  1253,  1254,  1255,
-    1258,  1261,  1262,  1263,  1264,  1265,  1266,  1267,  1268,  1269,
-    1270,  1271,  1272,  1273,  1274,  1275,  1276,  1277,  1280,  1284,
-    1285,  1286,  1287,  1290,  1293,  1294,  1295,  1296,  1299,  1302,
-    1303,  1304,  1305,  1308,  1311,  1312,  1315,  1318,  1321,  1322,
-    1323,  1324,  1327,  1330,  1331,  1332,  1333,  1334,  1335,  1336,
-    1337,  1338,  1341,  1344,  1345,  1348,  1351,  1354,  1355,  1358,
-    1361,  1364,  1367,  1370,  1373,  1376,  1377,  1378,  1379,  1380,
-    1383,  1386,  1389,  1390,  1393,  1396,  1397,  1398,  1401,  1404,
-    1405,  1408,  1411,  1412,  1415,  1416,  1417,  1420,  1421,  1422,
-    1425,  1428,  1429,  1430,  1431,  1434,  1437,  1438,  1439,  1440,
-    1443,  1446,  1447,  1450,  1453,  1454,  1457,  1460,  1463,  1466,
-    1467,  1468,  1471,  1474,  1475,  1476,  1477,  1480,  1483,  1484,
-    1485,  1486,  1489,  1492,  1493,  1496,  1499,  1500,  1501,  1502,
-    1503,  1504,  1505,  1506,  1507,  1508,  1509,  1510,  1511,  1512,
-    1513,  1516,  1519,  1520,  1521,  1522,  1523,  1526,  1529,  1530,
-    1533,  1534,  1535,  1538,  1541,  1542,  1543,  1546,  1547,  1548,
-    1551,  1554,  1555,  1558,  1561,  1562,  1563,  1564,  1567,  1570,
-    1571,  1574,  1575,  1578,  1581,  1582,  1583,  1586,  1589,  1590,
-    1593,  1596,  1597,  1598,  1599,  1600,  1603,  1606,  1607,  1610,
-    1611,  1612,  1615,  1616,  1619,  1622,  1623,  1624,  1625,  1626,
-    1627,  1628,  1629,  1630,  1631,  1634,  1637,  1638,  1639,  1640,
-    1641,  1644,  1647,  1648,  1649,  1650,  1651,  1652,  1655,  1658,
-    1659,  1660,  1663,  1666,  1667,  1668,  1671,  1674,  1675,  1676,
-    1677,  1678,  1681,  1682,  1686,  1687,  1690,  1693,  1694,  1695,
-    1696,  1699,  1702,  1705,  1706,  1707,  1710,  1713,  1714,  1715,
-    1718,  1721,  1722,  1723,  1724,  1727,  1730,  1731,  1732,  1733,
-    1736,  1739,  1740,  1743,  1746,  1747,  1748,  1749,  1752,  1755,
-    1756,  1757,  1758,  1759,  1762,  1765,  1768,  1769,  1772,  1775,
-    1776,  1777,  1778,  1779,  1780,  1781,  1782,  1785,  1788,  1792,
-    1793,  1794,  1795,  1798,  1802,  1803,  1804,  1805,  1808,  1811,
-    1812,  1815,  1818,  1821,  1822,  1823,  1824,  1825,  1826,  1827,
-    1828,  1829,  1830,  1833,  1836,  1839,  1840,  1843,  1846,  1847,
-    1850,  1853,  1856,  1857,  1860,  1863,  1864,  1867,  1870,  1873,
-    1874,  1875,  1876,  1879,  1882,  1883,  1886,  1889,  1890,  1891,
-    1892,  1895,  1898,  1899,  1902,  1905,  1906,  1909,  1912,  1915,
-    1916,  1919,  1922,  1923,  1924,  1925,  1926,  1927,  1928,  1929,
-    1930,  1931,  1932,  1933,  1934,  1937,  1940,  1941,  1942,  1943,
-    1944,  1945,  1946,  1947,  1948,  1949,  1952,  1955,  1956,  1957,
-    1958,  1961,  1964,  1965,  1966,  1967,  1970,  1973,  1974,  1975,
-    1978,  1981,  1982,  1983,  1984,  1985,  1986,  1987,  1988,  1989,
-    1990,  1991,  1994,  1997,  1998,  1999,  2000,  2001,  2002,  2003,
-    2004,  2005,  2006,  2007,  2008,  2009,  2012,  2015,  2016,  2017,
-    2020,  2023,  2026,  2027,  2028,  2029,  2030,  2033,  2034,  2037,
-    2038,  2041,  2056,  2057,  2058,  2059,  2062,  2065,  2066,  2069,
-    2072,  2073,  2076,  2079,  2080,  2081,  2082,  2083,  2086,  2089,
-    2092,  2095,  2096,  2097,  2098,  2099,  2100,  2101,  2102,  2103,
-    2104,  2105,  2106,  2109,  2110,  2111,  2112,  2113,  2114,  2117,
-    2120,  2121,  2122,  2125,  2128,  2129,  2132,  2135,  2136,  2137,
-    2138,  2141,  2145,  2146,  2149,  2150,  2153,  2156,  2157,  2160,
-    2163,  2166,  2167,  2170,  2173,  2176,  2179,  2180,  2181,  2182,
-    2185,  2188,  2189,  2192,  2195,  2198,  2199,  2200,  2201,  2202,
-    2203,  2206,  2209,  2210,  2211,  2212,  2215,  2218,  2219,  2222,
-    2225,  2226,  2229,  2232,  2233,  2236,  2239,  2240,  2243,  2246,
-    2247,  2248,  2249,  2252,  2255,  2256,  2257,  2260,  2261,  2262,
-    2265,  2268,  2271,  2272,  2273,  2274,  2277,  2278,  2281,  2284,
-    2287,  2288,  2289,  2290,  2291,  2292,  2293,  2294,  2295,  2296,
-    2297,  2298,  2299,  2300,  2303,  2306,  2307,  2310,  2313,  2314,
-    2315,  2318,  2321,  2322,  2323,  2324,  2327,  2328,  2329,  2332,
-    2335,  2336,  2337,  2338,  2339,  2340,  2341,  2344,  2347,  2350,
-    2351,  2354,  2355,  2356,  2359,  2363,  2366,  2367,  2368,  2369,
-    2370,  2373,  2377,  2378,  2381,  2382,  2385,  2386,  2389,  2390,
-    2393,  2394,  2397,  2400,  2401,  2402,  2405,  2408,  2409,  2410,
-    2411,  2414,  2417,  2418,  2419,  2420,  2421,  2422,  2425,  2428,
-    2431,  2434,  2435,  2436,  2437,  2440,  2443,  2444,  2445,  2446,
-    2447,  2448,  2449,  2450,  2451,  2452,  2453,  2454,  2455,  2456,
-    2457,  2458,  2461,  2464,  2467,  2468,  2469,  2470,  2471,  2474,
-    2475,  2478,  2479,  2482,  2485,  2488,  2489,  2490,  2491,  2492,
-    2493,  2496,  2499,  2500,  2501,  2504,  2507,  2508,  2509,  2510,
-    2511,  2512,  2513,  2514,  2515,  2518,  2521,  2524,  2527,  2528,
-    2531,  2534,  2535,  2536,  2537,  2538,  2539,  2540,  2541,  2542,
-    2543,  2546,  2549,  2552,  2555,  2558,  2561,  2562,  2563,  2564,
-    2567,  2570,  2571,  2572,  2573,  2574,  2575,  2576,  2579,  2582,
-    2583,  2584,  2585,  2586,  2587,  2588,  2591,  2594,  2597,  2600
+       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
 
@@ -3368,541 +3372,541 @@
   switch (yyn)
     {
         case 2:
-#line 511 "edif.y" /* yacc.c:1646  */
+#line 513 "edif.y" /* yacc.c:1646  */
     { PopC(); }
-#line 3374 "edif.c" /* yacc.c:1646  */
+#line 3378 "edif.c" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 526 "edif.y" /* yacc.c:1646  */
+#line 528 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3380 "edif.c" /* yacc.c:1646  */
+#line 3384 "edif.c" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 529 "edif.y" /* yacc.c:1646  */
+#line 531 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3386 "edif.c" /* yacc.c:1646  */
+#line 3390 "edif.c" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 533 "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 3392 "edif.c" /* yacc.c:1646  */
+#line 3396 "edif.c" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 557 "edif.y" /* yacc.c:1646  */
+#line 559 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3398 "edif.c" /* yacc.c:1646  */
+#line 3402 "edif.c" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 574 "edif.y" /* yacc.c:1646  */
+#line 576 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[-3].ps)); free((yyvsp[-2].s)); }
-#line 3404 "edif.c" /* yacc.c:1646  */
+#line 3408 "edif.c" /* yacc.c:1646  */
     break;
 
   case 36:
-#line 578 "edif.y" /* yacc.c:1646  */
+#line 580 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3410 "edif.c" /* yacc.c:1646  */
+#line 3414 "edif.c" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 603 "edif.y" /* yacc.c:1646  */
+#line 605 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3416 "edif.c" /* yacc.c:1646  */
+#line 3420 "edif.c" /* yacc.c:1646  */
     break;
 
   case 69:
-#line 651 "edif.y" /* yacc.c:1646  */
+#line 653 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-3].s)); free((yyvsp[-2].s)); }
-#line 3422 "edif.c" /* yacc.c:1646  */
+#line 3426 "edif.c" /* yacc.c:1646  */
     break;
 
   case 70:
-#line 654 "edif.y" /* yacc.c:1646  */
+#line 656 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3428 "edif.c" /* yacc.c:1646  */
+#line 3432 "edif.c" /* yacc.c:1646  */
     break;
 
   case 80:
-#line 672 "edif.y" /* yacc.c:1646  */
+#line 674 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3434 "edif.c" /* yacc.c:1646  */
+#line 3438 "edif.c" /* yacc.c:1646  */
     break;
 
   case 84:
-#line 682 "edif.y" /* yacc.c:1646  */
+#line 684 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3440 "edif.c" /* yacc.c:1646  */
+#line 3444 "edif.c" /* yacc.c:1646  */
     break;
 
   case 91:
-#line 697 "edif.y" /* yacc.c:1646  */
+#line 699 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3446 "edif.c" /* yacc.c:1646  */
+#line 3450 "edif.c" /* yacc.c:1646  */
     break;
 
   case 102:
-#line 720 "edif.y" /* yacc.c:1646  */
+#line 722 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3452 "edif.c" /* yacc.c:1646  */
+#line 3456 "edif.c" /* yacc.c:1646  */
     break;
 
   case 140:
-#line 780 "edif.y" /* yacc.c:1646  */
+#line 782 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3458 "edif.c" /* yacc.c:1646  */
+#line 3462 "edif.c" /* yacc.c:1646  */
     break;
 
   case 147:
-#line 795 "edif.y" /* yacc.c:1646  */
+#line 797 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); }
-#line 3464 "edif.c" /* yacc.c:1646  */
+#line 3468 "edif.c" /* yacc.c:1646  */
     break;
 
   case 150:
-#line 802 "edif.y" /* yacc.c:1646  */
+#line 804 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); }
-#line 3470 "edif.c" /* yacc.c:1646  */
+#line 3474 "edif.c" /* yacc.c:1646  */
     break;
 
   case 182:
-#line 872 "edif.y" /* yacc.c:1646  */
+#line 874 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3476 "edif.c" /* yacc.c:1646  */
+#line 3480 "edif.c" /* yacc.c:1646  */
     break;
 
   case 184:
-#line 876 "edif.y" /* yacc.c:1646  */
+#line 878 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3482 "edif.c" /* yacc.c:1646  */
+#line 3486 "edif.c" /* yacc.c:1646  */
     break;
 
   case 240:
-#line 980 "edif.y" /* yacc.c:1646  */
+#line 982 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3488 "edif.c" /* yacc.c:1646  */
+#line 3492 "edif.c" /* yacc.c:1646  */
     break;
 
   case 247:
-#line 993 "edif.y" /* yacc.c:1646  */
+#line 995 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3494 "edif.c" /* yacc.c:1646  */
+#line 3498 "edif.c" /* yacc.c:1646  */
     break;
 
   case 278:
-#line 1040 "edif.y" /* yacc.c:1646  */
+#line 1042 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3500 "edif.c" /* yacc.c:1646  */
+#line 3504 "edif.c" /* yacc.c:1646  */
     break;
 
   case 279:
-#line 1043 "edif.y" /* yacc.c:1646  */
+#line 1045 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3506 "edif.c" /* yacc.c:1646  */
+#line 3510 "edif.c" /* yacc.c:1646  */
     break;
 
   case 333:
-#line 1129 "edif.y" /* yacc.c:1646  */
+#line 1131 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-3].s)); free((yyvsp[-2].s)); }
-#line 3512 "edif.c" /* yacc.c:1646  */
+#line 3516 "edif.c" /* yacc.c:1646  */
     break;
 
   case 336:
-#line 1136 "edif.y" /* yacc.c:1646  */
+#line 1138 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3518 "edif.c" /* yacc.c:1646  */
+#line 3522 "edif.c" /* yacc.c:1646  */
     break;
 
   case 337:
-#line 1139 "edif.y" /* yacc.c:1646  */
+#line 1141 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3524 "edif.c" /* yacc.c:1646  */
+#line 3528 "edif.c" /* yacc.c:1646  */
     break;
 
   case 344:
-#line 1152 "edif.y" /* yacc.c:1646  */
+#line 1154 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); }
-#line 3530 "edif.c" /* yacc.c:1646  */
+#line 3534 "edif.c" /* yacc.c:1646  */
     break;
 
   case 346:
-#line 1156 "edif.y" /* yacc.c:1646  */
+#line 1158 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3536 "edif.c" /* yacc.c:1646  */
+#line 3540 "edif.c" /* yacc.c:1646  */
     break;
 
   case 347:
-#line 1157 "edif.y" /* yacc.c:1646  */
+#line 1159 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3542 "edif.c" /* yacc.c:1646  */
+#line 3546 "edif.c" /* yacc.c:1646  */
     break;
 
   case 348:
-#line 1158 "edif.y" /* yacc.c:1646  */
+#line 1160 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3548 "edif.c" /* yacc.c:1646  */
+#line 3552 "edif.c" /* yacc.c:1646  */
     break;
 
   case 369:
-#line 1199 "edif.y" /* yacc.c:1646  */
+#line 1201 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[-2].s); }
-#line 3554 "edif.c" /* yacc.c:1646  */
+#line 3558 "edif.c" /* yacc.c:1646  */
     break;
 
   case 371:
-#line 1203 "edif.y" /* yacc.c:1646  */
+#line 1205 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3560 "edif.c" /* yacc.c:1646  */
+#line 3564 "edif.c" /* yacc.c:1646  */
     break;
 
   case 374:
-#line 1210 "edif.y" /* yacc.c:1646  */
+#line 1212 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3566 "edif.c" /* yacc.c:1646  */
+#line 3570 "edif.c" /* yacc.c:1646  */
     break;
 
   case 381:
-#line 1221 "edif.y" /* yacc.c:1646  */
+#line 1223 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3572 "edif.c" /* yacc.c:1646  */
+#line 3576 "edif.c" /* yacc.c:1646  */
     break;
 
   case 384:
-#line 1228 "edif.y" /* yacc.c:1646  */
+#line 1230 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3578 "edif.c" /* yacc.c:1646  */
+#line 3582 "edif.c" /* yacc.c:1646  */
     break;
 
   case 388:
-#line 1234 "edif.y" /* yacc.c:1646  */
+#line 1236 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3584 "edif.c" /* yacc.c:1646  */
+#line 3588 "edif.c" /* yacc.c:1646  */
     break;
 
   case 390:
-#line 1238 "edif.y" /* yacc.c:1646  */
+#line 1240 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3590 "edif.c" /* yacc.c:1646  */
+#line 3594 "edif.c" /* yacc.c:1646  */
     break;
 
   case 393:
-#line 1245 "edif.y" /* yacc.c:1646  */
+#line 1247 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3596 "edif.c" /* yacc.c:1646  */
+#line 3600 "edif.c" /* yacc.c:1646  */
     break;
 
   case 397:
-#line 1253 "edif.y" /* yacc.c:1646  */
+#line 1255 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3602 "edif.c" /* yacc.c:1646  */
+#line 3606 "edif.c" /* yacc.c:1646  */
     break;
 
   case 408:
-#line 1268 "edif.y" /* yacc.c:1646  */
+#line 1270 "edif.y" /* yacc.c:1646  */
     { pair_list_free((yyvsp[0].pl)); }
-#line 3608 "edif.c" /* yacc.c:1646  */
+#line 3612 "edif.c" /* yacc.c:1646  */
     break;
 
   case 437:
-#line 1318 "edif.y" /* yacc.c:1646  */
+#line 1320 "edif.y" /* yacc.c:1646  */
     { (yyval.pl) = new_pair_list((yyvsp[-1].ps)); }
-#line 3614 "edif.c" /* yacc.c:1646  */
+#line 3618 "edif.c" /* yacc.c:1646  */
     break;
 
   case 438:
-#line 1321 "edif.y" /* yacc.c:1646  */
+#line 1323 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=NULL; }
-#line 3620 "edif.c" /* yacc.c:1646  */
+#line 3624 "edif.c" /* yacc.c:1646  */
     break;
 
   case 439:
-#line 1322 "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 3626 "edif.c" /* yacc.c:1646  */
+#line 3630 "edif.c" /* yacc.c:1646  */
     break;
 
   case 455:
-#line 1348 "edif.y" /* yacc.c:1646  */
+#line 1350 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3632 "edif.c" /* yacc.c:1646  */
+#line 3636 "edif.c" /* yacc.c:1646  */
     break;
 
   case 459:
-#line 1358 "edif.y" /* yacc.c:1646  */
+#line 1360 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3638 "edif.c" /* yacc.c:1646  */
+#line 3642 "edif.c" /* yacc.c:1646  */
     break;
 
   case 460:
-#line 1361 "edif.y" /* yacc.c:1646  */
+#line 1363 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3644 "edif.c" /* yacc.c:1646  */
+#line 3648 "edif.c" /* yacc.c:1646  */
     break;
 
   case 462:
-#line 1367 "edif.y" /* yacc.c:1646  */
+#line 1369 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3650 "edif.c" /* yacc.c:1646  */
+#line 3654 "edif.c" /* yacc.c:1646  */
     break;
 
   case 463:
-#line 1370 "edif.y" /* yacc.c:1646  */
+#line 1372 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3656 "edif.c" /* yacc.c:1646  */
+#line 3660 "edif.c" /* yacc.c:1646  */
     break;
 
   case 483:
-#line 1412 "edif.y" /* yacc.c:1646  */
+#line 1414 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3662 "edif.c" /* yacc.c:1646  */
+#line 3666 "edif.c" /* yacc.c:1646  */
     break;
 
   case 484:
-#line 1415 "edif.y" /* yacc.c:1646  */
+#line 1417 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3668 "edif.c" /* yacc.c:1646  */
+#line 3672 "edif.c" /* yacc.c:1646  */
     break;
 
   case 492:
-#line 1429 "edif.y" /* yacc.c:1646  */
+#line 1431 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3674 "edif.c" /* yacc.c:1646  */
+#line 3678 "edif.c" /* yacc.c:1646  */
     break;
 
   case 506:
-#line 1457 "edif.y" /* yacc.c:1646  */
+#line 1459 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3680 "edif.c" /* yacc.c:1646  */
+#line 3684 "edif.c" /* yacc.c:1646  */
     break;
 
   case 507:
-#line 1460 "edif.y" /* yacc.c:1646  */
+#line 1462 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3686 "edif.c" /* yacc.c:1646  */
+#line 3690 "edif.c" /* yacc.c:1646  */
     break;
 
   case 514:
-#line 1475 "edif.y" /* yacc.c:1646  */
+#line 1477 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3692 "edif.c" /* yacc.c:1646  */
+#line 3696 "edif.c" /* yacc.c:1646  */
     break;
 
   case 549:
-#line 1530 "edif.y" /* yacc.c:1646  */
+#line 1532 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3698 "edif.c" /* yacc.c:1646  */
+#line 3702 "edif.c" /* yacc.c:1646  */
     break;
 
   case 555:
-#line 1542 "edif.y" /* yacc.c:1646  */
+#line 1544 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3704 "edif.c" /* yacc.c:1646  */
+#line 3708 "edif.c" /* yacc.c:1646  */
     break;
 
   case 560:
-#line 1551 "edif.y" /* yacc.c:1646  */
+#line 1553 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); }
-#line 3710 "edif.c" /* yacc.c:1646  */
+#line 3714 "edif.c" /* yacc.c:1646  */
     break;
 
   case 561:
-#line 1554 "edif.y" /* yacc.c:1646  */
+#line 1556 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3716 "edif.c" /* yacc.c:1646  */
+#line 3720 "edif.c" /* yacc.c:1646  */
     break;
 
   case 562:
-#line 1555 "edif.y" /* yacc.c:1646  */
+#line 1557 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3722 "edif.c" /* yacc.c:1646  */
+#line 3726 "edif.c" /* yacc.c:1646  */
     break;
 
   case 582:
-#line 1597 "edif.y" /* yacc.c:1646  */
+#line 1599 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3728 "edif.c" /* yacc.c:1646  */
+#line 3732 "edif.c" /* yacc.c:1646  */
     break;
 
   case 585:
-#line 1600 "edif.y" /* yacc.c:1646  */
+#line 1602 "edif.y" /* yacc.c:1646  */
     { pair_list_free((yyvsp[0].pl)); }
-#line 3734 "edif.c" /* yacc.c:1646  */
+#line 3738 "edif.c" /* yacc.c:1646  */
     break;
 
   case 586:
-#line 1603 "edif.y" /* yacc.c:1646  */
+#line 1605 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[-1].s); }
-#line 3740 "edif.c" /* yacc.c:1646  */
+#line 3744 "edif.c" /* yacc.c:1646  */
     break;
 
   case 587:
-#line 1606 "edif.y" /* yacc.c:1646  */
+#line 1608 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3746 "edif.c" /* yacc.c:1646  */
+#line 3750 "edif.c" /* yacc.c:1646  */
     break;
 
   case 589:
-#line 1610 "edif.y" /* yacc.c:1646  */
+#line 1612 "edif.y" /* yacc.c:1646  */
     { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); }
-#line 3752 "edif.c" /* yacc.c:1646  */
+#line 3756 "edif.c" /* yacc.c:1646  */
     break;
 
   case 590:
-#line 1611 "edif.y" /* yacc.c:1646  */
+#line 1613 "edif.y" /* yacc.c:1646  */
     { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); }
-#line 3758 "edif.c" /* yacc.c:1646  */
+#line 3762 "edif.c" /* yacc.c:1646  */
     break;
 
   case 591:
-#line 1612 "edif.y" /* yacc.c:1646  */
+#line 1614 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=(yyvsp[0].ps); }
-#line 3764 "edif.c" /* yacc.c:1646  */
+#line 3768 "edif.c" /* yacc.c:1646  */
     break;
 
   case 592:
-#line 1615 "edif.y" /* yacc.c:1646  */
+#line 1617 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3770 "edif.c" /* yacc.c:1646  */
+#line 3774 "edif.c" /* yacc.c:1646  */
     break;
 
   case 593:
-#line 1616 "edif.y" /* yacc.c:1646  */
+#line 1618 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3776 "edif.c" /* yacc.c:1646  */
+#line 3780 "edif.c" /* yacc.c:1646  */
     break;
 
   case 594:
-#line 1619 "edif.y" /* yacc.c:1646  */
+#line 1621 "edif.y" /* yacc.c:1646  */
     { define_pcb_net((yyvsp[-2].ps), (yyvsp[-1].pl)); }
-#line 3782 "edif.c" /* yacc.c:1646  */
+#line 3786 "edif.c" /* yacc.c:1646  */
     break;
 
   case 595:
-#line 1622 "edif.y" /* yacc.c:1646  */
+#line 1624 "edif.y" /* yacc.c:1646  */
     { (yyval.pl)=(yyvsp[0].pl); }
-#line 3788 "edif.c" /* yacc.c:1646  */
+#line 3792 "edif.c" /* yacc.c:1646  */
     break;
 
   case 611:
-#line 1644 "edif.y" /* yacc.c:1646  */
+#line 1646 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[-2].ps)); }
-#line 3794 "edif.c" /* yacc.c:1646  */
+#line 3798 "edif.c" /* yacc.c:1646  */
     break;
 
   case 632:
-#line 1681 "edif.y" /* yacc.c:1646  */
+#line 1683 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=(yyvsp[0].ps); }
-#line 3800 "edif.c" /* yacc.c:1646  */
+#line 3804 "edif.c" /* yacc.c:1646  */
     break;
 
   case 633:
-#line 1682 "edif.y" /* yacc.c:1646  */
+#line 1684 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=NULL; }
-#line 3806 "edif.c" /* yacc.c:1646  */
+#line 3810 "edif.c" /* yacc.c:1646  */
     break;
 
   case 634:
-#line 1686 "edif.y" /* yacc.c:1646  */
+#line 1688 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3812 "edif.c" /* yacc.c:1646  */
+#line 3816 "edif.c" /* yacc.c:1646  */
     break;
 
   case 639:
-#line 1695 "edif.y" /* yacc.c:1646  */
+#line 1697 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3818 "edif.c" /* yacc.c:1646  */
+#line 3822 "edif.c" /* yacc.c:1646  */
     break;
 
   case 644:
-#line 1706 "edif.y" /* yacc.c:1646  */
+#line 1708 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3824 "edif.c" /* yacc.c:1646  */
+#line 3828 "edif.c" /* yacc.c:1646  */
     break;
 
   case 698:
-#line 1808 "edif.y" /* yacc.c:1646  */
+#line 1810 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-3].s)); }
-#line 3830 "edif.c" /* yacc.c:1646  */
+#line 3834 "edif.c" /* yacc.c:1646  */
     break;
 
   case 701:
-#line 1815 "edif.y" /* yacc.c:1646  */
+#line 1817 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3836 "edif.c" /* yacc.c:1646  */
+#line 3840 "edif.c" /* yacc.c:1646  */
     break;
 
   case 727:
-#line 1867 "edif.y" /* yacc.c:1646  */
+#line 1869 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 3842 "edif.c" /* yacc.c:1646  */
+#line 3846 "edif.c" /* yacc.c:1646  */
     break;
 
   case 730:
-#line 1874 "edif.y" /* yacc.c:1646  */
+#line 1876 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3848 "edif.c" /* yacc.c:1646  */
+#line 3852 "edif.c" /* yacc.c:1646  */
     break;
 
   case 747:
-#line 1909 "edif.y" /* yacc.c:1646  */
+#line 1911 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 3854 "edif.c" /* yacc.c:1646  */
+#line 3858 "edif.c" /* yacc.c:1646  */
     break;
 
   case 766:
-#line 1940 "edif.y" /* yacc.c:1646  */
+#line 1942 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3860 "edif.c" /* yacc.c:1646  */
+#line 3864 "edif.c" /* yacc.c:1646  */
     break;
 
   case 789:
-#line 1975 "edif.y" /* yacc.c:1646  */
+#line 1977 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3866 "edif.c" /* yacc.c:1646  */
+#line 3870 "edif.c" /* yacc.c:1646  */
     break;
 
   case 791:
-#line 1981 "edif.y" /* yacc.c:1646  */
+#line 1983 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3872 "edif.c" /* yacc.c:1646  */
+#line 3876 "edif.c" /* yacc.c:1646  */
     break;
 
   case 803:
-#line 1997 "edif.y" /* yacc.c:1646  */
+#line 1999 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3878 "edif.c" /* yacc.c:1646  */
+#line 3882 "edif.c" /* yacc.c:1646  */
     break;
 
   case 818:
-#line 2016 "edif.y" /* yacc.c:1646  */
+#line 2018 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3884 "edif.c" /* yacc.c:1646  */
+#line 3888 "edif.c" /* yacc.c:1646  */
     break;
 
   case 823:
-#line 2027 "edif.y" /* yacc.c:1646  */
+#line 2029 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3890 "edif.c" /* yacc.c:1646  */
+#line 3894 "edif.c" /* yacc.c:1646  */
     break;
 
   case 827:
-#line 2033 "edif.y" /* yacc.c:1646  */
+#line 2035 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3896 "edif.c" /* yacc.c:1646  */
+#line 3900 "edif.c" /* yacc.c:1646  */
     break;
 
   case 829:
-#line 2037 "edif.y" /* yacc.c:1646  */
+#line 2039 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3902 "edif.c" /* yacc.c:1646  */
+#line 3906 "edif.c" /* yacc.c:1646  */
     break;
 
   case 831:
-#line 2042 "edif.y" /* yacc.c:1646  */
+#line 2044 "edif.y" /* yacc.c:1646  */
     {
     if ((yyvsp[-1].ps))
     {
@@ -3915,251 +3919,251 @@
 	(yyval.ps) = new_str_pair(NULL,(yyvsp[-2].s));
     }
 }
-#line 3919 "edif.c" /* yacc.c:1646  */
+#line 3923 "edif.c" /* yacc.c:1646  */
     break;
 
   case 832:
-#line 2056 "edif.y" /* yacc.c:1646  */
+#line 2058 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=NULL; }
-#line 3925 "edif.c" /* yacc.c:1646  */
+#line 3929 "edif.c" /* yacc.c:1646  */
     break;
 
   case 833:
-#line 2057 "edif.y" /* yacc.c:1646  */
+#line 2059 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=(yyvsp[0].ps); }
-#line 3931 "edif.c" /* yacc.c:1646  */
+#line 3935 "edif.c" /* yacc.c:1646  */
     break;
 
   case 834:
-#line 2058 "edif.y" /* yacc.c:1646  */
+#line 2060 "edif.y" /* yacc.c:1646  */
     { (yyval.ps) = new_str_pair((yyvsp[0].s),NULL); }
-#line 3937 "edif.c" /* yacc.c:1646  */
+#line 3941 "edif.c" /* yacc.c:1646  */
     break;
 
   case 835:
-#line 2059 "edif.y" /* yacc.c:1646  */
+#line 2061 "edif.y" /* yacc.c:1646  */
     { (yyval.ps)=NULL; }
-#line 3943 "edif.c" /* yacc.c:1646  */
+#line 3947 "edif.c" /* yacc.c:1646  */
     break;
 
   case 848:
-#line 2086 "edif.y" /* yacc.c:1646  */
+#line 2088 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3949 "edif.c" /* yacc.c:1646  */
+#line 3953 "edif.c" /* yacc.c:1646  */
     break;
 
   case 849:
-#line 2089 "edif.y" /* yacc.c:1646  */
+#line 2091 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3955 "edif.c" /* yacc.c:1646  */
+#line 3959 "edif.c" /* yacc.c:1646  */
     break;
 
   case 881:
-#line 2142 "edif.y" /* yacc.c:1646  */
+#line 2144 "edif.y" /* yacc.c:1646  */
     { (yyval.ps) = new_str_pair((yyvsp[-2].s),(yyvsp[-1].s)); }
-#line 3961 "edif.c" /* yacc.c:1646  */
+#line 3965 "edif.c" /* yacc.c:1646  */
     break;
 
   case 882:
-#line 2145 "edif.y" /* yacc.c:1646  */
+#line 2147 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3967 "edif.c" /* yacc.c:1646  */
+#line 3971 "edif.c" /* yacc.c:1646  */
     break;
 
   case 883:
-#line 2146 "edif.y" /* yacc.c:1646  */
+#line 2148 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3973 "edif.c" /* yacc.c:1646  */
+#line 3977 "edif.c" /* yacc.c:1646  */
     break;
 
   case 884:
-#line 2149 "edif.y" /* yacc.c:1646  */
+#line 2151 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 3979 "edif.c" /* yacc.c:1646  */
+#line 3983 "edif.c" /* yacc.c:1646  */
     break;
 
   case 885:
-#line 2150 "edif.y" /* yacc.c:1646  */
+#line 2152 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=NULL; }
-#line 3985 "edif.c" /* yacc.c:1646  */
+#line 3989 "edif.c" /* yacc.c:1646  */
     break;
 
   case 889:
-#line 2160 "edif.y" /* yacc.c:1646  */
+#line 2162 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 3991 "edif.c" /* yacc.c:1646  */
+#line 3995 "edif.c" /* yacc.c:1646  */
     break;
 
   case 891:
-#line 2166 "edif.y" /* yacc.c:1646  */
+#line 2168 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 3997 "edif.c" /* yacc.c:1646  */
+#line 4001 "edif.c" /* yacc.c:1646  */
     break;
 
   case 892:
-#line 2167 "edif.y" /* yacc.c:1646  */
+#line 2169 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 4003 "edif.c" /* yacc.c:1646  */
+#line 4007 "edif.c" /* yacc.c:1646  */
     break;
 
   case 893:
-#line 2170 "edif.y" /* yacc.c:1646  */
+#line 2172 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 4009 "edif.c" /* yacc.c:1646  */
+#line 4013 "edif.c" /* yacc.c:1646  */
     break;
 
   case 894:
-#line 2173 "edif.y" /* yacc.c:1646  */
+#line 2175 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-2].s)); free((yyvsp[-1].s)); }
-#line 4015 "edif.c" /* yacc.c:1646  */
+#line 4019 "edif.c" /* yacc.c:1646  */
     break;
 
   case 896:
-#line 2179 "edif.y" /* yacc.c:1646  */
+#line 2181 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4021 "edif.c" /* yacc.c:1646  */
+#line 4025 "edif.c" /* yacc.c:1646  */
     break;
 
   case 898:
-#line 2181 "edif.y" /* yacc.c:1646  */
+#line 2183 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4027 "edif.c" /* yacc.c:1646  */
+#line 4031 "edif.c" /* yacc.c:1646  */
     break;
 
   case 903:
-#line 2192 "edif.y" /* yacc.c:1646  */
+#line 2194 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4033 "edif.c" /* yacc.c:1646  */
+#line 4037 "edif.c" /* yacc.c:1646  */
     break;
 
   case 935:
-#line 2256 "edif.y" /* yacc.c:1646  */
+#line 2258 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4039 "edif.c" /* yacc.c:1646  */
+#line 4043 "edif.c" /* yacc.c:1646  */
     break;
 
   case 943:
-#line 2272 "edif.y" /* yacc.c:1646  */
+#line 2274 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4045 "edif.c" /* yacc.c:1646  */
+#line 4049 "edif.c" /* yacc.c:1646  */
     break;
 
   case 946:
-#line 2277 "edif.y" /* yacc.c:1646  */
+#line 2279 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4051 "edif.c" /* yacc.c:1646  */
+#line 4055 "edif.c" /* yacc.c:1646  */
     break;
 
   case 973:
-#line 2322 "edif.y" /* yacc.c:1646  */
+#line 2324 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4057 "edif.c" /* yacc.c:1646  */
+#line 4061 "edif.c" /* yacc.c:1646  */
     break;
 
   case 987:
-#line 2344 "edif.y" /* yacc.c:1646  */
+#line 2346 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 4063 "edif.c" /* yacc.c:1646  */
+#line 4067 "edif.c" /* yacc.c:1646  */
     break;
 
   case 994:
-#line 2360 "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 4069 "edif.c" /* yacc.c:1646  */
+#line 4073 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1054:
-#line 2467 "edif.y" /* yacc.c:1646  */
+#line 2469 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4075 "edif.c" /* yacc.c:1646  */
+#line 4079 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1055:
-#line 2468 "edif.y" /* yacc.c:1646  */
+#line 2470 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4081 "edif.c" /* yacc.c:1646  */
+#line 4085 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1056:
-#line 2469 "edif.y" /* yacc.c:1646  */
+#line 2471 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4087 "edif.c" /* yacc.c:1646  */
+#line 4091 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1057:
-#line 2470 "edif.y" /* yacc.c:1646  */
+#line 2472 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4093 "edif.c" /* yacc.c:1646  */
+#line 4097 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1059:
-#line 2474 "edif.y" /* yacc.c:1646  */
+#line 2476 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4099 "edif.c" /* yacc.c:1646  */
+#line 4103 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1061:
-#line 2478 "edif.y" /* yacc.c:1646  */
+#line 2480 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4105 "edif.c" /* yacc.c:1646  */
+#line 4109 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1063:
-#line 2482 "edif.y" /* yacc.c:1646  */
+#line 2484 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[-1].s)); }
-#line 4111 "edif.c" /* yacc.c:1646  */
+#line 4115 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1085:
-#line 2518 "edif.y" /* yacc.c:1646  */
+#line 2520 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4117 "edif.c" /* yacc.c:1646  */
+#line 4121 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1086:
-#line 2521 "edif.y" /* yacc.c:1646  */
+#line 2523 "edif.y" /* yacc.c:1646  */
     { free((yyvsp[0].s)); }
-#line 4123 "edif.c" /* yacc.c:1646  */
+#line 4127 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1107:
-#line 2562 "edif.y" /* yacc.c:1646  */
+#line 2564 "edif.y" /* yacc.c:1646  */
     { str_pair_free((yyvsp[0].ps)); }
-#line 4129 "edif.c" /* yacc.c:1646  */
+#line 4133 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1109:
-#line 2564 "edif.y" /* yacc.c:1646  */
+#line 2566 "edif.y" /* yacc.c:1646  */
     { pair_list_free((yyvsp[0].pl)); }
-#line 4135 "edif.c" /* yacc.c:1646  */
+#line 4139 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1126:
-#line 2591 "edif.y" /* yacc.c:1646  */
+#line 2593 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 4141 "edif.c" /* yacc.c:1646  */
+#line 4145 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1127:
-#line 2594 "edif.y" /* yacc.c:1646  */
+#line 2596 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 4147 "edif.c" /* yacc.c:1646  */
+#line 4151 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1128:
-#line 2597 "edif.y" /* yacc.c:1646  */
+#line 2599 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 4153 "edif.c" /* yacc.c:1646  */
+#line 4157 "edif.c" /* yacc.c:1646  */
     break;
 
   case 1129:
-#line 2600 "edif.y" /* yacc.c:1646  */
+#line 2602 "edif.y" /* yacc.c:1646  */
     { (yyval.s)=(yyvsp[0].s); }
-#line 4159 "edif.c" /* yacc.c:1646  */
+#line 4163 "edif.c" /* yacc.c:1646  */
     break;
 
 
-#line 4163 "edif.c" /* yacc.c:1646  */
+#line 4167 "edif.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4387,7 +4391,7 @@
 #endif
   return yyresult;
 }
-#line 2603 "edif.y" /* yacc.c:1906  */
+#line 2605 "edif.y" /* yacc.c:1906  */
 
 /*
  *	xmalloc:
Index: edif.h
===================================================================
--- edif.h	(revision 4506)
+++ edif.h	(revision 4507)
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -342,10 +342,10 @@
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
+
 union YYSTYPE
 {
-#line 199 "edif.y" /* yacc.c:1909  */
+#line 201 "edif.y" /* yacc.c:1909  */
 
     char* s;
     pair_list* pl;
@@ -353,6 +353,8 @@
 
 #line 355 "edif.h" /* yacc.c:1909  */
 };
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 #endif
Index: edif.y
===================================================================
--- edif.y	(revision 4506)
+++ edif.y	(revision 4507)
@@ -27,7 +27,9 @@
 #include <ctype.h>
 
 #include "global.h"
+#include "board.h"
 #include "data.h"
+#include "library.h"
 #include "error.h"
 #include "plugins.h"
 #include "compat_misc.h"