Fixed some splintme errors from the previous code change.

diff --git a/src/Headers/stateClause.h b/src/Headers/stateClause.h
index 520460b233e8f1a439f4bd3be90ee1d20748968f..6b141705a1d2efce882c370e54096e9b714da42c 100644 (file)
--- a/src/Headers/stateClause.h
+++ b/src/Headers/stateClause.h
@@ -113,6 +113,10 @@ extern bool stateClause_hasRequires (stateClause p_cl) /*@*/ ;
 extern bool stateClause_setsMetaState (stateClause p_cl) /*@*/ ;
 extern qual stateClause_getMetaQual (stateClause p_cl) /*@*/ ;
 
+extern bool stateClause_hasEmptyReferences (stateClause p_s);
+
+extern bool stateClause_isMetaState (stateClause p_s);
+
 # else
 # error "Multiple include"
 # endif

diff --git a/src/cgrammar.c.der b/src/cgrammar.c.der
index 65cd3e15187f5b74d48a90389500e3f3d00c67ad..500eb7b2d5c14fb4b3de8752a908ea6bc0452775 100644 (file)
--- a/src/cgrammar.c.der
+++ b/src/cgrammar.c.der
@@ -749,57 +749,57 @@ static const short yyrline[] =
      906,   907,   907,   913,   914,   915,   916,   917,   918,   919,
      920,   921,   922,   927,   928,   932,   933,   934,   935,   936,
      937,   938,   939,   940,   941,   942,   946,   947,   949,   953,
-     959,   959,   962,   965,   969,   970,   971,   972,   978,   979,
-     984,   985,   986,   987,   991,   992,   993,   997,   998,   999,
-    1003,  1004,  1005,  1006,  1007,  1011,  1012,  1013,  1017,  1018,
-    1022,  1023,  1027,  1028,  1032,  1033,  1033,  1045,  1046,  1046,
-    1059,  1060,  1060,  1060,  1066,  1067,  1068,  1069,  1070,  1071,
-    1072,  1073,  1074,  1075,  1076,  1077,  1081,  1082,  1086,  1087,
-    1091,  1097,  1098,  1099,  1103,  1117,  1117,  1128,  1128,  1137,
-    1138,  1142,  1147,  1147,  1152,  1152,  1155,  1156,  1160,  1164,
-    1168,  1172,  1173,  1177,  1181,  1182,  1186,  1187,  1191,  1192,
-    1193,  1194,  1202,  1203,  1208,  1209,  1213,  1214,  1218,  1220,
-    1230,  1231,  1232,  1233,  1234,  1238,  1242,  1242,  1258,  1262,
-    1266,  1266,  1280,  1280,  1312,  1313,  1317,  1318,  1319,  1320,
-    1321,  1325,  1326,  1327,  1328,  1332,  1333,  1334,  1335,  1336,
-    1337,  1338,  1339,  1340,  1341,  1342,  1343,  1344,  1345,  1346,
-    1347,  1348,  1352,  1353,  1357,  1358,  1362,  1363,  1367,  1368,
-    1369,  1370,  1371,  1375,  1376,  1377,  1378,  1379,  1380,  1384,
-    1385,  1386,  1387,  1391,  1392,  1393,  1394,  1398,  1399,  1400,
-    1401,  1402,  1403,  1404,  1405,  1406,  1407,  1408,  1409,  1417,
-    1418,  1419,  1420,  1421,  1422,  1423,  1424,  1425,  1426,  1427,
-    1428,  1429,  1430,  1434,  1439,  1440,  1445,  1446,  1451,  1452,
-    1453,  1457,  1458,  1462,  1469,  1469,  1469,  1475,  1475,  1475,
-    1480,  1482,  1484,  1484,  1484,  1489,  1489,  1489,  1494,  1496,
-    1498,  1499,  1503,  1507,  1508,  1509,  1513,  1515,  1520,  1522,
-    1527,  1528,  1529,  1534,  1536,  1536,  1538,  1542,  1544,  1546,
-    1550,  1555,  1563,  1564,  1565,  1571,  1576,  1577,  1582,  1583,
-    1587,  1588,  1589,  1593,  1594,  1598,  1599,  1600,  1601,  1605,
-    1606,  1610,  1611,  1615,  1616,  1617,  1621,  1621,  1622,  1622,
-    1627,  1639,  1656,  1657,  1661,  1662,  1663,  1667,  1668,  1672,
-    1674,  1675,  1677,  1678,  1680,  1682,  1684,  1686,  1693,  1694,
-    1695,  1696,  1697,  1698,  1699,  1700,  1701,  1706,  1710,  1714,
-    1715,  1720,  1722,  1724,  1726,  1731,  1731,  1731,  1739,  1739,
-    1743,  1747,  1748,  1749,  1750,  1751,  1752,  1753,  1754,  1755,
-    1756,  1757,  1758,  1759,  1763,  1763,  1770,  1774,  1778,  1779,
-    1783,  1784,  1785,  1786,  1787,  1788,  1789,  1790,  1791,  1792,
-    1793,  1797,  1798,  1806,  1807,  1814,  1814,  1816,  1816,  1821,
-    1821,  1823,  1823,  1828,  1829,  1834,  1838,  1842,  1846,  1850,
-    1854,  1858,  1859,  1860,  1861,  1863,  1864,  1866,  1868,  1875,
-    1880,  1882,  1884,  1886,  1891,  1892,  1896,  1897,  1901,  1902,
-    1906,  1907,  1911,  1912,  1916,  1917,  1921,  1922,  1923,  1927,
-    1941,  1946,  1946,  1951,  1951,  1956,  1962,  1966,  1966,  1966,
-    1977,  1978,  1978,  1983,  1984,  1985,  1996,  2004,  2005,  2009,
-    2010,  2014,  2015,  2016,  2017,  2018,  2020,  2021,  2022,  2023,
-    2027,  2028,  2029,  2030,  2031,  2032,  2033,  2034,  2035,  2036,
-    2040,  2041,  2045,  2046,  2047,  2048,  2052,  2053,  2054,  2058,
-    2059,  2060,  2064,  2065,  2066,  2067,  2068,  2072,  2073,  2074,
-    2078,  2079,  2083,  2084,  2088,  2089,  2093,  2094,  2098,  2099,
-    2103,  2104,  2104,  2104,  2110,  2111,  2112,  2113,  2114,  2115,
-    2116,  2117,  2118,  2119,  2120,  2121,  2125,  2126,  2130,  2134,
-    2136,  2138,  2143,  2144,  2146,  2148,  2152,  2153,  2154,  2156,
-    2157,  2158,  2159,  2160,  2161,  2162,  2166,  2167,  2171,  2172,
-    2176,  2180,  2181,  2182,  2183,  2184,  2188,  2189,  2190,  2191
+     959,   959,   963,   966,   970,   971,   972,   973,   979,   980,
+     985,   986,   987,   988,   992,   993,   994,   998,   999,  1000,
+    1004,  1005,  1006,  1007,  1008,  1012,  1013,  1014,  1018,  1019,
+    1023,  1024,  1028,  1029,  1033,  1034,  1034,  1046,  1047,  1047,
+    1060,  1061,  1061,  1061,  1067,  1068,  1069,  1070,  1071,  1072,
+    1073,  1074,  1075,  1076,  1077,  1078,  1082,  1083,  1087,  1088,
+    1092,  1098,  1099,  1100,  1104,  1118,  1118,  1129,  1129,  1138,
+    1139,  1143,  1148,  1148,  1153,  1153,  1156,  1157,  1161,  1165,
+    1169,  1173,  1174,  1178,  1182,  1183,  1187,  1188,  1192,  1193,
+    1194,  1195,  1203,  1204,  1209,  1210,  1214,  1215,  1219,  1221,
+    1231,  1232,  1233,  1234,  1235,  1239,  1243,  1243,  1259,  1263,
+    1267,  1267,  1281,  1281,  1313,  1314,  1318,  1319,  1320,  1321,
+    1322,  1326,  1327,  1328,  1329,  1333,  1334,  1335,  1336,  1337,
+    1338,  1339,  1340,  1341,  1342,  1343,  1344,  1345,  1346,  1347,
+    1348,  1349,  1353,  1354,  1358,  1359,  1363,  1364,  1368,  1369,
+    1370,  1371,  1372,  1376,  1377,  1378,  1379,  1380,  1381,  1385,
+    1386,  1387,  1388,  1392,  1393,  1394,  1395,  1399,  1400,  1401,
+    1402,  1403,  1404,  1405,  1406,  1407,  1408,  1409,  1410,  1418,
+    1419,  1420,  1421,  1422,  1423,  1424,  1425,  1426,  1427,  1428,
+    1429,  1430,  1431,  1435,  1440,  1441,  1446,  1447,  1452,  1453,
+    1454,  1458,  1459,  1463,  1470,  1470,  1470,  1476,  1476,  1476,
+    1481,  1483,  1485,  1485,  1485,  1490,  1490,  1490,  1495,  1497,
+    1499,  1500,  1504,  1508,  1509,  1510,  1514,  1516,  1521,  1523,
+    1528,  1529,  1530,  1535,  1537,  1537,  1539,  1543,  1545,  1547,
+    1551,  1556,  1564,  1565,  1566,  1572,  1577,  1578,  1583,  1584,
+    1588,  1589,  1590,  1594,  1595,  1599,  1600,  1601,  1602,  1606,
+    1607,  1611,  1612,  1616,  1617,  1618,  1622,  1622,  1623,  1623,
+    1628,  1640,  1657,  1658,  1662,  1663,  1664,  1668,  1669,  1673,
+    1675,  1676,  1678,  1679,  1681,  1683,  1685,  1687,  1694,  1695,
+    1696,  1697,  1698,  1699,  1700,  1701,  1702,  1707,  1711,  1715,
+    1716,  1721,  1723,  1725,  1727,  1732,  1732,  1732,  1740,  1740,
+    1744,  1748,  1749,  1750,  1751,  1752,  1753,  1754,  1755,  1756,
+    1757,  1758,  1759,  1760,  1764,  1764,  1771,  1775,  1779,  1780,
+    1784,  1785,  1786,  1787,  1788,  1789,  1790,  1791,  1792,  1793,
+    1794,  1798,  1799,  1807,  1808,  1815,  1815,  1817,  1817,  1822,
+    1822,  1824,  1824,  1829,  1830,  1835,  1839,  1843,  1847,  1851,
+    1855,  1859,  1860,  1861,  1862,  1864,  1865,  1867,  1869,  1876,
+    1881,  1883,  1885,  1887,  1892,  1893,  1897,  1898,  1902,  1903,
+    1907,  1908,  1912,  1913,  1917,  1918,  1922,  1923,  1924,  1928,
+    1942,  1947,  1947,  1952,  1952,  1957,  1963,  1967,  1967,  1967,
+    1978,  1979,  1979,  1984,  1985,  1986,  1997,  2005,  2006,  2010,
+    2011,  2015,  2016,  2017,  2018,  2019,  2021,  2022,  2023,  2024,
+    2028,  2029,  2030,  2031,  2032,  2033,  2034,  2035,  2036,  2037,
+    2041,  2042,  2046,  2047,  2048,  2049,  2053,  2054,  2055,  2059,
+    2060,  2061,  2065,  2066,  2067,  2068,  2069,  2073,  2074,  2075,
+    2079,  2080,  2084,  2085,  2089,  2090,  2094,  2095,  2099,  2100,
+    2104,  2105,  2105,  2105,  2111,  2112,  2113,  2114,  2115,  2116,
+    2117,  2118,  2119,  2120,  2121,  2122,  2126,  2127,  2131,  2135,
+    2137,  2139,  2144,  2145,  2147,  2149,  2153,  2154,  2155,  2157,
+    2158,  2159,  2160,  2161,  2162,  2163,  2167,  2168,  2172,  2173,
+    2177,  2181,  2182,  2183,  2184,  2185,  2189,  2190,  2191,  2192
 };
 #endif
 

diff --git a/src/functionClause.c b/src/functionClause.c
index f63810ce9206a18430392b43e7ddab151820b658..a127ed45f31c12965949e4b15bbe72eda64f5f2e 100644 (file)
--- a/src/functionClause.c
+++ b/src/functionClause.c
@@ -57,6 +57,7 @@ extern functionClause functionClause_createState (stateClause node) /*@*/
       (!stateClause_isMetaState (node) ) )
     {
       DPRINTF((message("functionClause_createState:: Returning functionClause_undefined" ) ));
+      stateClause_free (node);
       return functionClause_undefined;
     }
   else

diff --git a/src/stateClause.c b/src/stateClause.c
index 5b7fbce3c6f9eb496fe2afbeccbbf9ea34ac59bf..249e34e4f2907066af0b2231692314cb813c4368 100644 (file)
--- a/src/stateClause.c
+++ b/src/stateClause.c
@@ -60,6 +60,7 @@ bool stateClause_isMetaState (stateClause s)
   else
     return FALSE;
 }
+/*end drl added*/
 
 stateClause 
 stateClause_create (lltok tok, qual q, sRefSet s)