X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/e5081f8c08424e4511d50a3b1fc187666c95852c..16c024b587f5ddc115928d5cca7095508aa208d9:/src/cgrammar.c.der diff --git a/src/cgrammar.c.der b/src/cgrammar.c.der index 9e4421e..8c3a3e2 100644 --- a/src/cgrammar.c.der +++ b/src/cgrammar.c.der @@ -284,6 +284,7 @@ extern void yyerror (char *); # include "splintMacros.nf" # include "basic.h" # include "cscanner.h" +# include "cscannerHelp.h" # include "cgrammar.h" # include "exprChecks.h" @@ -728,77 +729,77 @@ static const short yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const short yyrline[] = { - 0, 324, 325, 329, 330, 334, 335, 336, 337, 338, - 339, 340, 341, 345, 347, 352, 352, 361, 367, 372, - 373, 378, 379, 381, 383, 400, 400, 418, 418, 433, - 434, 436, 440, 457, 457, 469, 469, 483, 483, 483, - 492, 493, 494, 495, 499, 503, 508, 508, 513, 513, - 521, 522, 526, 532, 533, 537, 538, 542, 548, 549, - 553, 554, 555, 559, 560, 561, 567, 568, 572, 574, - 576, 578, 587, 589, 591, 593, 610, 614, 615, 622, - 623, 632, 634, 639, 640, 641, 642, 643, 644, 648, - 649, 650, 651, 652, 653, 657, 661, 661, 670, 674, - 678, 678, 693, 695, 700, 704, 705, 709, 713, 719, - 724, 725, 729, 733, 734, 738, 739, 740, 744, 745, - 746, 747, 748, 752, 753, 754, 755, 756, 760, 761, - 765, 772, 777, 777, 783, 783, 783, 794, 805, 806, - 810, 811, 812, 813, 814, 815, 816, 817, 818, 822, - 823, 828, 829, 833, 835, 837, 838, 839, 840, 841, - 843, 848, 849, 853, 857, 870, 871, 872, 873, 874, - 875, 876, 876, 882, 883, 884, 885, 886, 887, 888, - 889, 890, 891, 896, 897, 901, 902, 903, 904, 905, - 906, 907, 908, 909, 910, 911, 915, 916, 918, 922, - 928, 928, 933, 934, 935, 936, 940, 941, 946, 947, - 948, 949, 953, 954, 955, 959, 960, 961, 965, 966, - 967, 968, 969, 973, 974, 975, 979, 980, 984, 985, - 989, 990, 994, 995, 995, 1007, 1008, 1008, 1021, 1022, - 1022, 1022, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, - 1036, 1037, 1038, 1039, 1043, 1044, 1048, 1049, 1053, 1059, - 1060, 1061, 1065, 1079, 1079, 1090, 1090, 1099, 1100, 1104, - 1109, 1109, 1114, 1114, 1117, 1118, 1122, 1126, 1130, 1134, - 1135, 1139, 1143, 1144, 1148, 1149, 1153, 1154, 1155, 1156, - 1164, 1165, 1170, 1171, 1175, 1176, 1180, 1182, 1192, 1193, - 1194, 1195, 1196, 1200, 1204, 1204, 1220, 1224, 1228, 1228, - 1242, 1242, 1274, 1275, 1279, 1280, 1281, 1282, 1283, 1287, - 1288, 1289, 1290, 1294, 1295, 1296, 1297, 1298, 1299, 1300, - 1301, 1302, 1303, 1304, 1305, 1306, 1307, 1308, 1309, 1310, - 1314, 1315, 1319, 1320, 1324, 1325, 1329, 1330, 1331, 1332, - 1333, 1337, 1338, 1339, 1340, 1341, 1342, 1346, 1347, 1348, - 1349, 1353, 1354, 1355, 1356, 1360, 1361, 1362, 1363, 1364, - 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1379, 1380, 1381, - 1382, 1383, 1384, 1385, 1386, 1387, 1388, 1389, 1390, 1391, - 1392, 1396, 1401, 1402, 1407, 1408, 1413, 1414, 1415, 1419, - 1420, 1424, 1431, 1431, 1431, 1437, 1437, 1437, 1442, 1444, - 1446, 1446, 1446, 1451, 1451, 1451, 1456, 1458, 1460, 1461, - 1465, 1469, 1470, 1471, 1475, 1477, 1482, 1484, 1489, 1490, - 1491, 1496, 1498, 1498, 1500, 1504, 1506, 1508, 1512, 1517, - 1525, 1526, 1527, 1533, 1538, 1539, 1544, 1545, 1549, 1550, - 1551, 1555, 1556, 1560, 1561, 1562, 1563, 1567, 1568, 1572, - 1573, 1577, 1578, 1579, 1583, 1583, 1584, 1584, 1589, 1601, - 1618, 1619, 1623, 1624, 1625, 1629, 1630, 1634, 1636, 1637, - 1639, 1640, 1642, 1644, 1646, 1648, 1655, 1656, 1657, 1658, - 1659, 1660, 1661, 1662, 1663, 1668, 1672, 1676, 1677, 1682, - 1684, 1686, 1688, 1693, 1693, 1693, 1701, 1701, 1705, 1709, - 1710, 1711, 1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719, - 1720, 1721, 1725, 1725, 1732, 1736, 1740, 1741, 1745, 1746, - 1747, 1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755, 1759, - 1760, 1768, 1769, 1776, 1776, 1778, 1778, 1783, 1783, 1785, - 1785, 1790, 1791, 1796, 1800, 1804, 1808, 1812, 1816, 1820, - 1821, 1822, 1823, 1825, 1826, 1828, 1830, 1837, 1842, 1844, - 1846, 1848, 1853, 1854, 1858, 1859, 1863, 1864, 1868, 1869, - 1873, 1874, 1878, 1879, 1883, 1884, 1885, 1889, 1903, 1908, - 1908, 1913, 1913, 1918, 1924, 1928, 1928, 1928, 1939, 1940, - 1940, 1945, 1946, 1947, 1958, 1966, 1967, 1971, 1972, 1976, - 1977, 1978, 1979, 1980, 1982, 1983, 1984, 1985, 1989, 1990, - 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2002, 2003, - 2007, 2008, 2009, 2010, 2014, 2015, 2016, 2020, 2021, 2022, - 2026, 2027, 2028, 2029, 2030, 2034, 2035, 2036, 2040, 2041, - 2045, 2046, 2050, 2051, 2055, 2056, 2060, 2061, 2065, 2066, - 2066, 2066, 2072, 2073, 2074, 2075, 2076, 2077, 2078, 2079, - 2080, 2081, 2082, 2083, 2087, 2088, 2092, 2096, 2098, 2100, - 2105, 2106, 2108, 2110, 2114, 2115, 2116, 2118, 2119, 2120, - 2121, 2122, 2123, 2124, 2128, 2129, 2133, 2134, 2138, 2142, - 2143, 2144, 2145, 2146, 2150, 2151, 2152, 2153 + 0, 325, 326, 330, 331, 335, 336, 337, 338, 339, + 340, 341, 342, 346, 348, 353, 353, 362, 368, 373, + 374, 379, 380, 382, 384, 401, 401, 419, 419, 434, + 435, 437, 441, 458, 458, 470, 470, 484, 484, 484, + 493, 494, 495, 496, 500, 504, 509, 509, 514, 514, + 522, 523, 527, 533, 534, 538, 539, 543, 549, 550, + 554, 555, 556, 560, 561, 562, 568, 569, 573, 575, + 577, 579, 588, 590, 592, 594, 611, 615, 616, 623, + 624, 633, 635, 640, 641, 642, 643, 644, 645, 649, + 650, 651, 652, 653, 654, 658, 662, 662, 671, 675, + 679, 679, 694, 696, 701, 705, 706, 710, 714, 720, + 725, 726, 730, 734, 735, 739, 740, 741, 745, 746, + 747, 748, 749, 753, 754, 755, 756, 757, 761, 762, + 766, 773, 778, 778, 784, 784, 784, 795, 806, 807, + 811, 812, 813, 814, 815, 816, 817, 818, 819, 823, + 824, 829, 830, 834, 836, 838, 839, 840, 841, 842, + 844, 849, 850, 854, 858, 871, 872, 873, 874, 875, + 876, 877, 877, 883, 884, 885, 886, 887, 888, 889, + 890, 891, 892, 897, 898, 902, 903, 904, 905, 906, + 907, 908, 909, 910, 911, 912, 916, 917, 919, 923, + 929, 929, 934, 935, 936, 937, 941, 942, 947, 948, + 949, 950, 954, 955, 956, 960, 961, 962, 966, 967, + 968, 969, 970, 974, 975, 976, 980, 981, 985, 986, + 990, 991, 995, 996, 996, 1008, 1009, 1009, 1022, 1023, + 1023, 1023, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, + 1037, 1038, 1039, 1040, 1044, 1045, 1049, 1050, 1054, 1060, + 1061, 1062, 1066, 1080, 1080, 1091, 1091, 1100, 1101, 1105, + 1110, 1110, 1115, 1115, 1118, 1119, 1123, 1127, 1131, 1135, + 1136, 1140, 1144, 1145, 1149, 1150, 1154, 1155, 1156, 1157, + 1165, 1166, 1171, 1172, 1176, 1177, 1181, 1183, 1193, 1194, + 1195, 1196, 1197, 1201, 1205, 1205, 1221, 1225, 1229, 1229, + 1243, 1243, 1275, 1276, 1280, 1281, 1282, 1283, 1284, 1288, + 1289, 1290, 1291, 1295, 1296, 1297, 1298, 1299, 1300, 1301, + 1302, 1303, 1304, 1305, 1306, 1307, 1308, 1309, 1310, 1311, + 1315, 1316, 1320, 1321, 1325, 1326, 1330, 1331, 1332, 1333, + 1334, 1338, 1339, 1340, 1341, 1342, 1343, 1347, 1348, 1349, + 1350, 1354, 1355, 1356, 1357, 1361, 1362, 1363, 1364, 1365, + 1366, 1367, 1368, 1369, 1370, 1371, 1372, 1380, 1381, 1382, + 1383, 1384, 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392, + 1393, 1397, 1402, 1403, 1408, 1409, 1414, 1415, 1416, 1420, + 1421, 1425, 1432, 1432, 1432, 1438, 1438, 1438, 1443, 1445, + 1447, 1447, 1447, 1452, 1452, 1452, 1457, 1459, 1461, 1462, + 1466, 1470, 1471, 1472, 1476, 1478, 1483, 1485, 1490, 1491, + 1492, 1497, 1499, 1499, 1501, 1505, 1507, 1509, 1513, 1518, + 1526, 1527, 1528, 1534, 1539, 1540, 1545, 1546, 1550, 1551, + 1552, 1556, 1557, 1561, 1562, 1563, 1564, 1568, 1569, 1573, + 1574, 1578, 1579, 1580, 1584, 1584, 1585, 1585, 1590, 1602, + 1619, 1620, 1624, 1625, 1626, 1630, 1631, 1635, 1637, 1638, + 1640, 1641, 1643, 1645, 1647, 1649, 1656, 1657, 1658, 1659, + 1660, 1661, 1662, 1663, 1664, 1669, 1673, 1677, 1678, 1683, + 1685, 1687, 1689, 1694, 1694, 1694, 1702, 1702, 1706, 1710, + 1711, 1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719, 1720, + 1721, 1722, 1726, 1726, 1733, 1737, 1741, 1742, 1746, 1747, + 1748, 1749, 1750, 1751, 1752, 1753, 1754, 1755, 1756, 1760, + 1761, 1769, 1770, 1777, 1777, 1779, 1779, 1784, 1784, 1786, + 1786, 1791, 1792, 1797, 1801, 1805, 1809, 1813, 1817, 1821, + 1822, 1823, 1824, 1826, 1827, 1829, 1831, 1838, 1843, 1845, + 1847, 1849, 1854, 1855, 1859, 1860, 1864, 1865, 1869, 1870, + 1874, 1875, 1879, 1880, 1884, 1885, 1886, 1890, 1904, 1909, + 1909, 1914, 1914, 1919, 1925, 1929, 1929, 1929, 1940, 1941, + 1941, 1946, 1947, 1948, 1959, 1967, 1968, 1972, 1973, 1977, + 1978, 1979, 1980, 1981, 1983, 1984, 1985, 1986, 1990, 1991, + 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2003, 2004, + 2008, 2009, 2010, 2011, 2015, 2016, 2017, 2021, 2022, 2023, + 2027, 2028, 2029, 2030, 2031, 2035, 2036, 2037, 2041, 2042, + 2046, 2047, 2051, 2052, 2056, 2057, 2061, 2062, 2066, 2067, + 2067, 2067, 2073, 2074, 2075, 2076, 2077, 2078, 2079, 2080, + 2081, 2082, 2083, 2084, 2088, 2089, 2093, 2097, 2099, 2101, + 2106, 2107, 2109, 2111, 2115, 2116, 2117, 2119, 2120, 2121, + 2122, 2123, 2124, 2125, 2129, 2130, 2134, 2135, 2139, 2143, + 2144, 2145, 2146, 2147, 2151, 2152, 2153, 2154 }; #endif @@ -3698,19 +3699,19 @@ case 45: { yyval.msconstraint = metaStateConstraint_create (yyvsp[-2].msspec, yyvsp[0].msexpr); lltok_free (yyvsp[-1].tok); ; break;} case 46: -{ cscanner_expectingMetaStateName (); ; +{ cscannerHelp_expectingMetaStateName (); ; break;} case 47: -{ cscanner_clearExpectingMetaStateName (); +{ cscannerHelp_clearExpectingMetaStateName (); yyval.msspec = metaStateSpecifier_create (yyvsp[-3].sr, yyvsp[0].msinfo); lltok_free (yyvsp[-1].tok); ; break;} case 48: -{ cscanner_expectingMetaStateName (); ; +{ cscannerHelp_expectingMetaStateName (); ; break;} case 49: -{ cscanner_clearExpectingMetaStateName (); +{ cscannerHelp_clearExpectingMetaStateName (); yyval.msspec = metaStateSpecifier_createElipsis (yyvsp[0].msinfo); lltok_free2 (yyvsp[-3].tok, yyvsp[-1].tok); ; @@ -4060,7 +4061,7 @@ case 168: { yyval.expr = exprNode_addParens (yyvsp[-2].tok, yyvsp[-1].expr); ; break;} case 169: -{ yyval.expr = exprNode_fromIdentifier (coerceId (yyvsp[0].cname)); ; +{ yyval.expr = exprNode_fromIdentifier (cscannerHelp_coerceId (yyvsp[0].cname)); ; break;} case 170: { yyval.expr = exprNode_makeError (); ; @@ -4351,10 +4352,10 @@ case 275: { /* in the ANSI grammar, semantics unclear */ ; break;} case 276: -{ g_expectingTypeName = TRUE; ; +{ cscannerHelp_setExpectingTypeName (); ; break;} case 277: -{ g_expectingTypeName = TRUE; context_pushLoc (); ; +{ cscannerHelp_setExpectingTypeName (); context_pushLoc (); ; break;} case 278: { yyval.exprlist = yyvsp[-1].exprlist; ; @@ -4795,7 +4796,7 @@ case 419: { yyval.ctyp = handleUnion (yyvsp[-1].cname); ; break;} case 420: -{ g_expectingTypeName = FALSE; ; +{ cscannerHelp_clearExpectingTypeName (); ; break;} case 422: { yyval.flist = uentryList_undefined; /* bogus! */ ; @@ -4861,7 +4862,7 @@ case 442: { qtype qt = qtype_unknown (); qtype_adjustPointers (yyvsp[-1].pointers, qt); - yyval.ntyp = idDecl_create (cstring_copy (cscanner_observeLastIdentifier ()), qt); + yyval.ntyp = idDecl_create (cstring_copy (cscannerHelp_observeLastIdentifier ()), qt); ; break;} case 443: @@ -5268,7 +5269,7 @@ case 602: { yyval.expr = exprNode_iterId (yyvsp[0].entry); ; break;} case 603: -{ uentry ue = coerceIterId (yyvsp[0].cname); +{ uentry ue = cscannerHelp_coerceIterId (yyvsp[0].cname); if (uentry_isValid (ue)) { @@ -5276,7 +5277,7 @@ case 603: } else { - yyval.expr = exprNode_iterNewId (cstring_copy (cscanner_observeLastIdentifier ())); + yyval.expr = exprNode_iterNewId (cstring_copy (cscannerHelp_observeLastIdentifier ())); } ; break;} @@ -5796,7 +5797,7 @@ void yyerror (/*@unused@*/ char *s) } } - cscanner_swallowMacro (); + cscannerHelp_swallowMacro (); context_exitAllClausesQuiet (); } else