From: evans1629 Date: Thu, 17 Jan 2002 04:43:41 +0000 (+0000) Subject: Fixed handling of array dimensions (bug reported by Randi J. Relander) X-Git-Tag: splint-3_0_1_4~11 X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/commitdiff_plain/077d44586061e31ae480c06e6977d61fe4f32078 Fixed handling of array dimensions (bug reported by Randi J. Relander) Added arraydims.c test case --- diff --git a/Makefile.in b/Makefile.in index 5e2a43d..0db2368 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,17 +100,17 @@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = preBuilt/Makefile DIST_SOURCES = RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ uninstall-info-recursive all-recursive install-data-recursive \ install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive -DIST_COMMON = README ./stamp-h.in ChangeLog Makefile.am Makefile.in \ - acinclude.m4 aclocal.m4 config.hin config/config.guess \ - config/config.sub config/depcomp config/install-sh \ - config/missing config/mkinstalldirs configure configure.ac +DIST_COMMON = README ./stamp-h.in Makefile.am Makefile.in acinclude.m4 \ + aclocal.m4 config.hin config/config.guess config/config.sub \ + config/depcomp config/install-sh config/missing \ + config/mkinstalldirs configure configure.ac DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -156,6 +156,8 @@ $(srcdir)/./stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) distclean-hdr: -rm -f config.h +preBuilt/Makefile: $(top_builddir)/config.status $(top_srcdir)/preBuilt/Makefile.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd diff --git a/configure b/configure index 3b83f84..5b86b6c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52 for Splint 3.0.1.2. +# Generated by Autoconf 2.52 for Splint 3.0.1.4. # # Report bugs to . # @@ -149,8 +149,8 @@ mandir='${prefix}/man' # Identity of this package. PACKAGE_NAME='Splint' PACKAGE_TARNAME='splint' -PACKAGE_VERSION='3.0.1.2' -PACKAGE_STRING='Splint 3.0.1.2' +PACKAGE_VERSION='3.0.1.4' +PACKAGE_STRING='Splint 3.0.1.4' PACKAGE_BUGREPORT='splint-bug@splint.org' ac_prev= @@ -567,7 +567,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <&5 <>confdefs.h <>confdefs.h <>$CONFIG_STATUS <&5 << _ACEOF ## Running config.status. ## ## ----------------------- ## -This file was extended by $as_me (Splint 3.0.1.2) 2.52, executed with +This file was extended by $as_me (Splint 3.0.1.4) 2.52, executed with CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS diff --git a/configure.ac b/configure.ac index a30ab98..5a0c7b5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process with autoconf to create a configure script -*- Autoconf -*- AC_PREREQ(2.50) -AC_INIT([Splint], [3.0.1.2], [splint-bug@splint.org], [splint]) +AC_INIT([Splint], [3.0.1.4], [splint-bug@splint.org], [splint]) dnl This MUST precede any other macro AC_CONFIG_AUX_DIR([config]) diff --git a/src/Headers/lctype.h b/src/Headers/lctype.h index 34b1777..ff1d01d 100644 --- a/src/Headers/lctype.h +++ b/src/Headers/lctype.h @@ -258,6 +258,7 @@ extern ctype ctype_getBaseType (ctype p_c) /*@*/ ; extern ctype ctype_makeArray (ctype p_c); extern ctype ctype_makeFixedArray (ctype p_c, long p_size); +extern ctype ctype_makeInnerFixedArray (ctype p_c, long p_size); extern ctype ctype_makeConj (ctype p_c1, ctype p_c2); extern ctype ctype_makeParamsFunction (ctype p_base, /*@only@*/ uentryList p_p); extern ctype ctype_makeFunction (ctype p_base, /*@only@*/ uentryList p_p) /*@*/ ; diff --git a/src/Makefile.in b/src/Makefile.in index 4535f42..836fdd4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -579,7 +579,7 @@ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ CFLAGS = @CFLAGS@ DIST_SOURCES = $(lcl_SOURCES) $(splint_SOURCES) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = ChangeLog Makefile.am Makefile.in SOURCES = $(lcl_SOURCES) $(splint_SOURCES) all: $(BUILT_SOURCES) diff --git a/src/cgrammar.c.der b/src/cgrammar.c.der index 7b76c59..53a437b 100644 --- a/src/cgrammar.c.der +++ b/src/cgrammar.c.der @@ -450,46 +450,46 @@ static const short yyprhs[] = { 0, 777, 779, 781, 783, 785, 787, 791, 792, 802, 803, 815, 818, 819, 826, 827, 836, 841, 846, 847, 848, 851, 853, 858, 859, 864, 866, 870, 875, 877, 881, - 883, 885, 887, 889, 891, 894, 897, 898, 905, 908, - 911, 912, 919, 920, 926, 928, 930, 932, 934, 936, - 938, 940, 942, 944, 946, 948, 950, 952, 954, 956, - 958, 960, 962, 964, 966, 968, 970, 972, 974, 976, - 978, 980, 982, 984, 986, 988, 990, 992, 994, 996, - 998, 1000, 1002, 1004, 1006, 1008, 1010, 1012, 1014, 1016, - 1018, 1020, 1022, 1024, 1026, 1028, 1030, 1033, 1036, 1039, + 883, 885, 887, 889, 891, 894, 895, 902, 905, 908, + 909, 916, 917, 923, 925, 927, 929, 931, 933, 935, + 937, 939, 941, 943, 945, 947, 949, 951, 953, 955, + 957, 959, 961, 963, 965, 967, 969, 971, 973, 975, + 977, 979, 981, 983, 985, 987, 989, 991, 993, 995, + 997, 999, 1001, 1003, 1005, 1007, 1009, 1011, 1013, 1015, + 1017, 1019, 1021, 1023, 1025, 1027, 1030, 1033, 1036, 1039, 1042, 1045, 1048, 1051, 1054, 1057, 1060, 1063, 1066, 1069, 1072, 1075, 1078, 1081, 1084, 1087, 1090, 1093, 1096, 1099, - 1102, 1105, 1109, 1111, 1116, 1118, 1122, 1125, 1128, 1131, - 1132, 1134, 1135, 1136, 1137, 1150, 1151, 1152, 1164, 1171, - 1178, 1179, 1180, 1191, 1192, 1193, 1204, 1210, 1216, 1221, - 1226, 1227, 1229, 1231, 1234, 1240, 1244, 1247, 1252, 1254, - 1258, 1263, 1270, 1271, 1280, 1285, 1287, 1291, 1294, 1296, - 1301, 1303, 1305, 1308, 1311, 1313, 1316, 1318, 1321, 1323, - 1325, 1327, 1330, 1332, 1335, 1338, 1342, 1344, 1348, 1350, - 1354, 1356, 1358, 1362, 1363, 1366, 1367, 1372, 1377, 1379, - 1381, 1384, 1386, 1388, 1391, 1392, 1394, 1400, 1403, 1407, - 1411, 1416, 1420, 1425, 1430, 1436, 1438, 1440, 1442, 1444, - 1446, 1448, 1450, 1452, 1454, 1456, 1458, 1460, 1463, 1466, - 1474, 1481, 1484, 1485, 1486, 1497, 1498, 1505, 1507, 1509, - 1511, 1513, 1516, 1518, 1520, 1522, 1524, 1526, 1528, 1530, - 1534, 1536, 1537, 1541, 1544, 1547, 1549, 1551, 1553, 1555, - 1557, 1559, 1561, 1563, 1565, 1567, 1571, 1573, 1575, 1578, - 1581, 1582, 1585, 1586, 1591, 1592, 1599, 1600, 1604, 1605, - 1611, 1615, 1618, 1622, 1623, 1624, 1625, 1626, 1627, 1629, - 1632, 1635, 1639, 1642, 1646, 1650, 1655, 1658, 1661, 1665, - 1669, 1674, 1676, 1679, 1681, 1684, 1686, 1689, 1691, 1694, - 1696, 1699, 1701, 1706, 1709, 1710, 1716, 1717, 1724, 1729, - 1734, 1735, 1736, 1747, 1749, 1750, 1755, 1757, 1759, 1761, - 1763, 1765, 1768, 1770, 1774, 1776, 1781, 1785, 1790, 1797, - 1803, 1809, 1812, 1815, 1817, 1820, 1823, 1826, 1829, 1832, - 1835, 1838, 1841, 1843, 1845, 1850, 1852, 1856, 1860, 1864, - 1866, 1870, 1874, 1876, 1880, 1884, 1886, 1890, 1894, 1898, - 1902, 1904, 1908, 1912, 1914, 1918, 1920, 1924, 1926, 1930, - 1932, 1936, 1938, 1942, 1944, 1945, 1946, 1954, 1956, 1960, - 1964, 1968, 1972, 1976, 1980, 1984, 1988, 1992, 1996, 2000, - 2002, 2003, 2005, 2008, 2016, 2019, 2022, 2030, 2037, 2040, - 2044, 2047, 2051, 2054, 2058, 2062, 2066, 2070, 2073, 2077, - 2078, 2080, 2082, 2084, 2086, 2088, 2090, 2092, 2094 + 1102, 1106, 1108, 1113, 1115, 1119, 1122, 1125, 1128, 1129, + 1131, 1132, 1133, 1134, 1147, 1148, 1149, 1161, 1168, 1175, + 1176, 1177, 1188, 1189, 1190, 1201, 1207, 1213, 1218, 1223, + 1224, 1226, 1228, 1231, 1237, 1241, 1244, 1249, 1251, 1255, + 1260, 1267, 1268, 1277, 1282, 1284, 1288, 1291, 1293, 1298, + 1300, 1302, 1305, 1308, 1310, 1313, 1315, 1318, 1320, 1322, + 1324, 1327, 1329, 1332, 1335, 1339, 1341, 1345, 1347, 1351, + 1353, 1355, 1359, 1360, 1363, 1364, 1369, 1374, 1376, 1378, + 1381, 1383, 1385, 1388, 1389, 1391, 1397, 1400, 1404, 1408, + 1413, 1417, 1422, 1427, 1433, 1435, 1437, 1439, 1441, 1443, + 1445, 1447, 1449, 1451, 1453, 1455, 1457, 1460, 1463, 1471, + 1478, 1481, 1482, 1483, 1494, 1495, 1502, 1504, 1506, 1508, + 1510, 1513, 1515, 1517, 1519, 1521, 1523, 1525, 1527, 1531, + 1533, 1534, 1538, 1541, 1544, 1546, 1548, 1550, 1552, 1554, + 1556, 1558, 1560, 1562, 1564, 1568, 1570, 1572, 1575, 1578, + 1579, 1582, 1583, 1588, 1589, 1596, 1597, 1601, 1602, 1608, + 1612, 1615, 1619, 1620, 1621, 1622, 1623, 1624, 1626, 1629, + 1632, 1636, 1639, 1643, 1647, 1652, 1655, 1658, 1662, 1666, + 1671, 1673, 1676, 1678, 1681, 1683, 1686, 1688, 1691, 1693, + 1696, 1698, 1703, 1706, 1707, 1713, 1714, 1721, 1726, 1731, + 1732, 1733, 1744, 1746, 1747, 1752, 1754, 1756, 1758, 1760, + 1762, 1765, 1767, 1771, 1773, 1778, 1782, 1787, 1794, 1800, + 1806, 1809, 1812, 1814, 1817, 1820, 1823, 1826, 1829, 1832, + 1835, 1838, 1840, 1842, 1847, 1849, 1853, 1857, 1861, 1863, + 1867, 1871, 1873, 1877, 1881, 1883, 1887, 1891, 1895, 1899, + 1901, 1905, 1909, 1911, 1915, 1917, 1921, 1923, 1927, 1929, + 1933, 1935, 1939, 1941, 1942, 1943, 1951, 1953, 1957, 1961, + 1965, 1969, 1973, 1977, 1981, 1985, 1989, 1993, 1997, 1999, + 2000, 2002, 2005, 2013, 2016, 2019, 2027, 2034, 2037, 2041, + 2044, 2048, 2051, 2055, 2059, 2063, 2067, 2070, 2074, 2075, + 2077, 2079, 2081, 2083, 2085, 2087, 2089, 2091 }; static const short yyrhs[] = { -1, @@ -582,136 +582,136 @@ static const short yyrhs[] = { -1, 345, 297, 0, 289, 0, 19, 307, 20, 0, 19, 307, 21, 20, 0, 306, 0, 307, 21, 306, 0, 114, 0, 112, 0, 115, 0, 116, 0, 117, 0, - 177, 301, 0, 310, 90, 0, 0, 249, 345, 311, - 263, 447, 301, 0, 314, 90, 0, 250, 345, 0, - 0, 313, 320, 315, 262, 447, 301, 0, 0, 313, - 316, 317, 447, 301, 0, 219, 0, 212, 0, 141, - 0, 142, 0, 144, 0, 145, 0, 143, 0, 126, - 0, 129, 0, 127, 0, 128, 0, 134, 0, 135, - 0, 120, 0, 122, 0, 121, 0, 130, 0, 131, - 0, 123, 0, 125, 0, 138, 0, 140, 0, 153, - 0, 152, 0, 137, 0, 139, 0, 177, 0, 187, - 0, 136, 0, 151, 0, 150, 0, 160, 0, 158, - 0, 159, 0, 154, 0, 155, 0, 156, 0, 157, - 0, 161, 0, 162, 0, 165, 0, 166, 0, 163, - 0, 164, 0, 149, 0, 146, 0, 147, 0, 148, - 0, 118, 0, 119, 0, 132, 0, 133, 0, 110, - 301, 0, 111, 301, 0, 327, 301, 0, 320, 301, - 0, 318, 301, 0, 321, 301, 0, 319, 301, 0, - 323, 301, 0, 322, 301, 0, 324, 301, 0, 325, - 301, 0, 167, 345, 0, 169, 345, 0, 168, 345, - 0, 170, 345, 0, 171, 345, 0, 172, 345, 0, - 173, 345, 0, 174, 345, 0, 175, 345, 0, 176, - 345, 0, 450, 345, 0, 336, 345, 0, 350, 345, - 0, 326, 345, 0, 301, 331, 301, 0, 333, 0, - 333, 87, 332, 90, 0, 367, 0, 367, 21, 332, - 0, 308, 334, 0, 328, 334, 0, 329, 334, 0, - 0, 331, 0, 0, 0, 0, 345, 67, 449, 301, - 19, 337, 400, 346, 401, 338, 20, 335, 0, 0, - 0, 345, 68, 449, 301, 19, 339, 400, 346, 401, - 340, 20, 0, 345, 67, 449, 301, 19, 20, 0, - 345, 68, 449, 301, 19, 20, 0, 0, 0, 345, - 67, 301, 19, 341, 400, 346, 401, 342, 20, 0, - 0, 0, 345, 68, 301, 19, 343, 400, 346, 401, - 344, 20, 0, 345, 67, 301, 19, 20, 0, 345, - 68, 301, 19, 20, 0, 345, 67, 449, 345, 0, - 345, 68, 449, 345, 0, 0, 347, 0, 210, 0, - 346, 347, 0, 331, 345, 348, 301, 18, 0, 331, - 301, 18, 0, 349, 345, 0, 348, 21, 349, 345, - 0, 355, 0, 22, 301, 292, 0, 355, 22, 301, - 292, 0, 345, 69, 19, 352, 20, 301, 0, 0, - 345, 69, 449, 19, 351, 352, 20, 301, 0, 345, - 69, 449, 301, 0, 353, 0, 352, 21, 353, 0, - 352, 21, 0, 449, 0, 449, 23, 301, 292, 0, - 201, 0, 369, 0, 359, 191, 0, 359, 354, 0, - 201, 0, 359, 201, 0, 362, 0, 345, 360, 0, - 110, 0, 111, 0, 357, 0, 358, 357, 0, 34, - 0, 34, 358, 0, 34, 359, 0, 34, 358, 359, - 0, 361, 0, 361, 21, 5, 0, 449, 0, 361, - 21, 449, 0, 5, 0, 363, 0, 363, 21, 5, - 0, 0, 364, 366, 0, 0, 363, 21, 365, 366, - 0, 301, 331, 354, 301, 0, 449, 0, 330, 0, - 330, 368, 0, 359, 0, 370, 0, 359, 370, 0, - 0, 370, 0, 301, 24, 345, 368, 25, 0, 26, - 27, 0, 26, 292, 27, 0, 370, 26, 27, 0, - 370, 26, 292, 27, 0, 301, 24, 25, 0, 301, - 24, 362, 25, 0, 370, 301, 24, 25, 0, 370, - 301, 24, 362, 25, 0, 388, 0, 390, 0, 393, - 0, 396, 0, 409, 0, 412, 0, 444, 0, 417, - 0, 446, 0, 374, 0, 372, 0, 381, 0, 374, - 381, 0, 416, 374, 0, 443, 387, 11, 24, 290, - 25, 18, 0, 443, 387, 11, 24, 290, 25, 0, - 376, 381, 0, 0, 0, 13, 24, 291, 18, 291, - 18, 377, 291, 378, 25, 0, 0, 189, 398, 24, - 380, 420, 25, 0, 190, 0, 388, 0, 390, 0, - 393, 0, 384, 407, 0, 384, 0, 385, 0, 409, - 0, 382, 0, 375, 0, 379, 0, 446, 0, 24, - 381, 25, 0, 1, 0, 0, 411, 383, 381, 0, - 398, 19, 0, 402, 20, 0, 387, 0, 406, 0, - 388, 0, 390, 0, 393, 0, 397, 0, 410, 0, - 412, 0, 417, 0, 445, 0, 24, 387, 25, 0, - 446, 0, 1, 0, 449, 22, 0, 109, 371, 0, - 0, 100, 389, 0, 0, 6, 292, 391, 22, 0, - 0, 100, 389, 6, 292, 392, 22, 0, 0, 7, - 394, 22, 0, 0, 100, 389, 7, 395, 22, 0, - 24, 396, 25, 0, 398, 404, 0, 398, 405, 399, - 0, 0, 0, 0, 0, 0, 20, 0, 109, 20, - 0, 408, 20, 0, 408, 109, 20, 0, 407, 20, - 0, 407, 109, 20, 0, 407, 408, 20, 0, 407, - 408, 109, 20, 0, 19, 403, 0, 19, 20, 0, - 19, 406, 20, 0, 19, 407, 20, 0, 19, 407, - 408, 20, 0, 387, 0, 406, 387, 0, 293, 0, - 407, 293, 0, 371, 0, 408, 371, 0, 18, 0, - 290, 18, 0, 18, 0, 290, 18, 0, 290, 0, - 8, 24, 290, 25, 0, 411, 371, 0, 0, 411, - 371, 9, 413, 371, 0, 0, 10, 24, 290, 414, - 25, 371, 0, 11, 24, 290, 25, 0, 11, 24, - 290, 25, 0, 0, 0, 189, 418, 398, 24, 419, - 420, 25, 396, 442, 399, 0, 422, 0, 0, 420, - 421, 21, 422, 0, 441, 0, 448, 0, 186, 0, - 185, 0, 188, 0, 423, 188, 0, 423, 0, 24, - 290, 25, 0, 424, 0, 265, 26, 290, 27, 0, - 265, 24, 25, 0, 265, 24, 266, 25, 0, 70, - 24, 289, 21, 367, 25, 0, 265, 345, 28, 449, - 301, 0, 265, 345, 44, 449, 301, 0, 265, 47, - 0, 265, 48, 0, 425, 0, 47, 267, 0, 48, - 267, 0, 29, 273, 0, 34, 273, 0, 33, 273, - 0, 32, 273, 0, 31, 273, 0, 30, 273, 0, - 270, 0, 426, 0, 24, 367, 25, 273, 0, 427, - 0, 274, 34, 273, 0, 274, 35, 273, 0, 274, - 36, 273, 0, 428, 0, 275, 33, 274, 0, 275, - 32, 274, 0, 429, 0, 276, 49, 275, 0, 276, - 50, 275, 0, 430, 0, 277, 37, 276, 0, 277, - 38, 276, 0, 277, 51, 276, 0, 277, 52, 276, - 0, 431, 0, 278, 53, 277, 0, 278, 54, 277, - 0, 432, 0, 279, 29, 278, 0, 433, 0, 280, - 39, 279, 0, 434, 0, 281, 40, 280, 0, 435, - 0, 282, 55, 281, 0, 436, 0, 284, 56, 282, - 0, 437, 0, 0, 0, 284, 41, 439, 290, 22, - 440, 286, 0, 438, 0, 267, 23, 289, 0, 267, - 57, 289, 0, 267, 58, 289, 0, 267, 59, 289, - 0, 267, 60, 289, 0, 267, 61, 289, 0, 267, - 62, 289, 0, 267, 63, 289, 0, 267, 64, 289, - 0, 267, 65, 289, 0, 267, 66, 289, 0, 190, - 0, 0, 12, 0, 415, 371, 0, 443, 371, 11, - 24, 290, 25, 18, 0, 376, 371, 0, 415, 387, - 0, 443, 387, 11, 24, 290, 25, 18, 0, 443, - 387, 11, 24, 290, 25, 0, 376, 387, 0, 14, - 449, 18, 0, 15, 18, 0, 99, 15, 18, 0, - 16, 18, 0, 95, 16, 18, 0, 96, 16, 18, - 0, 97, 16, 18, 0, 98, 16, 18, 0, 17, - 18, 0, 17, 290, 18, 0, 0, 18, 0, 184, - 0, 185, 0, 189, 0, 190, 0, 448, 0, 186, - 0, 191, 0, 186, 0 + 310, 90, 0, 0, 249, 345, 311, 263, 447, 301, + 0, 314, 90, 0, 250, 345, 0, 0, 313, 320, + 315, 262, 447, 301, 0, 0, 313, 316, 317, 447, + 301, 0, 219, 0, 212, 0, 141, 0, 142, 0, + 144, 0, 145, 0, 143, 0, 126, 0, 129, 0, + 127, 0, 128, 0, 134, 0, 135, 0, 120, 0, + 122, 0, 121, 0, 130, 0, 131, 0, 123, 0, + 125, 0, 138, 0, 140, 0, 153, 0, 152, 0, + 137, 0, 139, 0, 177, 0, 187, 0, 136, 0, + 151, 0, 150, 0, 160, 0, 158, 0, 159, 0, + 154, 0, 155, 0, 156, 0, 157, 0, 161, 0, + 162, 0, 165, 0, 166, 0, 163, 0, 164, 0, + 149, 0, 146, 0, 147, 0, 148, 0, 118, 0, + 119, 0, 132, 0, 133, 0, 110, 301, 0, 111, + 301, 0, 327, 301, 0, 320, 301, 0, 318, 301, + 0, 321, 301, 0, 319, 301, 0, 323, 301, 0, + 322, 301, 0, 324, 301, 0, 325, 301, 0, 167, + 345, 0, 169, 345, 0, 168, 345, 0, 170, 345, + 0, 171, 345, 0, 172, 345, 0, 173, 345, 0, + 174, 345, 0, 175, 345, 0, 176, 345, 0, 450, + 345, 0, 336, 345, 0, 350, 345, 0, 326, 345, + 0, 301, 331, 301, 0, 333, 0, 333, 87, 332, + 90, 0, 367, 0, 367, 21, 332, 0, 308, 334, + 0, 328, 334, 0, 329, 334, 0, 0, 331, 0, + 0, 0, 0, 345, 67, 449, 301, 19, 337, 400, + 346, 401, 338, 20, 335, 0, 0, 0, 345, 68, + 449, 301, 19, 339, 400, 346, 401, 340, 20, 0, + 345, 67, 449, 301, 19, 20, 0, 345, 68, 449, + 301, 19, 20, 0, 0, 0, 345, 67, 301, 19, + 341, 400, 346, 401, 342, 20, 0, 0, 0, 345, + 68, 301, 19, 343, 400, 346, 401, 344, 20, 0, + 345, 67, 301, 19, 20, 0, 345, 68, 301, 19, + 20, 0, 345, 67, 449, 345, 0, 345, 68, 449, + 345, 0, 0, 347, 0, 210, 0, 346, 347, 0, + 331, 345, 348, 301, 18, 0, 331, 301, 18, 0, + 349, 345, 0, 348, 21, 349, 345, 0, 355, 0, + 22, 301, 292, 0, 355, 22, 301, 292, 0, 345, + 69, 19, 352, 20, 301, 0, 0, 345, 69, 449, + 19, 351, 352, 20, 301, 0, 345, 69, 449, 301, + 0, 353, 0, 352, 21, 353, 0, 352, 21, 0, + 449, 0, 449, 23, 301, 292, 0, 201, 0, 369, + 0, 359, 191, 0, 359, 354, 0, 201, 0, 359, + 201, 0, 362, 0, 345, 360, 0, 110, 0, 111, + 0, 357, 0, 358, 357, 0, 34, 0, 34, 358, + 0, 34, 359, 0, 34, 358, 359, 0, 361, 0, + 361, 21, 5, 0, 449, 0, 361, 21, 449, 0, + 5, 0, 363, 0, 363, 21, 5, 0, 0, 364, + 366, 0, 0, 363, 21, 365, 366, 0, 301, 331, + 354, 301, 0, 449, 0, 330, 0, 330, 368, 0, + 359, 0, 370, 0, 359, 370, 0, 0, 370, 0, + 301, 24, 345, 368, 25, 0, 26, 27, 0, 26, + 292, 27, 0, 370, 26, 27, 0, 370, 26, 292, + 27, 0, 301, 24, 25, 0, 301, 24, 362, 25, + 0, 370, 301, 24, 25, 0, 370, 301, 24, 362, + 25, 0, 388, 0, 390, 0, 393, 0, 396, 0, + 409, 0, 412, 0, 444, 0, 417, 0, 446, 0, + 374, 0, 372, 0, 381, 0, 374, 381, 0, 416, + 374, 0, 443, 387, 11, 24, 290, 25, 18, 0, + 443, 387, 11, 24, 290, 25, 0, 376, 381, 0, + 0, 0, 13, 24, 291, 18, 291, 18, 377, 291, + 378, 25, 0, 0, 189, 398, 24, 380, 420, 25, + 0, 190, 0, 388, 0, 390, 0, 393, 0, 384, + 407, 0, 384, 0, 385, 0, 409, 0, 382, 0, + 375, 0, 379, 0, 446, 0, 24, 381, 25, 0, + 1, 0, 0, 411, 383, 381, 0, 398, 19, 0, + 402, 20, 0, 387, 0, 406, 0, 388, 0, 390, + 0, 393, 0, 397, 0, 410, 0, 412, 0, 417, + 0, 445, 0, 24, 387, 25, 0, 446, 0, 1, + 0, 449, 22, 0, 109, 371, 0, 0, 100, 389, + 0, 0, 6, 292, 391, 22, 0, 0, 100, 389, + 6, 292, 392, 22, 0, 0, 7, 394, 22, 0, + 0, 100, 389, 7, 395, 22, 0, 24, 396, 25, + 0, 398, 404, 0, 398, 405, 399, 0, 0, 0, + 0, 0, 0, 20, 0, 109, 20, 0, 408, 20, + 0, 408, 109, 20, 0, 407, 20, 0, 407, 109, + 20, 0, 407, 408, 20, 0, 407, 408, 109, 20, + 0, 19, 403, 0, 19, 20, 0, 19, 406, 20, + 0, 19, 407, 20, 0, 19, 407, 408, 20, 0, + 387, 0, 406, 387, 0, 293, 0, 407, 293, 0, + 371, 0, 408, 371, 0, 18, 0, 290, 18, 0, + 18, 0, 290, 18, 0, 290, 0, 8, 24, 290, + 25, 0, 411, 371, 0, 0, 411, 371, 9, 413, + 371, 0, 0, 10, 24, 290, 414, 25, 371, 0, + 11, 24, 290, 25, 0, 11, 24, 290, 25, 0, + 0, 0, 189, 418, 398, 24, 419, 420, 25, 396, + 442, 399, 0, 422, 0, 0, 420, 421, 21, 422, + 0, 441, 0, 448, 0, 186, 0, 185, 0, 188, + 0, 423, 188, 0, 423, 0, 24, 290, 25, 0, + 424, 0, 265, 26, 290, 27, 0, 265, 24, 25, + 0, 265, 24, 266, 25, 0, 70, 24, 289, 21, + 367, 25, 0, 265, 345, 28, 449, 301, 0, 265, + 345, 44, 449, 301, 0, 265, 47, 0, 265, 48, + 0, 425, 0, 47, 267, 0, 48, 267, 0, 29, + 273, 0, 34, 273, 0, 33, 273, 0, 32, 273, + 0, 31, 273, 0, 30, 273, 0, 270, 0, 426, + 0, 24, 367, 25, 273, 0, 427, 0, 274, 34, + 273, 0, 274, 35, 273, 0, 274, 36, 273, 0, + 428, 0, 275, 33, 274, 0, 275, 32, 274, 0, + 429, 0, 276, 49, 275, 0, 276, 50, 275, 0, + 430, 0, 277, 37, 276, 0, 277, 38, 276, 0, + 277, 51, 276, 0, 277, 52, 276, 0, 431, 0, + 278, 53, 277, 0, 278, 54, 277, 0, 432, 0, + 279, 29, 278, 0, 433, 0, 280, 39, 279, 0, + 434, 0, 281, 40, 280, 0, 435, 0, 282, 55, + 281, 0, 436, 0, 284, 56, 282, 0, 437, 0, + 0, 0, 284, 41, 439, 290, 22, 440, 286, 0, + 438, 0, 267, 23, 289, 0, 267, 57, 289, 0, + 267, 58, 289, 0, 267, 59, 289, 0, 267, 60, + 289, 0, 267, 61, 289, 0, 267, 62, 289, 0, + 267, 63, 289, 0, 267, 64, 289, 0, 267, 65, + 289, 0, 267, 66, 289, 0, 190, 0, 0, 12, + 0, 415, 371, 0, 443, 371, 11, 24, 290, 25, + 18, 0, 376, 371, 0, 415, 387, 0, 443, 387, + 11, 24, 290, 25, 18, 0, 443, 387, 11, 24, + 290, 25, 0, 376, 387, 0, 14, 449, 18, 0, + 15, 18, 0, 99, 15, 18, 0, 16, 18, 0, + 95, 16, 18, 0, 96, 16, 18, 0, 97, 16, + 18, 0, 98, 16, 18, 0, 17, 18, 0, 17, + 290, 18, 0, 0, 18, 0, 184, 0, 185, 0, + 189, 0, 190, 0, 448, 0, 186, 0, 191, 0, + 186, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 325, 326, 329, 330, 333, 334, 335, 336, 337, 338, - 339, 342, 344, 348, 348, 355, 361, 365, 366, 370, - 371, 373, 375, 387, 390, 400, 403, 411, 412, 414, + 324, 325, 328, 329, 332, 333, 334, 335, 336, 337, + 338, 341, 343, 347, 347, 354, 360, 364, 365, 369, + 370, 372, 374, 387, 390, 400, 403, 411, 412, 414, 416, 432, 435, 443, 446, 454, 456, 456, 460, 461, 462, 463, 466, 469, 473, 473, 476, 476, 481, 482, 485, 490, 491, 494, 495, 498, 503, 504, 507, 508, @@ -737,46 +737,46 @@ static const short yyrline[] = { 0, 938, 941, 946, 947, 948, 951, 965, 970, 976, 978, 984, 989, 989, 993, 994, 996, 997, 1000, 1003, 1006, 1009, 1010, 1013, 1014, 1017, 1018, 1019, 1023, 1025, 1034, - 1035, 1036, 1037, 1038, 1040, 1044, 1047, 1053, 1062, 1065, - 1068, 1075, 1082, 1088, 1113, 1114, 1117, 1118, 1119, 1120, - 1121, 1124, 1125, 1126, 1127, 1130, 1131, 1132, 1133, 1134, - 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, - 1145, 1146, 1150, 1151, 1154, 1155, 1158, 1159, 1162, 1163, - 1164, 1165, 1168, 1169, 1170, 1171, 1172, 1173, 1176, 1177, - 1178, 1179, 1182, 1183, 1184, 1185, 1188, 1189, 1190, 1191, - 1192, 1193, 1194, 1195, 1196, 1197, 1198, 1205, 1206, 1207, - 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217, - 1218, 1221, 1225, 1226, 1230, 1231, 1235, 1236, 1237, 1240, - 1241, 1245, 1252, 1254, 1256, 1257, 1259, 1261, 1262, 1264, - 1266, 1268, 1270, 1271, 1272, 1275, 1276, 1278, 1280, 1281, - 1284, 1287, 1288, 1289, 1292, 1294, 1298, 1300, 1304, 1305, - 1306, 1310, 1312, 1312, 1314, 1317, 1319, 1321, 1324, 1329, - 1336, 1337, 1338, 1345, 1349, 1350, 1354, 1355, 1358, 1359, - 1362, 1363, 1366, 1367, 1368, 1369, 1372, 1373, 1376, 1377, - 1380, 1381, 1382, 1385, 1385, 1386, 1387, 1390, 1402, 1418, - 1419, 1422, 1423, 1424, 1427, 1428, 1431, 1433, 1434, 1436, - 1437, 1439, 1441, 1443, 1445, 1451, 1452, 1453, 1454, 1455, - 1456, 1457, 1458, 1459, 1463, 1466, 1469, 1470, 1474, 1476, - 1478, 1480, 1484, 1485, 1487, 1491, 1493, 1495, 1498, 1499, - 1500, 1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508, 1509, - 1510, 1513, 1514, 1519, 1522, 1525, 1526, 1529, 1530, 1531, - 1532, 1533, 1534, 1535, 1536, 1537, 1538, 1539, 1542, 1543, - 1550, 1551, 1557, 1558, 1559, 1560, 1563, 1564, 1565, 1566, - 1569, 1570, 1574, 1577, 1580, 1583, 1586, 1589, 1592, 1593, - 1594, 1595, 1597, 1598, 1600, 1602, 1608, 1612, 1614, 1616, - 1618, 1622, 1623, 1626, 1627, 1630, 1631, 1634, 1635, 1638, - 1639, 1640, 1643, 1656, 1661, 1662, 1666, 1667, 1670, 1675, - 1678, 1679, 1680, 1688, 1689, 1689, 1693, 1694, 1695, 1706, - 1713, 1714, 1717, 1718, 1721, 1722, 1723, 1724, 1725, 1727, - 1728, 1729, 1730, 1733, 1734, 1735, 1736, 1737, 1738, 1739, - 1740, 1741, 1742, 1745, 1746, 1749, 1750, 1751, 1752, 1755, - 1756, 1757, 1760, 1761, 1762, 1765, 1766, 1767, 1768, 1769, - 1772, 1773, 1774, 1777, 1778, 1781, 1782, 1786, 1787, 1790, - 1791, 1794, 1795, 1798, 1799, 1800, 1801, 1804, 1805, 1806, - 1807, 1808, 1809, 1810, 1811, 1812, 1813, 1814, 1815, 1818, - 1819, 1822, 1825, 1827, 1829, 1833, 1834, 1836, 1838, 1841, - 1842, 1843, 1845, 1846, 1847, 1848, 1849, 1850, 1851, 1854, - 1855, 1858, 1861, 1862, 1863, 1864, 1865, 1868, 1869 + 1035, 1036, 1037, 1038, 1041, 1044, 1050, 1059, 1062, 1065, + 1072, 1079, 1085, 1110, 1111, 1114, 1115, 1116, 1117, 1118, + 1121, 1122, 1123, 1124, 1127, 1128, 1129, 1130, 1131, 1132, + 1133, 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, + 1143, 1147, 1148, 1151, 1152, 1155, 1156, 1159, 1160, 1161, + 1162, 1165, 1166, 1167, 1168, 1169, 1170, 1173, 1174, 1175, + 1176, 1179, 1180, 1181, 1182, 1185, 1186, 1187, 1188, 1189, + 1190, 1191, 1192, 1193, 1194, 1195, 1202, 1203, 1204, 1205, + 1206, 1207, 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, + 1218, 1222, 1223, 1227, 1228, 1232, 1233, 1234, 1237, 1238, + 1242, 1249, 1251, 1253, 1254, 1256, 1258, 1259, 1261, 1263, + 1265, 1267, 1268, 1269, 1272, 1273, 1275, 1277, 1278, 1281, + 1284, 1285, 1286, 1289, 1291, 1295, 1297, 1301, 1302, 1303, + 1307, 1309, 1309, 1311, 1314, 1316, 1318, 1321, 1326, 1333, + 1334, 1335, 1342, 1346, 1347, 1351, 1352, 1355, 1356, 1359, + 1360, 1363, 1364, 1365, 1366, 1369, 1370, 1373, 1374, 1377, + 1378, 1379, 1382, 1382, 1383, 1384, 1387, 1399, 1415, 1416, + 1419, 1420, 1421, 1424, 1425, 1428, 1430, 1431, 1433, 1434, + 1436, 1438, 1440, 1442, 1448, 1449, 1450, 1451, 1452, 1453, + 1454, 1455, 1456, 1460, 1463, 1466, 1467, 1471, 1473, 1475, + 1477, 1481, 1482, 1484, 1488, 1490, 1492, 1495, 1496, 1497, + 1498, 1499, 1500, 1501, 1502, 1503, 1504, 1505, 1506, 1507, + 1510, 1511, 1516, 1519, 1522, 1523, 1526, 1527, 1528, 1529, + 1530, 1531, 1532, 1533, 1534, 1535, 1536, 1539, 1540, 1547, + 1548, 1554, 1555, 1556, 1557, 1560, 1561, 1562, 1563, 1566, + 1567, 1571, 1574, 1577, 1580, 1583, 1586, 1589, 1590, 1591, + 1592, 1594, 1595, 1597, 1599, 1605, 1609, 1611, 1613, 1615, + 1619, 1620, 1623, 1624, 1627, 1628, 1631, 1632, 1635, 1636, + 1637, 1640, 1653, 1658, 1659, 1663, 1664, 1667, 1672, 1675, + 1676, 1677, 1685, 1686, 1686, 1690, 1691, 1692, 1703, 1710, + 1711, 1714, 1715, 1718, 1719, 1720, 1721, 1722, 1724, 1725, + 1726, 1727, 1730, 1731, 1732, 1733, 1734, 1735, 1736, 1737, + 1738, 1739, 1742, 1743, 1746, 1747, 1748, 1749, 1752, 1753, + 1754, 1757, 1758, 1759, 1762, 1763, 1764, 1765, 1766, 1769, + 1770, 1771, 1774, 1775, 1778, 1779, 1783, 1784, 1787, 1788, + 1791, 1792, 1795, 1796, 1797, 1798, 1801, 1802, 1803, 1804, + 1805, 1806, 1807, 1808, 1809, 1810, 1811, 1812, 1815, 1816, + 1819, 1822, 1824, 1826, 1830, 1831, 1833, 1835, 1838, 1839, + 1840, 1842, 1843, 1844, 1845, 1846, 1847, 1848, 1851, 1852, + 1855, 1858, 1859, 1860, 1861, 1862, 1865, 1866 }; #endif @@ -884,46 +884,46 @@ static const short yyr1[] = { 0, 291, 292, 293, 293, 293, 294, 295, 294, 296, 294, 297, 298, 297, 300, 299, 299, 299, 301, 302, 303, 304, 304, 305, 305, 306, 306, 306, 307, 307, 308, - 308, 308, 308, 308, -1, 309, 311, 310, 312, 313, - 315, 314, 316, 314, 317, 317, 318, 318, 318, 318, - 318, 319, 319, 319, 319, 320, 320, 320, 320, 320, + 308, 308, 308, 308, 309, 311, 310, 312, 313, 315, + 314, 316, 314, 317, 317, 318, 318, 318, 318, 318, + 319, 319, 319, 319, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, 320, - 320, 320, 321, 321, 322, 322, 323, 323, 324, 324, - 324, 324, 325, 325, 325, 325, 325, 325, 326, 326, - 326, 326, 327, 327, 327, 327, 328, 328, 328, 328, - 328, 328, 328, 328, 328, 328, 328, 329, 329, 329, + 320, 321, 321, 322, 322, 323, 323, 324, 324, 324, + 324, 325, 325, 325, 325, 325, 325, 326, 326, 326, + 326, 327, 327, 327, 327, 328, 328, 328, 328, 328, + 328, 328, 328, 328, 328, 328, 329, 329, 329, 329, 329, 329, 329, 329, 329, 329, 329, 329, 329, 329, - 329, 330, 331, 331, 332, 332, 333, 333, 333, 334, - 334, 335, 337, 338, 336, 339, 340, 336, 336, 336, - 341, 342, 336, 343, 344, 336, 336, 336, 336, 336, - 345, 346, 346, 346, 347, 347, 348, 348, 349, 349, - 349, 350, 351, 350, 350, 352, 352, 352, 353, 353, - 354, 354, 354, 354, 355, 355, 356, 356, 357, 357, - 358, 358, 359, 359, 359, 359, 360, 360, 361, 361, - 362, 362, 362, 364, 363, 365, 363, 366, 366, 367, - 367, 368, 368, 368, 369, 369, 370, 370, 370, 370, - 370, 370, 370, 370, 370, 371, 371, 371, 371, 371, - 371, 371, 371, 371, 372, 373, 374, 374, 375, 375, - 375, 375, 377, 378, 376, 380, 379, 379, 381, 381, + 330, 331, 331, 332, 332, 333, 333, 333, 334, 334, + 335, 337, 338, 336, 339, 340, 336, 336, 336, 341, + 342, 336, 343, 344, 336, 336, 336, 336, 336, 345, + 346, 346, 346, 347, 347, 348, 348, 349, 349, 349, + 350, 351, 350, 350, 352, 352, 352, 353, 353, 354, + 354, 354, 354, 355, 355, 356, 356, 357, 357, 358, + 358, 359, 359, 359, 359, 360, 360, 361, 361, 362, + 362, 362, 364, 363, 365, 363, 366, 366, 367, 367, + 368, 368, 368, 369, 369, 370, 370, 370, 370, 370, + 370, 370, 370, 370, 371, 371, 371, 371, 371, 371, + 371, 371, 371, 372, 373, 374, 374, 375, 375, 375, + 375, 377, 378, 376, 380, 379, 379, 381, 381, 381, 381, 381, 381, 381, 381, 381, 381, 381, 381, 381, - 381, 383, 382, 384, 385, 386, 386, 387, 387, 387, - 387, 387, 387, 387, 387, 387, 387, 387, 388, 388, - 389, 389, 391, 390, 392, 390, 394, 393, 395, 393, - 396, 396, 397, 398, 399, 400, 401, 402, 403, 403, - 403, 403, 403, 403, 403, 403, 404, 405, 405, 405, - 405, 406, 406, 407, 407, 408, 408, 409, 409, 410, - 410, 410, 411, 412, 413, 412, 414, 412, 415, 416, - 418, 419, 417, 420, 421, 420, 422, 422, 422, 422, - 423, 423, 424, 424, 425, 425, 425, 425, 425, 425, - 425, 425, 425, 426, 426, 426, 426, 426, 426, 426, - 426, 426, 426, 427, 427, 428, 428, 428, 428, 429, - 429, 429, 430, 430, 430, 431, 431, 431, 431, 431, - 432, 432, 432, 433, 433, 434, 434, 435, 435, 436, - 436, 437, 437, 438, 439, 440, 438, 441, 441, 441, - 441, 441, 441, 441, 441, 441, 441, 441, 441, 442, - 442, 443, 444, 444, 444, 445, 445, 445, 445, 446, - 446, 446, 446, 446, 446, 446, 446, 446, 446, 447, - 447, 448, 449, 449, 449, 449, 449, 450, 450 + 383, 382, 384, 385, 386, 386, 387, 387, 387, 387, + 387, 387, 387, 387, 387, 387, 387, 388, 388, 389, + 389, 391, 390, 392, 390, 394, 393, 395, 393, 396, + 396, 397, 398, 399, 400, 401, 402, 403, 403, 403, + 403, 403, 403, 403, 403, 404, 405, 405, 405, 405, + 406, 406, 407, 407, 408, 408, 409, 409, 410, 410, + 410, 411, 412, 413, 412, 414, 412, 415, 416, 418, + 419, 417, 420, 421, 420, 422, 422, 422, 422, 423, + 423, 424, 424, 425, 425, 425, 425, 425, 425, 425, + 425, 425, 426, 426, 426, 426, 426, 426, 426, 426, + 426, 426, 427, 427, 428, 428, 428, 428, 429, 429, + 429, 430, 430, 430, 431, 431, 431, 431, 431, 432, + 432, 432, 433, 433, 434, 434, 435, 435, 436, 436, + 437, 437, 438, 439, 440, 438, 441, 441, 441, 441, + 441, 441, 441, 441, 441, 441, 441, 441, 442, 442, + 443, 444, 444, 444, 445, 445, 445, 445, 446, 446, + 446, 446, 446, 446, 446, 446, 446, 446, 447, 447, + 448, 449, 449, 449, 449, 449, 450, 450 }; static const short yyr2[] = { 0, @@ -955,169 +955,169 @@ static const short yyr2[] = { 0, 1, 1, 1, 1, 1, 3, 0, 9, 0, 11, 2, 0, 6, 0, 8, 4, 4, 0, 0, 2, 1, 4, 0, 4, 1, 3, 4, 1, 3, 1, - 1, 1, 1, 1, 2, 2, 0, 6, 2, 2, - 0, 6, 0, 5, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 0, 6, 2, 2, 0, + 6, 0, 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, + 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 1, 4, 1, 3, 2, 2, 2, 0, - 1, 0, 0, 0, 12, 0, 0, 11, 6, 6, - 0, 0, 10, 0, 0, 10, 5, 5, 4, 4, - 0, 1, 1, 2, 5, 3, 2, 4, 1, 3, - 4, 6, 0, 8, 4, 1, 3, 2, 1, 4, - 1, 1, 2, 2, 1, 2, 1, 2, 1, 1, - 1, 2, 1, 2, 2, 3, 1, 3, 1, 3, - 1, 1, 3, 0, 2, 0, 4, 4, 1, 1, - 2, 1, 1, 2, 0, 1, 5, 2, 3, 3, - 4, 3, 4, 4, 5, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 2, 7, - 6, 2, 0, 0, 10, 0, 6, 1, 1, 1, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 3, - 1, 0, 3, 2, 2, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 3, 1, 1, 2, 2, - 0, 2, 0, 4, 0, 6, 0, 3, 0, 5, - 3, 2, 3, 0, 0, 0, 0, 0, 1, 2, - 2, 3, 2, 3, 3, 4, 2, 2, 3, 3, - 4, 1, 2, 1, 2, 1, 2, 1, 2, 1, - 2, 1, 4, 2, 0, 5, 0, 6, 4, 4, - 0, 0, 10, 1, 0, 4, 1, 1, 1, 1, - 1, 2, 1, 3, 1, 4, 3, 4, 6, 5, - 5, 2, 2, 1, 2, 2, 2, 2, 2, 2, - 2, 2, 1, 1, 4, 1, 3, 3, 3, 1, - 3, 3, 1, 3, 3, 1, 3, 3, 3, 3, - 1, 3, 3, 1, 3, 1, 3, 1, 3, 1, - 3, 1, 3, 1, 0, 0, 7, 1, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, - 0, 1, 2, 7, 2, 2, 7, 6, 2, 3, - 2, 3, 2, 3, 3, 3, 3, 2, 3, 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1 + 3, 1, 4, 1, 3, 2, 2, 2, 0, 1, + 0, 0, 0, 12, 0, 0, 11, 6, 6, 0, + 0, 10, 0, 0, 10, 5, 5, 4, 4, 0, + 1, 1, 2, 5, 3, 2, 4, 1, 3, 4, + 6, 0, 8, 4, 1, 3, 2, 1, 4, 1, + 1, 2, 2, 1, 2, 1, 2, 1, 1, 1, + 2, 1, 2, 2, 3, 1, 3, 1, 3, 1, + 1, 3, 0, 2, 0, 4, 4, 1, 1, 2, + 1, 1, 2, 0, 1, 5, 2, 3, 3, 4, + 3, 4, 4, 5, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 2, 2, 7, 6, + 2, 0, 0, 10, 0, 6, 1, 1, 1, 1, + 2, 1, 1, 1, 1, 1, 1, 1, 3, 1, + 0, 3, 2, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 1, 1, 2, 2, 0, + 2, 0, 4, 0, 6, 0, 3, 0, 5, 3, + 2, 3, 0, 0, 0, 0, 0, 1, 2, 2, + 3, 2, 3, 3, 4, 2, 2, 3, 3, 4, + 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, + 1, 4, 2, 0, 5, 0, 6, 4, 4, 0, + 0, 10, 1, 0, 4, 1, 1, 1, 1, 1, + 2, 1, 3, 1, 4, 3, 4, 6, 5, 5, + 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, + 2, 1, 1, 4, 1, 3, 3, 3, 1, 3, + 3, 1, 3, 3, 1, 3, 3, 3, 3, 1, + 3, 3, 1, 3, 1, 3, 1, 3, 1, 3, + 1, 3, 1, 0, 0, 7, 1, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 1, 0, + 1, 2, 7, 2, 2, 7, 6, 2, 3, 2, + 3, 2, 3, 3, 3, 3, 2, 3, 0, 1, + 1, 1, 1, 1, 1, 1, 1, 1 }; static const short yydefact[] = { 0, - 11, 433, 401, 254, 401, 14, 0, 0, 0, 0, - 268, 268, 281, 280, 282, 283, 284, 343, 344, 308, - 310, 309, 313, 314, 302, 304, 305, 303, 311, 312, - 345, 346, 306, 307, 323, 319, 315, 320, 316, 297, - 298, 301, 299, 300, 340, 341, 342, 339, 325, 324, - 318, 317, 329, 330, 331, 332, 327, 328, 326, 333, - 334, 337, 338, 335, 336, 401, 401, 401, 401, 401, - 401, 401, 401, 401, 401, 321, 672, 673, 677, 322, - 674, 675, 678, 0, 3, 6, 7, 425, 8, 9, - 133, 43, 670, 10, 253, 255, 0, 380, 268, 268, - 268, 268, 268, 268, 268, 268, 401, 268, 380, 380, - 401, 373, 401, 0, 401, 129, 268, 676, 20, 401, - 429, 430, 431, 434, 435, 271, 268, 268, 264, 401, - 679, 401, 401, 677, 0, 518, 268, 527, 0, 0, - 0, 652, 0, 0, 0, 0, 268, 560, 0, 268, + 11, 432, 400, 254, 400, 14, 0, 0, 0, 0, + 268, 268, 281, 280, 282, 283, 284, 342, 343, 307, + 309, 308, 312, 313, 301, 303, 304, 302, 310, 311, + 344, 345, 305, 306, 322, 318, 314, 319, 315, 296, + 297, 300, 298, 299, 339, 340, 341, 338, 324, 323, + 317, 316, 328, 329, 330, 331, 326, 327, 325, 332, + 333, 336, 337, 334, 335, 400, 400, 400, 400, 400, + 400, 400, 400, 400, 400, 320, 671, 672, 676, 321, + 673, 674, 677, 0, 3, 6, 7, 424, 8, 9, + 133, 43, 669, 10, 253, 255, 0, 379, 268, 268, + 268, 268, 268, 268, 268, 268, 400, 268, 379, 379, + 400, 372, 400, 0, 400, 129, 268, 675, 20, 400, + 428, 429, 430, 433, 434, 271, 268, 268, 264, 400, + 678, 400, 400, 676, 0, 517, 268, 526, 0, 0, + 0, 651, 0, 0, 0, 0, 268, 559, 0, 268, 268, 268, 268, 268, 268, 268, 268, 268, 0, 42, - 0, 0, 0, 0, 0, 521, 268, 168, 164, 167, - 581, 571, 169, 180, 200, 190, 189, 202, 206, 209, + 0, 0, 0, 0, 0, 520, 268, 168, 164, 167, + 580, 570, 169, 180, 200, 190, 189, 202, 206, 209, 212, 217, 220, 222, 224, 226, 229, 232, 236, 248, - 562, 194, 0, 0, 552, 508, 509, 510, 511, 0, - 0, 512, 268, 513, 0, 514, 165, 0, 515, 517, - 163, 0, 501, 0, 558, 0, 534, 488, 0, 0, - 0, 497, 0, 498, 477, 496, 493, 494, 489, 490, - 491, 0, 0, 495, 502, 0, 0, 499, 476, 0, - 347, 348, 358, 360, 359, 361, 362, 363, 364, 365, - 366, 367, 4, 268, 0, 131, 136, 401, 671, 5, - 401, 381, 377, 351, 353, 350, 352, 355, 354, 356, - 357, 371, 349, 378, 379, 0, 268, 268, 369, 268, - 268, 0, 370, 426, 368, 432, 436, 401, 0, 270, - 401, 0, 261, 268, 670, 16, 18, 0, 401, 268, - 28, 444, 268, 164, 167, 200, 252, 523, 163, 0, - 268, 268, 268, 268, 0, 661, 663, 668, 0, 0, - 401, 450, 0, 0, 183, 188, 187, 186, 185, 184, + 561, 194, 0, 0, 551, 507, 508, 509, 510, 0, + 0, 511, 268, 512, 0, 513, 165, 0, 514, 516, + 163, 0, 500, 0, 557, 0, 533, 487, 0, 0, + 0, 496, 0, 497, 476, 495, 492, 493, 488, 489, + 490, 0, 0, 494, 501, 0, 0, 498, 475, 0, + 346, 347, 357, 359, 358, 360, 361, 362, 363, 364, + 365, 366, 4, 268, 0, 131, 136, 400, 670, 5, + 400, 380, 376, 350, 352, 349, 351, 354, 353, 355, + 356, 370, 348, 377, 378, 0, 268, 268, 368, 268, + 268, 0, 369, 425, 367, 431, 435, 400, 0, 270, + 400, 0, 261, 268, 669, 16, 18, 0, 400, 268, + 28, 443, 268, 164, 167, 200, 252, 522, 163, 0, + 268, 268, 268, 268, 0, 660, 662, 667, 0, 0, + 400, 449, 0, 0, 183, 188, 187, 186, 185, 184, 0, 268, 181, 182, 268, 0, 0, 0, 0, 0, - 521, 0, 268, 520, 268, 466, 467, 468, 469, 0, - 470, 471, 268, 473, 268, 472, 474, 534, 268, 268, + 520, 0, 268, 519, 268, 465, 466, 467, 468, 0, + 469, 470, 268, 472, 268, 471, 473, 533, 268, 268, 176, 177, 0, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 227, 233, 230, 561, 268, 0, 659, 39, 0, 535, - 553, 564, 656, 582, 0, 519, 268, 0, 0, 0, - 559, 40, 478, 482, 554, 401, 492, 504, 505, 0, - 0, 0, 41, 22, 268, 444, 401, 401, 268, 256, - 130, 401, 0, 375, 0, 401, 0, 401, 0, 268, - 268, 267, 268, 266, 262, 401, 0, 268, 0, 401, - 268, 19, 441, 0, 0, 427, 442, 268, 0, 0, - 528, 0, 567, 0, 251, 0, 660, 669, 166, 268, - 268, 0, 452, 451, 453, 268, 516, 268, 0, 664, - 665, 666, 667, 662, 522, 268, 529, 0, 655, 401, - 532, 653, 0, 0, 171, 0, 178, 0, 0, 0, + 227, 233, 230, 560, 268, 0, 658, 39, 0, 534, + 552, 563, 655, 581, 0, 518, 268, 0, 0, 0, + 558, 40, 477, 481, 553, 400, 491, 503, 504, 0, + 0, 0, 41, 22, 268, 443, 400, 400, 268, 256, + 130, 400, 0, 374, 0, 400, 0, 400, 0, 268, + 268, 267, 268, 266, 262, 400, 0, 268, 0, 400, + 268, 19, 440, 0, 0, 426, 441, 268, 0, 0, + 527, 0, 566, 0, 251, 0, 659, 668, 166, 268, + 268, 0, 451, 450, 452, 268, 515, 268, 0, 663, + 664, 665, 666, 661, 521, 268, 528, 0, 654, 400, + 531, 652, 0, 0, 171, 0, 178, 0, 0, 0, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 203, 204, 205, 208, 207, 210, 211, 213, 214, 215, 216, 218, 219, 221, 223, 225, 268, 268, 268, - 249, 268, 268, 195, 548, 167, 552, 0, 401, 533, - 565, 0, 0, 500, 486, 268, 555, 503, 0, 0, - 24, 0, 539, 268, 556, 132, 401, 268, 534, 268, - 257, 374, 268, 391, 0, 399, 394, 0, 400, 0, - 416, 419, 413, 415, 272, 268, 268, 670, 15, 30, - 268, 444, 268, 17, 428, 437, 439, 36, 446, 401, - 445, 449, 524, 563, 0, 569, 268, 372, 458, 0, - 444, 454, 268, 0, 201, 401, 268, 525, 0, 531, - 547, 0, 572, 268, 172, 170, 268, 268, 228, 0, - 231, 268, 197, 268, 199, 549, 550, 268, 268, 268, - 570, 268, 401, 268, 401, 78, 26, 540, 543, 268, - 268, 541, 268, 557, 534, 135, 0, 259, 268, 376, - 397, 536, 383, 398, 536, 386, 268, 418, 268, 0, + 249, 268, 268, 195, 547, 167, 551, 0, 400, 532, + 564, 0, 0, 499, 485, 268, 554, 502, 0, 0, + 24, 0, 538, 268, 555, 132, 400, 268, 533, 268, + 257, 373, 268, 390, 0, 398, 393, 0, 399, 0, + 415, 418, 412, 414, 272, 268, 268, 669, 15, 30, + 268, 443, 268, 17, 427, 436, 438, 36, 445, 400, + 444, 448, 523, 562, 0, 568, 268, 371, 457, 0, + 443, 453, 268, 0, 201, 400, 268, 524, 0, 530, + 546, 0, 571, 268, 172, 170, 268, 268, 228, 0, + 231, 268, 197, 268, 199, 548, 549, 268, 268, 268, + 569, 268, 400, 268, 400, 78, 26, 539, 542, 268, + 268, 540, 268, 556, 533, 135, 0, 259, 268, 375, + 396, 535, 382, 397, 535, 385, 268, 417, 268, 0, 105, 268, 268, 268, 0, 32, 0, 268, 0, 80, - 443, 268, 455, 268, 0, 459, 462, 268, 0, 460, - 0, 444, 0, 0, 0, 530, 268, 268, 179, 174, - 175, 234, 0, 0, 551, 566, 0, 268, 268, 268, + 442, 268, 454, 268, 0, 458, 461, 268, 0, 459, + 0, 443, 0, 0, 0, 529, 268, 268, 179, 174, + 175, 234, 0, 0, 550, 565, 0, 268, 268, 268, 268, 268, 268, 268, 268, 268, 0, 164, 167, 180, 200, 189, 206, 209, 212, 217, 220, 222, 224, 226, - 229, 0, 575, 574, 165, 585, 594, 604, 606, 610, - 613, 616, 621, 624, 626, 628, 630, 632, 634, 638, - 577, 163, 0, 23, 0, 95, 99, 97, 122, 123, + 229, 0, 574, 573, 165, 584, 593, 603, 605, 609, + 612, 615, 620, 623, 625, 627, 629, 631, 633, 637, + 576, 163, 0, 23, 0, 95, 99, 97, 122, 123, 124, 125, 126, 127, 128, 25, 78, 82, 0, 84, - 83, 0, 87, 0, 401, 401, 85, 0, 86, 293, - 0, 78, 544, 545, 268, 542, 21, 268, 273, 401, - 389, 536, 401, 390, 536, 412, 417, 268, 0, 0, - 104, 268, 275, 263, 268, 0, 401, 80, 34, 0, - 438, 440, 37, 80, 88, 90, 89, 93, 91, 92, - 447, 421, 0, 268, 455, 422, 456, 568, 483, 0, - 463, 461, 464, 0, 0, 173, 526, 0, 575, 268, - 196, 198, 658, 0, 0, 183, 188, 187, 186, 185, + 83, 0, 87, 0, 400, 400, 85, 0, 86, 292, + 0, 78, 543, 544, 268, 541, 21, 268, 273, 400, + 388, 535, 400, 389, 535, 411, 416, 268, 0, 0, + 104, 268, 275, 263, 268, 0, 400, 80, 34, 0, + 437, 439, 37, 80, 88, 90, 89, 93, 91, 92, + 446, 420, 0, 268, 454, 421, 455, 567, 482, 0, + 462, 460, 463, 0, 0, 173, 525, 0, 574, 268, + 196, 198, 657, 0, 0, 183, 188, 187, 186, 185, 184, 181, 182, 268, 268, 268, 176, 177, 0, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, 268, - 268, 268, 268, 268, 268, 268, 227, 635, 230, 487, - 0, 481, 103, 108, 101, 112, 670, 79, 94, 98, - 106, 287, 290, 286, 0, 291, 289, 27, 546, 268, - 0, 403, 401, 401, 402, 401, 401, 401, 420, 268, - 265, 278, 0, 273, 12, 31, 33, 80, 29, 670, - 81, 444, 448, 423, 424, 268, 457, 465, 0, 192, - 0, 534, 235, 657, 166, 268, 0, 171, 0, 0, - 0, 0, 639, 640, 641, 642, 643, 644, 645, 646, - 647, 648, 649, 203, 204, 205, 208, 207, 210, 211, - 213, 214, 215, 216, 218, 219, 221, 223, 225, 631, - 268, 633, 268, 480, 107, 0, 117, 118, 119, 120, - 121, 670, 109, 401, 112, 0, 0, 140, 100, 149, - 670, 138, 139, 0, 47, 0, 0, 57, 58, 68, - 66, 296, 0, 295, 55, 75, 0, 62, 65, 0, - 670, 67, 159, 273, 268, 401, 0, 268, 404, 392, - 401, 395, 401, 414, 276, 268, 670, 35, 0, 268, - 484, 268, 0, 654, 651, 201, 268, 172, 170, 268, - 268, 0, 576, 102, 112, 96, 115, 111, 116, 114, + 268, 268, 268, 268, 268, 268, 227, 634, 230, 486, + 0, 480, 103, 108, 101, 112, 669, 79, 94, 98, + 106, 286, 289, 285, 0, 290, 288, 27, 545, 268, + 0, 402, 400, 400, 401, 400, 400, 400, 419, 268, + 265, 278, 0, 273, 12, 31, 33, 80, 29, 669, + 81, 443, 447, 422, 423, 268, 456, 464, 0, 192, + 0, 533, 235, 656, 166, 268, 0, 171, 0, 0, + 0, 0, 638, 639, 640, 641, 642, 643, 644, 645, + 646, 647, 648, 203, 204, 205, 208, 207, 210, 211, + 213, 214, 215, 216, 218, 219, 221, 223, 225, 630, + 268, 632, 268, 479, 107, 0, 117, 118, 119, 120, + 121, 669, 109, 400, 112, 0, 0, 140, 100, 149, + 669, 138, 139, 0, 47, 0, 0, 57, 58, 68, + 66, 295, 0, 294, 55, 75, 0, 62, 65, 0, + 669, 67, 159, 273, 268, 400, 0, 268, 403, 391, + 400, 394, 400, 413, 276, 268, 669, 35, 0, 268, + 483, 268, 0, 653, 650, 201, 268, 172, 170, 268, + 268, 0, 575, 102, 112, 96, 115, 111, 116, 114, 113, 0, 143, 0, 0, 0, 0, 137, 0, 0, - 152, 161, 670, 151, 0, 0, 65, 0, 71, 0, + 152, 161, 669, 151, 0, 0, 65, 0, 71, 0, 53, 52, 0, 60, 59, 61, 0, 0, 0, 0, - 0, 0, 268, 670, 160, 0, 258, 268, 406, 268, - 268, 401, 409, 0, 384, 0, 387, 277, 279, 0, - 38, 268, 0, 193, 191, 650, 535, 0, 174, 175, - 636, 110, 144, 141, 147, 0, 148, 145, 146, 150, + 0, 0, 268, 669, 160, 0, 258, 268, 405, 268, + 268, 400, 408, 0, 383, 0, 386, 277, 279, 0, + 38, 268, 0, 193, 191, 649, 534, 0, 174, 175, + 635, 110, 144, 141, 147, 0, 148, 145, 146, 150, 0, 155, 0, 0, 0, 0, 268, 0, 77, 76, 0, 72, 0, 49, 44, 45, 54, 65, 56, 69, - 0, 73, 74, 0, 0, 294, 268, 268, 274, 268, - 268, 0, 407, 268, 393, 0, 396, 0, 13, 485, - 573, 173, 268, 142, 156, 153, 0, 157, 158, 162, - 288, 51, 48, 0, 0, 70, 46, 63, 292, 260, - 410, 401, 405, 268, 382, 388, 637, 154, 64, 50, - 408, 411, 385, 0, 0, 0 + 0, 73, 74, 0, 0, 293, 268, 268, 274, 268, + 268, 0, 406, 268, 392, 0, 395, 0, 13, 484, + 572, 173, 268, 142, 156, 153, 0, 157, 158, 162, + 287, 51, 48, 0, 0, 70, 46, 63, 291, 260, + 409, 400, 404, 268, 381, 387, 636, 154, 64, 50, + 407, 410, 384, 0, 0, 0 }; static const short yydefgoto[] = { 1194, @@ -1311,18 +1311,18 @@ static const short yytable[] = { 118, 712, 526, 722, 527, 515, 516, 195, 434, 447, 619, 1140, 517, 518, 725, 679, 675, 325, 326, 327, 328, 329, 330, 519, 520, 521, 522, 204, 439, 409, 523, - 524, 600, -583, 413, 912, 414, -583, 914, 995, 234, + 524, 600, -582, 413, 912, 414, -582, 914, 995, 234, 234, 1022, 584, 1027, 256, 119, 608, 808, 119, 1009, 90, 1071, 135, 417, 449, 710, 712, 996, 722, 995, - 990, 2, -629, 118, 116, 759, -629, 997, 917, 725, + 990, 2, -628, 118, 116, 759, -628, 997, 917, 725, 235, 235, 552, 453, 921, 259, 111, 94, 1068, 392, 389, 259, 1121, 1122, 428, 628, 261, 986, 997, 986, 262, 760, 499, 823, 393, 824, 118, 987, 395, 987, 721, 262, 262, 641, 616, 287, 907, 878, 500, 888, 1059, 453, 118, 720, 300, 1054, 762, 1055, 394, 941, 1060, 395, 879, 118, 898, 299, 1068, 453, 211, 119, - -401, 677, -401, 1056, 90, 942, 997, 121, 122, 395, - -401, 665, 1014, 1086, -625, 1039, 211, 324, -625, 1170, + -400, 677, -400, 1056, 90, 942, 997, 121, 122, 395, + -400, 665, 1014, 1086, -624, 1039, 211, 324, -624, 1170, 1067, 1069, 1123, 783, 1124, 1095, 721, 1097, 411, 1052, 1053, 395, 119, 681, 200, 232, 232, 204, 768, 720, 1125, 1141, 211, 771, 668, 808, 386, 387, 301, 1072, @@ -1338,74 +1338,74 @@ static const short yytable[] = { 118, 77, 1061, 715, 118, 446, 716, 302, 235, 453, 118, 906, 395, 235, 908, 235, 596, 77, 1000, 1066, 768, 717, 664, 434, 311, 771, 808, 488, 235, 551, 468, - 718, 719, 395, 473, 768, 200, -401, -401, -401, 771, - -679, -401, -401, 470, 713, 307, 614, 312, -401, 714, - 615, -401, 119, -401, 211, 436, 438, 440, 715, 1136, + 718, 719, 395, 473, 768, 200, -400, -400, -400, 771, + -678, -400, -400, 470, 713, 307, 614, 312, -400, 714, + 615, -400, 119, -400, 211, 436, 438, 440, 715, 1136, 307, 716, 211, 395, 211, 679, 684, 631, 817, 119, 710, 712, 605, 722, 1031, 301, 205, 972, 909, 200, - 453, 693, -627, 694, 725, 395, -627, 200, 970, 833, - 388, 200, 453, -679, 200, 1015, 313, -617, 1016, 1139, - 666, -617, 232, 410, 1145, 314, -614, 232, 211, 232, - -614, -401, 677, -401, 977, 978, 1032, 378, 379, 1033, - 205, -401, 232, 200, 316, 380, 381, 537, 205, 211, + 453, 693, -626, 694, 725, 395, -626, 200, 970, 833, + 388, 200, 453, -678, 200, 1015, 313, -616, 1016, 1139, + 666, -616, 232, 410, 1145, 314, -613, 232, 211, 232, + -613, -400, 677, -400, 977, 978, 1032, 378, 379, 1033, + 205, -400, 232, 200, 316, 380, 381, 537, 205, 211, 211, 1078, 205, 1079, 1019, 205, 211, 1019, 118, 560, - 547, -269, -580, 254, 979, 980, -580, 204, 118, 1080, + 547, -269, -579, 254, 979, 980, -579, 204, 118, 1080, 118, 547, 118, 1174, 470, 307, 1090, 835, 981, -268, - 118, 471, 300, 118, 205, 1117, -579, 118, 2, 2, - -579, 721, -603, 77, 78, 134, -603, 307, 81, 82, - 234, 234, -578, -269, 720, 448, -578, -401, -401, -401, - -679, -679, -401, -401, -618, -679, -679, 259, -618, 211, + 118, 471, 300, 118, 205, 1117, -578, 118, 2, 2, + -578, 721, -602, 77, 78, 134, -602, 307, 81, 82, + 234, 234, -577, -269, 720, 448, -577, -400, -400, -400, + -678, -678, -400, -400, -617, -678, -678, 259, -617, 211, 1045, 193, 223, 223, 119, 317, 967, 259, 118, 118, 1057, 235, 235, 336, 572, 335, 119, 968, 119, 969, 957, 958, 380, 381, 378, 379, 301, 959, 960, 587, 77, 78, 134, 592, 1117, 81, 82, 337, 961, 962, 963, 964, 338, 402, 494, 965, 966, 211, 211, 1113, - 1054, 1019, 1055, 1019, -619, 118, 633, 339, -619, -401, - -401, -401, 547, 211, -401, -401, 211, 211, 1056, 340, - 812, -401, -401, -401, 617, 618, -401, -401, -452, 471, + 1054, 1019, 1055, 1019, -618, 118, 633, 339, -618, -400, + -400, -400, 547, 211, -400, -400, 211, 211, 1056, 340, + 812, -400, -400, -400, 617, 618, -400, -400, -451, 471, 547, 259, 380, 381, 1016, 200, 204, -45, 382, 383, 341, 1078, 118, 1079, 300, 836, 837, 838, 839, 840, - 841, -673, 384, 385, -620, 717, 232, 232, -620, 1080, - 395, 388, 673, 1035, 882, 718, 719, -677, 77, 78, - 134, 119, -674, 81, 82, -268, 205, 471, 259, 713, + 841, -672, 384, 385, -619, 717, 232, 232, -619, 1080, + 395, 388, 673, 1035, 882, 718, 719, -676, 77, 78, + 134, 119, -673, 81, 82, -268, 205, 471, 259, 713, 992, 1126, 380, 381, 714, 2, 1148, 211, 211, 1016, - -622, 742, 193, 715, -622, 389, 716, 395, 390, 211, + -621, 742, 193, 715, -621, 389, 716, 395, 390, 211, 211, 931, 211, 380, 381, 602, 382, 383, 301, 196, 229, 229, 307, 1029, 280, 281, 282, 118, 1149, 118, - 384, 385, 391, 868, 869, -623, 206, 399, 118, -623, + 384, 385, 391, 868, 869, -622, 206, 399, 118, -622, 398, 118, 118, 211, 815, 489, 193, 870, 871, 473, 996, 382, 383, 492, 193, 493, 394, 742, 193, 395, - 997, 193, 404, 469, 933, 384, 385, -506, 97, 223, - -676, 97, 812, -612, 223, 411, 223, -612, 395, 241, - 242, 406, 469, -675, 200, 1046, 375, 376, 377, 223, + 997, 193, 404, 469, 933, 384, 385, -505, 97, 223, + -675, 97, 812, -611, 223, 411, 223, -611, 395, 241, + 242, 406, 469, -674, 200, 1046, 375, 376, 377, 223, 193, 407, 395, 572, 1058, 572, 935, 77, 78, 134, - 1181, -597, 81, 82, 802, -597, 412, 592, 119, 359, - -268, 360, 471, -401, 1083, 386, 387, 954, 955, 956, - 2, 986, -602, 418, 1114, 205, -602, 555, 419, -401, - 1100, 987, 361, 362, 1192, 845, -601, 846, -600, -401, - -601, 423, -600, 424, 211, 77, 78, 134, 426, 471, - 81, 82, 97, 486, 487, -401, 1108, 2, 847, 848, + 1181, -596, 81, 82, 802, -596, 412, 592, 119, 359, + -268, 360, 471, -400, 1083, 386, 387, 954, 955, 956, + 2, 986, -601, 418, 1114, 205, -601, 555, 419, -400, + 1100, 987, 361, 362, 1192, 845, -600, 846, -599, -400, + -600, 423, -599, 424, 211, 77, 78, 134, 426, 471, + 81, 82, 97, 486, 487, -400, 1108, 2, 847, 848, 196, -268, 903, 471, 2, 903, 1127, 264, 265, 266, - 267, 268, 269, 270, 271, 445, 273, 206, -599, 276, - 1132, 1078, -599, 1079, 118, 97, 815, 1147, 430, -598, - 555, 442, 1036, -598, 118, 289, 290, 292, -595, 1080, - 444, 298, -595, 450, 196, -596, 998, 999, 461, -596, - 77, 1000, 196, -268, 1001, 603, 196, 321, -592, 196, - 467, 206, -592, 476, 331, 986, -615, 229, 1166, 206, - -615, 477, 229, 206, 229, 987, 206, 378, 379, 555, - 1165, 1123, -593, 1124, 478, -584, -593, 229, 196, -584, - 119, -587, 193, 532, 533, -587, 993, 555, 644, 1125, + 267, 268, 269, 270, 271, 445, 273, 206, -598, 276, + 1132, 1078, -598, 1079, 118, 97, 815, 1147, 430, -597, + 555, 442, 1036, -597, 118, 289, 290, 292, -594, 1080, + 444, 298, -594, 450, 196, -595, 998, 999, 461, -595, + 77, 1000, 196, -268, 1001, 603, 196, 321, -591, 196, + 467, 206, -591, 476, 331, 986, -614, 229, 1166, 206, + -614, 477, 229, 206, 229, 987, 206, 378, 379, 555, + 1165, 1123, -592, 1124, 478, -583, -592, 229, 196, -583, + 119, -586, 193, 532, 533, -586, 993, 555, 644, 1125, 930, 480, 614, 479, 1012, 206, 1038, 375, 376, 377, - 77, 78, 134, 223, 223, 81, 82, 924, 481, -607, - 482, 77, 988, -607, 321, 171, 903, 497, 903, 903, + 77, 78, 134, 223, 223, 81, 82, 924, 481, -606, + 482, 77, 988, -606, 321, 171, 903, 497, 903, 903, 903, 490, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 861, 862, 863, 483, 77, 78, 134, - 118, 118, 81, 82, 77, 78, 134, -611, 484, 81, - 82, -611, 425, 531, 1074, 1075, 1076, 541, 644, 696, - 375, 376, 377, -608, -609, -605, -588, -608, -609, -605, - -588, 644, 742, -586, 542, 97, 432, -586, 435, 437, - -590, 657, 658, 1050, -590, 993, 993, -591, 545, 284, - -589, -591, 97, 1064, -589, 1012, 1012, 1049, 298, 395, + 118, 118, 81, 82, 77, 78, 134, -610, 484, 81, + 82, -610, 425, 531, 1074, 1075, 1076, 541, 644, 696, + 375, 376, 377, -607, -608, -604, -587, -607, -608, -604, + -587, 644, 742, -585, 542, 97, 432, -585, 435, 437, + -589, 657, 658, 1050, -589, 993, 993, -590, 545, 284, + -588, -590, 97, 1064, -588, 1012, 1012, 1049, 298, 395, 692, 321, 864, 865, 818, 544, 1040, 1041, 549, 866, 867, 562, 1064, 563, 307, 77, 988, 118, 1093, 171, 472, 193, 910, 658, 872, 873, 564, 1187, -268, 118, @@ -1498,7 +1498,7 @@ static const short yytable[] = { 118, 0, 0, 0, 0, 0, 210, 0, 0, 0, 0, 0, 0, 0, 210, 159, 0, 0, 210, 0, 0, 210, 0, 0, 0, 0, 0, 0, 0, 238, 0, - 0, -534, 0, 238, 0, 238, 343, 0, 0, 0, + 0, -533, 0, 238, 0, 238, 343, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 0, 238, 210, 0, 0, 0, 0, 0, 0, 0, 168, 156, 157, 158, 0, 0, 0, 208, 0, 0, 0, 0, 0, @@ -1518,7 +1518,7 @@ static const short yytable[] = { 118, 171, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 210, 0, 0, 3, 0, 0, 1088, 0, 306, 0, 1042, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 238, 238, 0, 0, -401, -401, -401, 0, + 0, 0, 238, 238, 0, 0, -400, -400, -400, 0, 4, 0, 0, 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 77, 304, 305, 711, 171, 0, 0, 8, 9, 10, 0, 0, 0, 0, 0, 0, 0, @@ -1537,8 +1537,8 @@ static const short yytable[] = { 118, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -401, -401, - -401, 0, 4, 306, 0, 0, 0, 5, 6, 7, + 0, 0, 0, 0, 0, 0, 0, 0, -400, -400, + -400, 0, 4, 306, 0, 0, 0, 5, 6, 7, 0, 0, 0, 0, 0, 0, 306, 0, 0, 0, 0, 0, 8, 9, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 306, 0, 0, @@ -1551,12 +1551,12 @@ static const short yytable[] = { 118, 68, 69, 70, 71, 72, 73, 74, 75, 76, 0, 0, 0, 0, 0, 0, 77, 78, 79, 80, 136, 81, 82, 83, 0, 137, 138, 139, 0, 140, 141, - 142, 143, 144, 145, 146, 147, 148, -534, 535, 0, + 142, 143, 144, 145, 146, 147, 148, -533, 535, 0, 0, 0, 149, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 0, 0, 0, 0, 0, 0, 0, -268, -268, 0, 3, 156, 157, 158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -401, -401, -401, 159, 4, + 0, 0, 0, 0, 0, -400, -400, -400, 159, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 161, 162, 163, 164, 165, 166, 0, @@ -1570,7 +1570,7 @@ static const short yytable[] = { 118, 71, 72, 73, 74, 75, 76, 0, 0, 0, 0, 0, 0, 77, 169, 536, 80, 171, 172, 82, 83, 136, 0, 0, 0, 0, 137, 138, 139, 0, 140, - 141, 142, 143, 144, 145, 146, 147, 148, -534, 0, + 141, 142, 143, 144, 145, 146, 147, 148, -533, 0, 0, 0, 0, 149, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 0, 0, 0, 0, 0, 0, 0, -268, -268, 0, 0, 156, 157, 158, 0, 0, @@ -1589,8 +1589,8 @@ static const short yytable[] = { 118, -268, -268, -268, -268, -268, -268, -268, 0, 0, 0, 0, 0, 0, 77, 169, 170, -268, 171, 172, 82, -268, 213, 0, 0, 0, 0, 137, 138, 139, 0, - 0, 214, 142, 143, 144, 145, 146, 147, 215, -534, - -538, 0, 0, 0, 216, 0, 0, 0, 0, 150, + 0, 214, 142, 143, 144, 145, 146, 147, 215, -533, + -537, 0, 0, 0, 216, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 0, 0, 0, 0, 0, 0, 0, -268, -268, 0, 0, 156, 157, 158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1609,14 +1609,14 @@ static const short yytable[] = { 118, 0, 0, 0, 0, 77, 169, 170, -268, 171, 217, 218, -268, 213, 0, 0, 0, 0, 137, 138, 139, 0, 0, 214, 142, 143, 144, 145, 146, 147, 215, - -479, -479, 0, 0, 0, 216, -479, 0, 0, 0, + -478, -478, 0, 0, 0, 216, -478, 0, 0, 0, 150, 151, 152, 153, 154, 155, 0, 0, 0, 0, 0, 0, 0, -268, -268, 0, 136, 156, 157, 158, 0, 137, 138, 139, 0, 140, 141, 142, 143, 144, - 145, 146, 147, 148, -534, 0, 0, 0, 0, 149, + 145, 146, 147, 148, -533, 0, 0, 0, 0, 149, 0, 159, 0, 0, 150, 151, 152, 153, 154, 155, 0, 0, 0, 0, 0, 0, 0, -268, -268, 0, - 0, 156, 157, 158, 0, -479, 161, 162, 163, 164, + 0, 156, 157, 158, 0, -478, 161, 162, 163, 164, 165, 166, 0, 0, 0, 0, 0, 0, 0, 0, 167, 0, 0, 0, 168, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1628,31 +1628,31 @@ static const short yytable[] = { 118, 0, 0, 0, 0, 0, 77, 169, 170, 0, 171, 217, 218, 0, 0, 0, 136, 0, 0, 0, 0, 137, 138, 139, 0, 140, 141, 142, 143, 144, 145, - 146, 147, 148, -534, 0, 0, 0, 0, 149, 0, + 146, 147, 148, -533, 0, 0, 0, 0, 149, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 77, 169, 170, 0, 171, 172, 82, -268, -268, 0, 213, 156, 157, 158, 0, 137, 138, 139, 0, 0, 214, - 142, 143, 144, 145, 146, 147, 215, -534, -538, 0, + 142, 143, 144, 145, 146, 147, 215, -533, -537, 0, 0, 0, 216, 0, 159, 0, 0, 150, 151, 152, 153, 154, 155, 0, 0, 0, 0, 0, 0, 0, - -268, -268, 0, 0, 156, 157, 158, 0, -507, 161, + -268, -268, 0, 0, 156, 157, 158, 0, -506, 161, 162, 163, 164, 165, 166, 0, 0, 0, 0, 0, 0, 0, 0, 167, 0, 0, 0, 168, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -475, 161, 162, 163, 164, 165, 166, 0, + 0, 0, -474, 161, 162, 163, 164, 165, 166, 0, 0, 0, 0, 0, 0, 0, 0, 167, 0, 0, 0, 168, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, 169, 170, 0, 171, 172, 82, 0, 0, 0, 136, 0, 0, 0, 0, 137, 138, 139, 0, 140, 141, 142, - 143, 144, 145, 146, 147, 148, -534, 626, 0, 0, + 143, 144, 145, 146, 147, 148, -533, 626, 0, 0, 0, 149, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 77, 169, 170, 0, 171, 217, 218, -268, -268, 0, 213, 156, 157, 158, 0, 137, 138, 139, 0, 0, 214, 142, 143, 144, 145, 146, 147, 215, - -534, -538, 0, 0, 0, 216, 0, 159, 0, 0, + -533, -537, 0, 0, 0, 216, 0, 159, 0, 0, 150, 151, 152, 153, 154, 155, 0, 0, 0, 0, 0, 0, 0, -268, -268, 0, 0, 156, 157, 158, 0, 0, 161, 162, 163, 164, 165, 166, 0, 0, @@ -1666,7 +1666,7 @@ static const short yytable[] = { 118, 303, 495, 0, 0, 0, 150, 151, 152, 153, 154, 155, 77, 169, 170, 0, 171, 172, 82, 0, 0, 0, 136, 156, 157, 158, 0, 137, 138, 139, 0, - 140, 141, 142, 143, 144, 145, 146, 147, 148, -534, + 140, 141, 142, 143, 144, 145, 146, 147, 148, -533, 0, 0, 0, 0, 149, 0, 159, 0, 0, 150, 151, 152, 153, 154, 155, 77, 169, 170, 0, 171, 217, 218, -268, -268, 0, 0, 156, 157, 158, 0, @@ -1677,7 +1677,7 @@ static const short yytable[] = { 118, 0, 0, 0, 0, 0, 161, 162, 163, 164, 165, 166, 0, 0, 0, 0, 0, 0, 0, 0, 167, 137, 138, 139, 168, 140, 141, 142, 143, 144, 145, - 146, 147, 215, -534, 553, 0, 0, 0, 343, 0, + 146, 147, 215, -533, 553, 0, 0, 0, 343, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 0, 77, 304, 305, 0, 171, 0, -268, -268, 0, 3, 156, 157, 158, 0, 0, 0, 0, 0, 0, 0, @@ -1695,7 +1695,7 @@ static const short yytable[] = { 118, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 0, 0, 0, 0, 0, 0, 77, 169, 536, 80, 171, 172, 82, 83, 137, 138, 139, 0, - 140, 141, 142, 143, 144, 145, 146, 147, 215, -534, + 140, 141, 142, 143, 144, 145, 146, 147, 215, -533, 627, 0, 0, 0, 343, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 0, 0, 0, 0, 0, 0, 0, -268, -268, 0, 3, 156, 157, 158, 0, @@ -1714,7 +1714,7 @@ static const short yytable[] = { 118, 69, 70, 71, 72, 73, 74, 75, 76, 0, 0, 0, 0, 0, 0, 77, 169, 536, 80, 171, 172, 82, 83, 137, 138, 139, 0, 140, 141, 142, 143, - 144, 145, 146, 147, 215, -534, 639, 0, 0, 0, + 144, 145, 146, 147, 215, -533, 639, 0, 0, 0, 343, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 0, 0, 0, 0, 0, 0, 0, -268, -268, 0, 3, 156, 157, 158, 0, 0, 0, 0, 0, @@ -1733,11 +1733,11 @@ static const short yytable[] = { 118, 73, 74, 75, 76, 0, 0, 0, 0, 0, 0, 77, 169, 536, 80, 171, 172, 82, 83, 137, 138, 139, 0, 140, 141, 142, 143, 144, 145, 146, 147, - 215, -534, 638, 0, 0, 0, 343, 0, 0, 0, + 215, -533, 638, 0, 0, 0, 343, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 156, 157, 158, 0, 137, 138, 139, 0, 140, 141, 142, 143, - 144, 145, 146, 147, 215, -534, 642, 0, 0, 0, + 144, 145, 146, 147, 215, -533, 642, 0, 0, 0, 343, 0, 159, 0, 0, 150, 151, 152, 153, 154, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 156, 157, 158, 0, 0, 161, 162, 163, @@ -1747,12 +1747,12 @@ static const short yytable[] = { 118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 161, 162, 163, 164, 165, 166, 0, 0, 0, 0, 0, 0, 0, 0, 643, 137, 138, 139, 168, - 140, 141, 142, 143, 144, 145, 146, 147, 215, -534, + 140, 141, 142, 143, 144, 145, 146, 147, 215, -533, 695, 0, 0, 0, 343, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 0, 77, 169, 170, 0, 171, 172, 82, 0, 0, 0, 156, 157, 158, 0, 137, 138, 139, 0, 140, 141, 142, 143, 144, 145, - 146, 147, 215, -534, 773, 0, 0, 0, 343, 0, + 146, 147, 215, -533, 773, 0, 0, 0, 343, 0, 159, 0, 0, 150, 151, 152, 153, 154, 155, 0, 77, 169, 170, 0, 171, 172, 82, 0, 0, 0, 156, 157, 158, 0, 0, 161, 162, 163, 164, 165, @@ -1762,12 +1762,12 @@ static const short yytable[] = { 118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 161, 162, 163, 164, 165, 166, 0, 0, 0, 0, 0, 0, 0, 0, 167, 137, 138, 139, 168, 140, 141, - 142, 143, 144, 145, 146, 147, 215, -534, 774, 0, + 142, 143, 144, 145, 146, 147, 215, -533, 774, 0, 0, 0, 343, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 0, 77, 169, 170, 0, 171, 172, 82, 0, 0, 0, 156, 157, 158, 0, 137, 138, 139, 0, 140, 141, 142, 143, 144, 145, 146, 147, - 215, -534, 776, 0, 0, 0, 343, 0, 159, 0, + 215, -533, 776, 0, 0, 0, 343, 0, 159, 0, 0, 150, 151, 152, 153, 154, 155, 0, 77, 169, 170, 0, 171, 172, 82, 0, 0, 0, 156, 157, 158, 0, 0, 161, 162, 163, 164, 165, 166, 0, @@ -1777,11 +1777,11 @@ static const short yytable[] = { 118, 0, 0, 0, 0, 0, 0, 0, 161, 162, 163, 164, 165, 166, 0, 0, 0, 0, 0, 0, 0, 0, 167, 137, 138, 139, 168, 140, 141, 142, 143, - 144, 145, 146, 147, 215, -534, 899, 0, 0, 0, + 144, 145, 146, 147, 215, -533, 899, 0, 0, 0, 343, 0, 0, 0, 0, 150, 151, 152, 153, 154, 155, 0, 77, 169, 170, 0, 171, 172, 82, 0, 0, 0, 156, 157, 158, 0, 137, 138, 139, 0, - 140, 141, 142, 143, 144, 145, 146, 147, 215, -534, + 140, 141, 142, 143, 144, 145, 146, 147, 215, -533, 0, 0, 0, 0, 343, 0, 159, 0, 0, 150, 151, 152, 153, 154, 155, 0, 77, 169, 170, 0, 171, 172, 82, 0, 0, 0, 156, 157, 158, 0, @@ -1798,7 +1798,7 @@ static const short yytable[] = { 118, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -537, 0, 0, 0, 77, 169, 170, 0, 171, 172, + -536, 0, 0, 0, 77, 169, 170, 0, 171, 172, 82, 0, 11, 12, 13, 0, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, @@ -1813,24 +1813,24 @@ static const short yytable[] = { 118, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, - 69, 70, 71, 72, 73, 74, 75, 76, -677, 0, + 69, 70, 71, 72, 73, 74, 75, 76, -676, 0, 0, 0, 0, 0, 0, 0, 131, 80, 0, 0, 0, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -679, -679, -679, 0, 0, 0, 0, + 0, 0, 0, -678, -678, -678, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, -679, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -678, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -679, -679, -679, 0, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - 0, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -679, -679, -679, -679, -679, -679, - -679, -679, -679, -679, -268, 0, 0, 0, 0, 0, - 0, 0, 0, -679, 2, 303, 0, -679, 599, 0, + 0, 0, 0, 0, 0, 0, -678, -678, -678, 0, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + 0, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -678, -678, -678, -678, -678, -678, + -678, -678, -678, -678, -268, 0, 0, 0, 0, 0, + 0, 0, 0, -678, 2, 303, 0, -678, 599, 0, 150, 151, 152, 153, 154, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 156, 157, 158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1884,7 +1884,7 @@ static const short yytable[] = { 118, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 3, 0, 0, 0, 0, 0, 0, 0, 131, 80, 0, 0, 0, 83, 0, 0, 0, 0, 0, 0, - 0, 0, -401, -401, -401, 0, 4, 0, 0, 0, + 0, 0, -400, -400, -400, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1921,8 +1921,8 @@ static const short yytable[] = { 118, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 73, 74, 75, 76, -401, - -401, -401, 0, 0, 0, 0, 0, 131, 80, 0, + 68, 69, 70, 71, 72, 73, 74, 75, 76, -400, + -400, -400, 0, 0, 0, 0, 0, 131, 80, 0, 0, 0, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -3212,7 +3212,8 @@ case 23: exprNode_findValue(yyvsp[-2].expr); if (exprNode_hasValue (yyvsp[-2].expr)) { - yyval.ntyp = idDecl_replaceCtype (yyvsp[-5].ntyp, ctype_makeFixedArray (idDecl_getCtype (yyvsp[-5].ntyp), exprNode_getLongValue (yyvsp[-2].expr))); + yyval.ntyp = idDecl_replaceCtype (yyvsp[-5].ntyp, ctype_makeInnerFixedArray (idDecl_getCtype (yyvsp[-5].ntyp), + exprNode_getLongValue (yyvsp[-2].expr))); } else { @@ -3998,19 +3999,16 @@ case 284: { yyval.typequal = qual_createRegister (); ; break;} case 285: -{ yyval.typequal = qual_createNullTerminated (); ; - break;} -case 286: { yyval.stateclause = yyvsp[-1].stateclause; ; break;} -case 287: +case 286: { context_setProtectVars (); enterParamsTemp (); sRef_setGlobalScopeSafe (); ; break;} -case 288: +case 287: { exitParamsTemp (); sRef_clearGlobalScopeSafe (); @@ -4018,13 +4016,13 @@ case 288: yyval.stateclause = stateClause_createPlain (yyvsp[-5].tok, yyvsp[-2].srset); ; break;} -case 289: +case 288: { yyval.funcclause = yyvsp[-1].funcclause; ; break;} -case 290: +case 289: { yyval.tok = yyvsp[-1].tok; context_enterFunctionHeader (); ; break;} -case 291: +case 290: { context_exitFunctionHeader (); context_setProtectVars (); @@ -4032,7 +4030,7 @@ case 291: sRef_setGlobalScopeSafe (); ; break;} -case 292: +case 291: { exitParamsTemp (); sRef_clearGlobalScopeSafe (); @@ -4040,14 +4038,14 @@ case 292: yyval.funcclause = functionClause_createState (stateClause_create (yyvsp[-5].tok, yyvsp[-4].typequal, yyvsp[-2].srset)); ; break;} -case 293: +case 292: { context_setProtectVars (); enterParamsTemp (); sRef_setGlobalScopeSafe (); ; break;} -case 294: +case 293: { context_exitFunctionHeader (); exitParamsTemp (); @@ -4071,168 +4069,171 @@ case 294: DPRINTF (("FunctionclauseS: %s", functionClause_unparse (yyval.funcclause))); ; break;} -case 295: +case 294: { yyval.fcnconstraint = functionConstraint_createBufferConstraint (yyvsp[0].conL); ; break;} -case 296: +case 295: { yyval.fcnconstraint = functionConstraint_createMetaStateConstraint (yyvsp[0].msconstraint); DPRINTF (("Made constraint: %s", functionConstraint_unparse (yyval.fcnconstraint))); ; break;} -case 297: +case 296: { yyval.typequal = qual_createExits (); ; break;} -case 298: +case 297: { yyval.typequal = qual_createMayExit (); ; break;} -case 299: +case 298: { yyval.typequal = qual_createTrueExit (); ; break;} -case 300: +case 299: { yyval.typequal = qual_createFalseExit (); ; break;} -case 301: +case 300: { yyval.typequal = qual_createNeverExit (); ; break;} -case 302: +case 301: { yyval.typequal = qual_createChecked (); ; break;} -case 303: +case 302: { yyval.typequal = qual_createCheckMod (); ; break;} -case 304: +case 303: { yyval.typequal = qual_createUnchecked (); ; break;} -case 305: +case 304: { yyval.typequal = qual_createCheckedStrict (); ; break;} -case 306: +case 305: { yyval.typequal = qual_createOwned (); ; break;} -case 307: +case 306: { yyval.typequal = qual_createDependent (); ; break;} -case 308: +case 307: { yyval.typequal = qual_createYield (); ; break;} -case 309: +case 308: { yyval.typequal = qual_createTemp (); ; break;} -case 310: +case 309: { yyval.typequal = qual_createOnly (); ; break;} -case 311: +case 310: { yyval.typequal = qual_createKeep (); ; break;} -case 312: +case 311: { yyval.typequal = qual_createKept (); ; break;} -case 313: +case 312: { yyval.typequal = qual_createShared (); ; break;} -case 314: +case 313: { yyval.typequal = qual_createUnique (); ; break;} -case 315: +case 314: { yyval.typequal = qual_createNull (); ; break;} -case 316: +case 315: { yyval.typequal = qual_createIsNull (); ; break;} -case 317: +case 316: { yyval.typequal = qual_createRelNull (); ; break;} -case 318: +case 317: { yyval.typequal = qual_createNotNull (); ; break;} -case 319: +case 318: { yyval.typequal = qual_createExposed (); ; break;} -case 320: +case 319: { yyval.typequal = qual_createObserver (); ; break;} -case 321: +case 320: { yyval.typequal = qual_createNullTerminated (); ; break;} -case 322: +case 321: { yyval.typequal = qual_createMetaState (yyvsp[0].annotation); ; break;} -case 323: +case 322: { yyval.typequal = qual_createReturned (); ; break;} -case 324: +case 323: { yyval.typequal = qual_createSef (); ; break;} -case 325: +case 324: { yyval.typequal = qual_createUnused (); ; break;} -case 326: +case 325: { yyval.typequal = qual_createExternal (); ; break;} -case 327: +case 326: { yyval.typequal = qual_createTrueNull (); ; break;} -case 328: +case 327: { yyval.typequal = qual_createFalseNull (); ; break;} -case 329: +case 328: { yyval.typequal = qual_createAbstract (); ; break;} -case 330: +case 329: { yyval.typequal = qual_createConcrete (); ; break;} -case 331: +case 330: { yyval.typequal = qual_createMutable (); ; break;} -case 332: +case 331: { yyval.typequal = qual_createImmutable (); ; break;} -case 333: +case 332: { yyval.typequal = qual_createRefCounted (); ; break;} -case 334: +case 333: { yyval.typequal = qual_createRefs (); ; break;} -case 335: +case 334: { yyval.typequal = qual_createKillRef (); ; break;} -case 336: +case 335: { yyval.typequal = qual_createRelDef (); ; break;} -case 337: +case 336: { yyval.typequal = qual_createNewRef (); ; break;} -case 338: +case 337: { yyval.typequal = qual_createTempRef (); ; break;} -case 339: +case 338: { yyval.typequal = qual_createShort (); ; break;} -case 340: +case 339: { yyval.typequal = qual_createLong (); ; break;} -case 341: +case 340: { yyval.typequal = qual_createSigned (); ; break;} -case 342: +case 341: { yyval.typequal = qual_createUnsigned (); ; break;} -case 343: +case 342: { yyval.typequal = qual_createOut (); ; break;} -case 344: +case 343: { yyval.typequal = qual_createIn (); ; break;} -case 345: +case 344: { yyval.typequal = qual_createPartial (); ; break;} -case 346: +case 345: { yyval.typequal = qual_createSpecial (); ; break;} -case 347: +case 346: { yyval.typequal = qual_createConst (); ; break;} -case 348: +case 347: { yyval.typequal = qual_createVolatile (); ; break;} +case 348: +{ yyval.typequal = yyvsp[-1].typequal; ; + break;} case 349: { yyval.typequal = yyvsp[-1].typequal; ; break;} @@ -4257,172 +4258,169 @@ case 355: case 356: { yyval.typequal = yyvsp[-1].typequal; ; break;} -case 357: -{ yyval.typequal = yyvsp[-1].typequal; ; - break;} -case 364: +case 363: { yyval.ctyp = ctype_unknown; ; break;} -case 365: +case 364: { yyval.ctyp = ctype_anyintegral; ; break;} -case 366: +case 365: { yyval.ctyp = ctype_unsignedintegral; ; break;} -case 367: +case 366: { yyval.ctyp = ctype_signedintegral; ; break;} -case 371: +case 370: { yyval.ctyp = ctype_fromQual (yyvsp[-1].typequal); ; break;} -case 372: +case 371: { yyval.qtyp = qtype_resolve (yyvsp[-1].qtyp); ; break;} -case 373: +case 372: { yyval.qtyp = yyvsp[0].qtyp; ; break;} -case 374: +case 373: { yyval.qtyp = qtype_mergeAlt (yyvsp[-3].qtyp, yyvsp[-1].qtyp); ; break;} -case 376: +case 375: { yyval.qtyp = qtype_mergeAlt (yyvsp[-2].qtyp, yyvsp[0].qtyp); ; break;} -case 377: +case 376: { yyval.qtyp = qtype_addQual (yyvsp[0].qtyp, yyvsp[-1].typequal); ; break;} -case 378: +case 377: { yyval.qtyp = qtype_addQual (yyvsp[0].qtyp, yyvsp[-1].typequal); ; break;} -case 379: +case 378: { yyval.qtyp = qtype_combine (yyvsp[0].qtyp, yyvsp[-1].ctyp); ; break;} -case 380: +case 379: { yyval.qtyp = qtype_unknown (); ; break;} -case 381: +case 380: { yyval.qtyp = yyvsp[0].qtyp; ; break;} -case 382: +case 381: { yyval.conL = constraintList_undefined; ; break;} -case 383: +case 382: { sRef_setGlobalScopeSafe (); ; break;} -case 384: +case 383: { sRef_clearGlobalScopeSafe (); ; break;} -case 385: +case 384: { {ctype ct; ct = declareStruct (yyvsp[-9].cname, yyvsp[-4].flist); /* setGlobalStructInfo(ct, $12);*/ yyval.ctyp = ct;} ; break;} -case 386: +case 385: { sRef_setGlobalScopeSafe (); ; break;} -case 387: +case 386: { sRef_clearGlobalScopeSafe (); ; break;} -case 388: +case 387: { yyval.ctyp = declareUnion (yyvsp[-8].cname, yyvsp[-3].flist); ; break;} -case 389: +case 388: { yyval.ctyp = declareStruct (yyvsp[-3].cname, uentryList_new ()); ; break;} -case 390: +case 389: { yyval.ctyp = declareUnion (yyvsp[-3].cname, uentryList_new ()); ; break;} -case 391: +case 390: { sRef_setGlobalScopeSafe (); ; break;} -case 392: +case 391: { sRef_clearGlobalScopeSafe (); ; break;} -case 393: +case 392: { yyval.ctyp = declareUnnamedStruct (yyvsp[-3].flist); ; break;} -case 394: +case 393: { sRef_setGlobalScopeSafe (); ; break;} -case 395: +case 394: { sRef_clearGlobalScopeSafe (); ; break;} -case 396: +case 395: { yyval.ctyp = declareUnnamedUnion (yyvsp[-3].flist); ; break;} -case 397: +case 396: { yyval.ctyp = ctype_createUnnamedStruct (uentryList_new ()); ; break;} -case 398: +case 397: { yyval.ctyp = ctype_createUnnamedUnion (uentryList_new ()); ; break;} -case 399: +case 398: { yyval.ctyp = handleStruct (yyvsp[-1].cname); ; break;} -case 400: +case 399: { yyval.ctyp = handleUnion (yyvsp[-1].cname); ; break;} -case 401: +case 400: { g_expectingTypeName = FALSE; ; break;} -case 403: +case 402: { yyval.flist = uentryList_undefined; /* bogus! */ ; break;} -case 404: +case 403: { yyval.flist = uentryList_mergeFields (yyvsp[-1].flist, yyvsp[0].flist); ; break;} -case 405: +case 404: { yyval.flist = fixUentryList (yyvsp[-2].ntyplist, yyvsp[-4].qtyp); ; break;} -case 406: +case 405: { yyval.flist = fixUnnamedDecl (yyvsp[-2].qtyp); ; break;} -case 407: +case 406: { yyval.ntyplist = idDeclList_singleton (yyvsp[-1].ntyp); ; break;} -case 408: +case 407: { yyval.ntyplist = idDeclList_add (yyvsp[-3].ntyplist, yyvsp[-1].ntyp); ; break;} -case 409: +case 408: { yyval.ntyp = yyvsp[0].ntyp; ; break;} -case 410: +case 409: { yyval.ntyp = idDecl_undefined; ; break;} -case 411: +case 410: { yyval.ntyp = yyvsp[-3].ntyp; ; break;} -case 412: +case 411: { yyval.ctyp = declareUnnamedEnum (yyvsp[-2].enumnamelist); ; break;} -case 413: +case 412: { context_pushLoc (); ; break;} -case 414: +case 413: { context_popLoc (); yyval.ctyp = declareEnum (yyvsp[-5].cname, yyvsp[-2].enumnamelist); ; break;} -case 415: +case 414: { yyval.ctyp = handleEnum (yyvsp[-1].cname); ; break;} -case 416: +case 415: { yyval.enumnamelist = enumNameList_single (yyvsp[0].cname); ; break;} -case 417: +case 416: { yyval.enumnamelist = enumNameList_push (yyvsp[-2].enumnamelist, yyvsp[0].cname); ; break;} -case 419: +case 418: { uentry ue = uentry_makeEnumConstant (yyvsp[0].cname, ctype_unknown); usymtab_supGlobalEntry (ue); yyval.cname = yyvsp[0].cname; ; break;} -case 420: +case 419: { uentry ue = uentry_makeEnumInitializedConstant (yyvsp[-3].cname, ctype_unknown, yyvsp[0].expr); usymtab_supGlobalEntry (ue); yyval.cname = yyvsp[-3].cname; ; break;} -case 422: +case 421: { yyval.ntyp = idDecl_create (cstring_undefined, qtype_create (yyvsp[0].ctyp)); ; break;} -case 423: +case 422: { qtype qt = qtype_unknown (); @@ -4430,21 +4428,24 @@ case 423: yyval.ntyp = idDecl_create (cstring_copy (LastIdentifier ()), qt); ; break;} -case 424: +case 423: { yyval.ntyp = yyvsp[0].ntyp; qtype_adjustPointers (yyvsp[-1].count, idDecl_getTyp (yyval.ntyp)); ; break;} -case 426: +case 425: { yyval.ntyp = yyvsp[0].ntyp; qtype_adjustPointers (yyvsp[-1].count, idDecl_getTyp (yyval.ntyp)); ; break;} -case 427: +case 426: { yyval.entrylist = handleParamTypeList (yyvsp[0].entrylist); ; break;} -case 428: +case 427: { yyval.entrylist = handleParamIdList (yyvsp[0].entrylist); ; break;} -case 429: +case 428: { /* ignored for now */; ; break;} +case 429: +{ ; ; + break;} case 430: { ; ; break;} @@ -4452,48 +4453,45 @@ case 431: { ; ; break;} case 432: -{ ; ; +{ yyval.count = 1; ; break;} case 433: { yyval.count = 1; ; break;} case 434: -{ yyval.count = 1; ; - break;} -case 435: { yyval.count = 1 + yyvsp[0].count; ; break;} -case 436: +case 435: { yyval.count = 1 + yyvsp[0].count; ; break;} -case 438: +case 437: { yyval.entrylist = uentryList_add (yyvsp[-2].entrylist, uentry_makeElipsisMarker ()); ; break;} -case 439: +case 438: { yyval.entrylist = uentryList_single (uentry_makeVariableLoc (yyvsp[0].cname, ctype_int)); ; break;} -case 440: +case 439: { yyval.entrylist = uentryList_add (yyvsp[-2].entrylist, uentry_makeVariableLoc (yyvsp[0].cname, ctype_int)); ; break;} -case 441: +case 440: { yyval.entrylist = uentryList_single (uentry_makeElipsisMarker ()); ; break;} -case 443: +case 442: { yyval.entrylist = uentryList_add (yyvsp[-2].entrylist, uentry_makeElipsisMarker ()); ; break;} -case 444: +case 443: { storeLoc (); ; break;} -case 445: +case 444: { yyval.entrylist = uentryList_single (yyvsp[0].oentry); ; break;} -case 446: +case 445: { storeLoc (); ; break;} -case 447: +case 446: { yyval.entrylist = uentryList_add (yyvsp[-3].entrylist, yyvsp[0].oentry); ; break;} -case 448: +case 447: { if (isFlipOldStyle ()) { @@ -4506,7 +4504,7 @@ case 448: yyval.oentry = makeCurrentParam (idDecl_fixParamBase (yyvsp[-1].ntyp, yyvsp[-2].qtyp)); ; break;} -case 449: +case 448: { idDecl tparam = idDecl_create (yyvsp[0].cname, qtype_unknown ()); @@ -4521,304 +4519,304 @@ case 449: idDecl_free (tparam); ; break;} -case 451: +case 450: { yyval.qtyp = qtype_newBase (yyvsp[-1].qtyp, yyvsp[0].ctyp); ; break;} -case 452: +case 451: { yyval.ctyp = ctype_adjustPointers (yyvsp[0].count, ctype_unknown); ; break;} -case 454: +case 453: { yyval.ctyp = ctype_adjustPointers (yyvsp[-1].count, yyvsp[0].ctyp); ; break;} -case 455: +case 454: { yyval.ctyp = ctype_unknown; ; break;} -case 457: +case 456: { yyval.ctyp = ctype_expectFunction (yyvsp[-1].ctyp); ; break;} -case 458: +case 457: { yyval.ctyp = ctype_makeArray (ctype_unknown); ; break;} -case 459: +case 458: { yyval.ctyp = ctype_makeFixedArray (ctype_unknown, exprNode_getLongValue (yyvsp[-1].expr)); ; break;} -case 460: +case 459: { yyval.ctyp = ctype_makeArray (yyvsp[-2].ctyp); ; break;} -case 461: -{ yyval.ctyp = ctype_makeFixedArray (yyvsp[-3].ctyp, exprNode_getLongValue (yyvsp[-1].expr)); ; +case 460: +{ yyval.ctyp = ctype_makeInnerFixedArray (yyvsp[-3].ctyp, exprNode_getLongValue (yyvsp[-1].expr)); ; break;} -case 462: +case 461: { yyval.ctyp = ctype_makeFunction (ctype_unknown, uentryList_makeMissingParams ()); ; break;} -case 463: +case 462: { yyval.ctyp = ctype_makeParamsFunction (ctype_unknown, yyvsp[-1].entrylist); ; break;} -case 464: +case 463: { yyval.ctyp = ctype_makeFunction (yyvsp[-3].ctyp, uentryList_makeMissingParams ()); ; break;} -case 465: +case 464: { yyval.ctyp = ctype_makeParamsFunction (yyvsp[-4].ctyp, yyvsp[-1].entrylist); ; break;} -case 475: +case 474: { yyval.expr = yyvsp[0].expr; ; break;} -case 478: +case 477: { yyval.expr = exprNode_concat (yyvsp[-1].expr, yyvsp[0].expr); ; break;} -case 479: +case 478: { yyval.expr = exprNode_while (yyvsp[-1].expr, yyvsp[0].expr); ; break;} -case 480: +case 479: { yyval.expr = exprNode_doWhile (yyvsp[-5].expr, yyvsp[-2].expr); ; break;} -case 481: +case 480: { yyval.expr = exprNode_doWhile (yyvsp[-4].expr, yyvsp[-1].expr); ; break;} -case 482: +case 481: { yyval.expr = exprNode_for (yyvsp[-1].expr, yyvsp[0].expr); ; break;} -case 483: +case 482: { context_setProtectVars (); ; break;} -case 484: +case 483: { context_sizeofReleaseVars (); ; break;} -case 485: +case 484: { yyval.expr = exprNode_forPred (yyvsp[-7].expr, yyvsp[-5].expr, yyvsp[-2].expr); context_enterForClause (yyvsp[-5].expr); ; break;} -case 486: +case 485: { setProcessingIterVars (yyvsp[-2].entry); ; break;} -case 487: +case 486: { yyval.expr = exprNode_iterStart (yyvsp[-5].entry, yyvsp[-1].exprlist); ; break;} -case 488: +case 487: { yyval.expr = exprNode_createId (yyvsp[0].entry); ; break;} -case 492: +case 491: { yyval.expr = yyvsp[-1].expr; DPRINTF (("def stmt: %s", exprNode_unparse (yyval.expr))); ; break;} -case 500: +case 499: { yyval.expr = yyvsp[-1].expr; ; break;} -case 501: +case 500: { yyval.expr = exprNode_makeError (); ; break;} -case 502: +case 501: { exprNode_checkIfPred (yyvsp[0].expr); ; break;} -case 503: +case 502: { /* don't: context_exitTrueClause ($1, $2); */ yyval.expr = exprNode_if (yyvsp[-2].expr, yyvsp[0].expr); ; break;} -case 504: +case 503: { yyval.expr = exprNode_createTok (yyvsp[0].tok); ; break;} -case 505: +case 504: { yyval.expr = exprNode_createTok (yyvsp[0].tok); ; break;} -case 516: +case 515: { yyval.expr = exprNode_addParens (yyvsp[-2].tok, yyvsp[-1].expr); ; break;} -case 518: +case 517: { yyval.expr = exprNode_makeError (); ; break;} -case 519: +case 518: { yyval.expr = exprNode_labelMarker (yyvsp[-1].cname); ; break;} -case 520: +case 519: { yyval.expr = exprNode_notReached (yyvsp[0].expr); ; break;} -case 521: +case 520: { ; ; break;} -case 522: +case 521: { ; ; break;} -case 523: +case 522: { context_enterCaseClause (yyvsp[0].expr); ; break;} -case 524: +case 523: { yyval.expr = exprNode_caseMarker (yyvsp[-2].expr, FALSE); ; break;} -case 525: +case 524: { context_enterCaseClause (yyvsp[0].expr); ; break;} -case 526: +case 525: { yyval.expr = exprNode_caseMarker (yyvsp[-2].expr, TRUE); ; break;} -case 527: +case 526: { context_enterCaseClause (exprNode_undefined); ; break;} -case 528: +case 527: { yyval.expr = exprNode_defaultMarker (yyvsp[-2].tok, FALSE); ; break;} -case 529: +case 528: { context_enterCaseClause (exprNode_undefined); ; break;} -case 530: +case 529: { yyval.expr = exprNode_defaultMarker (yyvsp[-2].tok, TRUE); ; break;} -case 531: +case 530: { yyval.expr = yyvsp[-1].expr; ; break;} -case 532: +case 531: { yyval.expr = yyvsp[0].expr; context_exitInner (yyvsp[0].expr); ; break;} -case 533: +case 532: { yyval.expr = yyvsp[-1].expr; ; break;} -case 534: +case 533: { context_enterInnerContext (); ; break;} -case 535: +case 534: { context_exitInnerPlain (); ; break;} -case 536: +case 535: { context_enterStructInnerContext (); ; break;} -case 537: +case 536: { context_exitStructInnerContext (); ; break;} -case 538: +case 537: { context_exitInnerSafe (); ; break;} -case 539: +case 538: { yyval.expr = exprNode_createTok (yyvsp[0].tok); ; break;} -case 540: +case 539: { yyval.expr = exprNode_notReached (exprNode_createTok (yyvsp[0].tok)); ; break;} -case 541: +case 540: { yyval.expr = exprNode_updateLocation (yyvsp[-1].expr, lltok_getLoc (yyvsp[0].tok)); ; break;} -case 542: +case 541: { yyval.expr = exprNode_notReached (exprNode_updateLocation (yyvsp[-2].expr, lltok_getLoc (yyvsp[0].tok))); ; break;} -case 543: +case 542: { yyval.expr = exprNode_updateLocation (yyvsp[-1].expr, lltok_getLoc (yyvsp[0].tok)); ; break;} -case 544: +case 543: { yyval.expr = exprNode_notReached (exprNode_updateLocation (yyvsp[-2].expr, lltok_getLoc (yyvsp[0].tok))); ; break;} -case 545: +case 544: { yyval.expr = exprNode_updateLocation (exprNode_concat (yyvsp[-2].expr, yyvsp[-1].expr), lltok_getLoc (yyvsp[0].tok)); ; break;} -case 546: +case 545: { yyval.expr = exprNode_notReached (exprNode_updateLocation (exprNode_concat (yyvsp[-3].expr, yyvsp[-2].expr), lltok_getLoc (yyvsp[-1].tok))); ; break;} -case 547: +case 546: { yyval.expr = exprNode_makeBlock (yyvsp[0].expr); ; break;} -case 548: +case 547: { yyval.expr = exprNode_createTok (yyvsp[0].tok); ; break;} -case 549: +case 548: { yyval.expr = exprNode_updateLocation (yyvsp[-1].expr, lltok_getLoc (yyvsp[0].tok)); ; break;} -case 550: +case 549: { yyval.expr = exprNode_updateLocation (yyvsp[-1].expr, lltok_getLoc (yyvsp[0].tok)); ; break;} -case 551: +case 550: { yyval.expr = exprNode_updateLocation (exprNode_concat (yyvsp[-2].expr, yyvsp[-1].expr), lltok_getLoc (yyvsp[0].tok)); ; break;} -case 553: +case 552: { yyval.expr = exprNode_concat (yyvsp[-1].expr, yyvsp[0].expr); ; break;} -case 554: +case 553: { yyval.expr = yyvsp[0].expr; ; break;} -case 555: +case 554: { yyval.expr = exprNode_concat (yyvsp[-1].expr, yyvsp[0].expr); ; break;} -case 556: +case 555: { yyval.expr = yyvsp[0].expr; ; break;} -case 557: +case 556: { yyval.expr = exprNode_concat (yyvsp[-1].expr, yyvsp[0].expr); ; break;} -case 558: +case 557: { yyval.expr = exprNode_createTok (yyvsp[0].tok); ; break;} -case 559: +case 558: { yyval.expr = exprNode_statement (yyvsp[-1].expr, yyvsp[0].tok); ; break;} -case 560: +case 559: { yyval.expr = exprNode_createTok (yyvsp[0].tok); ; break;} -case 561: +case 560: { yyval.expr = exprNode_statement (yyvsp[-1].expr, yyvsp[0].tok); ; break;} -case 562: +case 561: { yyval.expr = exprNode_checkExpr (yyvsp[0].expr); ; break;} -case 563: +case 562: { exprNode_produceGuards (yyvsp[-1].expr); context_enterTrueClause (yyvsp[-1].expr); exprNode_checkIfPred (yyvsp[-1].expr); yyval.expr = yyvsp[-1].expr; ; break;} -case 564: +case 563: { context_exitTrueClause (yyvsp[-1].expr, yyvsp[0].expr); yyval.expr = exprNode_if (yyvsp[-1].expr, yyvsp[0].expr); ; break;} -case 565: +case 564: { context_enterFalseClause (yyvsp[-2].expr); ; break;} -case 566: +case 565: { context_exitClause (yyvsp[-4].expr, yyvsp[-3].expr, yyvsp[0].expr); yyval.expr = exprNode_ifelse (yyvsp[-4].expr, yyvsp[-3].expr, yyvsp[0].expr); ; break;} -case 567: +case 566: { context_enterSwitch (yyvsp[0].expr); ; break;} -case 568: +case 567: { yyval.expr = exprNode_switch (yyvsp[-3].expr, yyvsp[0].expr); ; break;} -case 569: +case 568: { yyval.expr = exprNode_whilePred (yyvsp[-1].expr); context_enterWhileClause (yyvsp[-1].expr); ; break;} -case 570: +case 569: { yyval.expr = exprNode_whilePred(yyvsp[-1].expr); ; break;} -case 571: +case 570: { context_enterIterClause (); ; break;} -case 572: +case 571: { setProcessingIterVars (yyvsp[-3].entry); ; break;} -case 573: +case 572: { yyval.expr = exprNode_iter (yyvsp[-9].entry, yyvsp[-4].exprlist, yyvsp[-2].expr, yyvsp[-1].entry); ; break;} -case 574: +case 573: { yyval.exprlist = exprNodeList_singleton (yyvsp[0].expr); ; break;} -case 575: +case 574: { nextIterParam (); ; break;} -case 576: +case 575: { yyval.exprlist = exprNodeList_push (yyvsp[-3].exprlist, yyvsp[0].expr); ; break;} -case 577: +case 576: { yyval.expr = exprNode_iterExpr (yyvsp[0].expr); ; break;} -case 578: +case 577: { yyval.expr = exprNode_iterId (yyvsp[0].entry); ; break;} -case 579: +case 578: { uentry ue = coerceIterId (yyvsp[0].cname); if (uentry_isValid (ue)) @@ -4831,39 +4829,42 @@ case 579: } ; break;} -case 580: +case 579: { yyval.expr = exprNode_iterNewId (yyvsp[0].cname); ; break;} -case 582: +case 581: { yyval.expr = exprNode_combineLiterals (yyvsp[-1].expr, yyvsp[0].expr); ; break;} -case 584: +case 583: { yyval.expr = exprNode_addParens (yyvsp[-2].tok, yyvsp[-1].expr); ; break;} -case 586: +case 585: { yyval.expr = exprNode_arrayFetch (yyvsp[-3].expr, yyvsp[-1].expr); ; break;} -case 587: +case 586: { yyval.expr = exprNode_functionCall (yyvsp[-2].expr, exprNodeList_new ()); ; break;} -case 588: +case 587: { yyval.expr = exprNode_functionCall (yyvsp[-3].expr, yyvsp[-1].exprlist); ; break;} -case 589: +case 588: { yyval.expr = exprNode_vaArg (yyvsp[-5].tok, yyvsp[-3].expr, yyvsp[-1].qtyp); ; break;} -case 590: +case 589: { yyval.expr = exprNode_fieldAccess (yyvsp[-4].expr, yyvsp[-2].tok, yyvsp[-1].cname); ; break;} -case 591: +case 590: { yyval.expr = exprNode_arrowAccess (yyvsp[-4].expr, yyvsp[-2].tok, yyvsp[-1].cname); ; break;} -case 592: +case 591: { yyval.expr = exprNode_postOp (yyvsp[-1].expr, yyvsp[0].tok); ; break;} -case 593: +case 592: { yyval.expr = exprNode_postOp (yyvsp[-1].expr, yyvsp[0].tok); ; break;} +case 594: +{ yyval.expr = exprNode_preOp (yyvsp[0].expr, yyvsp[-1].tok); ; + break;} case 595: { yyval.expr = exprNode_preOp (yyvsp[0].expr, yyvsp[-1].tok); ; break;} @@ -4886,33 +4887,33 @@ case 601: { yyval.expr = exprNode_preOp (yyvsp[0].expr, yyvsp[-1].tok); ; break;} case 602: -{ yyval.expr = exprNode_preOp (yyvsp[0].expr, yyvsp[-1].tok); ; - break;} -case 603: { yyval.expr = yyvsp[0].expr; ; break;} -case 605: +case 604: { yyval.expr = exprNode_cast (yyvsp[-3].tok, yyvsp[0].expr, yyvsp[-2].qtyp); ; break;} +case 606: +{ yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; + break;} case 607: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} case 608: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} -case 609: +case 610: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} case 611: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} -case 612: +case 613: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} case 614: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} -case 615: +case 616: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} case 617: @@ -4924,39 +4925,39 @@ case 618: case 619: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} -case 620: +case 621: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} case 622: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} -case 623: -{ yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; - break;} -case 625: +case 624: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} -case 627: +case 626: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} -case 629: +case 628: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} -case 631: +case 630: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} -case 633: +case 632: { yyval.expr = exprNode_op (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} -case 635: +case 634: { context_enterTrueClause (yyvsp[-1].expr); ; break;} -case 636: +case 635: { context_enterFalseClause (yyvsp[-4].expr); ; break;} -case 637: +case 636: { yyval.expr = exprNode_cond (yyvsp[-6].expr, yyvsp[-3].expr, yyvsp[0].expr); ; break;} +case 638: +{ yyval.expr = exprNode_assign (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; + break;} case 639: { yyval.expr = exprNode_assign (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} @@ -4988,71 +4989,71 @@ case 648: { yyval.expr = exprNode_assign (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; break;} case 649: -{ yyval.expr = exprNode_assign (yyvsp[-2].expr, yyvsp[0].expr, yyvsp[-1].tok); ; - break;} -case 650: { yyval.entry = yyvsp[0].entry; ; break;} -case 651: +case 650: { yyval.entry = uentry_undefined; ; break;} -case 652: +case 651: { context_enterDoWhileClause (); yyval.tok = yyvsp[0].tok; ; break;} -case 653: +case 652: { yyval.expr = exprNode_while (yyvsp[-1].expr, yyvsp[0].expr); context_exitWhileClause (yyvsp[-1].expr, yyvsp[0].expr); ; break;} -case 654: +case 653: { yyval.expr = exprNode_statement (exprNode_doWhile (yyvsp[-5].expr, yyvsp[-2].expr), yyvsp[0].tok); ; break;} -case 655: +case 654: { yyval.expr = exprNode_for (yyvsp[-1].expr, yyvsp[0].expr); context_exitForClause (yyvsp[-1].expr, yyvsp[0].expr); ; break;} -case 656: +case 655: { yyval.expr = exprNode_while (yyvsp[-1].expr, yyvsp[0].expr); context_exitWhileClause (yyvsp[-1].expr, yyvsp[0].expr); ; break;} -case 657: +case 656: { yyval.expr = exprNode_statement (exprNode_doWhile (yyvsp[-5].expr, yyvsp[-2].expr), yyvsp[0].tok); ; break;} -case 658: +case 657: { yyval.expr = exprNode_doWhile (yyvsp[-4].expr, yyvsp[-1].expr); ; break;} -case 659: +case 658: { yyval.expr = exprNode_for (yyvsp[-1].expr, yyvsp[0].expr); context_exitForClause (yyvsp[-1].expr, yyvsp[0].expr); ; break;} -case 660: +case 659: { yyval.expr = exprNode_goto (yyvsp[-1].cname); ; break;} -case 661: +case 660: { yyval.expr = exprNode_continue (yyvsp[-1].tok, BADTOK); ; break;} -case 662: +case 661: { yyval.expr = exprNode_continue (yyvsp[-2].tok, QINNERCONTINUE); ; break;} -case 663: +case 662: { yyval.expr = exprNode_break (yyvsp[-1].tok, BADTOK); ; break;} -case 664: +case 663: { yyval.expr = exprNode_break (yyvsp[-1].tok, QSWITCHBREAK); ; break;} -case 665: +case 664: { yyval.expr = exprNode_break (yyvsp[-1].tok, QLOOPBREAK); ; break;} -case 666: +case 665: { yyval.expr = exprNode_break (yyvsp[-1].tok, QINNERBREAK); ; break;} -case 667: +case 666: { yyval.expr = exprNode_break (yyvsp[-1].tok, QSAFEBREAK); ; break;} -case 668: +case 667: { yyval.expr = exprNode_nullReturn (yyvsp[-1].tok); ; break;} -case 669: +case 668: { yyval.expr = exprNode_return (yyvsp[-1].expr); ; break;} -case 671: +case 670: { ; ; break;} +case 673: +{ yyval.cname = uentry_getName (yyvsp[0].entry); ; + break;} case 674: { yyval.cname = uentry_getName (yyvsp[0].entry); ; break;} @@ -5060,12 +5061,9 @@ case 675: { yyval.cname = uentry_getName (yyvsp[0].entry); ; break;} case 676: -{ yyval.cname = uentry_getName (yyvsp[0].entry); ; - break;} -case 677: { yyval.cname = yyvsp[0].cname; ; break;} -case 679: +case 678: { yyval.ctyp = ctype_unknown; ; break;} } diff --git a/src/cgrammar.y b/src/cgrammar.y index b9e2fd2..a9a4246 100644 --- a/src/cgrammar.y +++ b/src/cgrammar.y @@ -196,7 +196,6 @@ extern void yyerror (char *); %token CGCHAR CBOOL CINT CGFLOAT CDOUBLE CVOID %token QANYTYPE QINTEGRALTYPE QUNSIGNEDINTEGRALTYPE QSIGNEDINTEGRALTYPE -%type nullterminatedQualifier %token QNULLTERMINATED %token QSETBUFFERSIZE %token QSETSTRINGLENGTH @@ -377,7 +376,8 @@ namedDeclBase exprNode_findValue($4); if (exprNode_hasValue ($4)) { - $$ = idDecl_replaceCtype ($1, ctype_makeFixedArray (idDecl_getCtype ($1), exprNode_getLongValue ($4))); + $$ = idDecl_replaceCtype ($1, ctype_makeInnerFixedArray (idDecl_getCtype ($1), + exprNode_getLongValue ($4))); } else { @@ -1037,9 +1037,6 @@ storageSpecifier | QAUTO { $$ = qual_createAuto (); } | QREGISTER { $$ = qual_createRegister (); } -nullterminatedQualifier: - QNULLTERMINATED IsType { $$ = qual_createNullTerminated (); } - stateClause : stateClausePlain QENDMACRO { $$ = $1; } @@ -1435,7 +1432,7 @@ abstractDeclBase { $$ = ctype_makeFixedArray (ctype_unknown, exprNode_getLongValue ($2)); } | abstractDeclBase TLSQBR TRSQBR { $$ = ctype_makeArray ($1); } | abstractDeclBase TLSQBR constantExpr TRSQBR - { $$ = ctype_makeFixedArray ($1, exprNode_getLongValue ($3)); } + { $$ = ctype_makeInnerFixedArray ($1, exprNode_getLongValue ($3)); } | IsType TLPAREN TRPAREN { $$ = ctype_makeFunction (ctype_unknown, uentryList_makeMissingParams ()); } | IsType TLPAREN paramTypeList TRPAREN diff --git a/src/ctbase.i b/src/ctbase.i index 3eaa780..fcff872 100644 --- a/src/ctbase.i +++ b/src/ctbase.i @@ -492,7 +492,8 @@ ctbase_unparse (ctbase c) return (message ("%t *", c->contents.base)); } case CT_FIXEDARRAY: - return (message ("%t [%d]", c->contents.farray->base, + return (message ("%t [%d]", + c->contents.farray->base, (int) c->contents.farray->size)); case CT_ARRAY: return (message ("%t []", c->contents.base)); diff --git a/src/ctype.c b/src/ctype.c index c4cae38..d09d4fe 100644 --- a/src/ctype.c +++ b/src/ctype.c @@ -317,7 +317,29 @@ ctype_makePointer (ctype c) ctype ctype_makeFixedArray (ctype c, long size) { - return (cttable_addDerived (CTK_ARRAY, ctbase_makeFixedArray (c, size), c)); + ctype res; + res = cttable_addDerived (CTK_ARRAY, ctbase_makeFixedArray (c, size), c); + return res; +} + +ctype ctype_makeInnerFixedArray (ctype c, long size) +{ + ctype res; + + if (ctype_isFixedArray (c)) + { + ctype cb = ctype_baseArrayPtr (c); + long osize = ctype_getArraySize (c); + + res = ctype_makeFixedArray (ctype_makeInnerFixedArray (cb, size), + osize); + } + else + { + res = ctype_makeFixedArray (c, size); + } + + return res; } ctype diff --git a/src/exprNode.c b/src/exprNode.c index ebac5a1..d6820dd 100644 --- a/src/exprNode.c +++ b/src/exprNode.c @@ -8095,7 +8095,7 @@ static bool exprNode_checkOneInit (/*@notnull@*/ exprNode el, exprNode val) if (exprNode_isDefined (val) && val->kind == XPR_INITBLOCK) { exprNodeList vals = exprData_getArgs (val->edata); - + DPRINTF (("Check one init: %s", exprNodeList_unparse (vals))); DPRINTF (("Type: %s", ctype_unparse (t1))); @@ -8108,6 +8108,9 @@ static bool exprNode_checkOneInit (/*@notnull@*/ exprNode el, exprNode val) { int nelements = long_toInt (ctype_getArraySize (t1)); + DPRINTF (("Checked array: %s / %d", + ctype_unparse (t1), nelements)); + if (exprNode_isStringLiteral (val)) { exprNode_checkStringLiteralLength (t1, val); diff --git a/src/idDecl.c b/src/idDecl.c index 170c5b9..f6d7310 100644 --- a/src/idDecl.c +++ b/src/idDecl.c @@ -175,6 +175,7 @@ idDecl_replaceCtype (/*@returned@*/ idDecl d, ctype c) { llassert (idDecl_isDefined (d)); + DPRINTF (("Replace type: %s / %s", idDecl_unparse (d), ctype_unparse (c))); qtype_setType (d->typ, c); return d; } diff --git a/test/Makefile.am b/test/Makefile.am index 9e17fc4..05e68a0 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -37,7 +37,7 @@ SPLINTRNEST = $(SPLINTRNNEST) -exportlocal +debugfcnconstraint UNITTESTS = \ help \ abstptr abstract alias alttypes ansireserved argorder \ - args blocks break cases cast charlit clauses commentchar compdestroy \ + args arraydims blocks break cases cast charlit clauses commentchar compdestroy \ constannot controldepth csyntax czechnames czechoslovaknames deadparam \ decl enum exports external fields flags forbody format freearray \ funcpointer functionmacro glob globals impabstract info init inparam internal iter keep libs \ @@ -216,6 +216,11 @@ argorder: args: -$(SPLINTR) args -noeffect -expect 12 +.PHONY: arraydims +arraydims: + -$(SPLINTR) arraydims.c -varuse -expect 2 + -$(SPLINTR) arraydims.c -initsize -varuse + .PHONY: blocks blocks: -$(SPLINTR) blocks.c -expect 4 diff --git a/test/Makefile.in b/test/Makefile.in index 2431dbc..d937a32 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -114,7 +114,7 @@ SPLINTRNEST = $(SPLINTRNNEST) -exportlocal +debugfcnconstraint UNITTESTS = \ help \ abstptr abstract alias alttypes ansireserved argorder \ - args blocks break cases cast charlit clauses commentchar compdestroy \ + args arraydims blocks break cases cast charlit clauses commentchar compdestroy \ constannot controldepth csyntax czechnames czechoslovaknames deadparam \ decl enum exports external fields flags forbody format freearray \ funcpointer functionmacro glob globals impabstract info init inparam internal iter keep libs \ @@ -1028,6 +1028,11 @@ argorder: args: -$(SPLINTR) args -noeffect -expect 12 +.PHONY: arraydims +arraydims: + -$(SPLINTR) arraydims.c -varuse -expect 2 + -$(SPLINTR) arraydims.c -initsize -varuse + .PHONY: blocks blocks: -$(SPLINTR) blocks.c -expect 4 diff --git a/test/arraydims.c b/test/arraydims.c new file mode 100644 index 0000000..596c882 --- /dev/null +++ b/test/arraydims.c @@ -0,0 +1,13 @@ +static int daytab[2][13] = { + {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, + {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 52 } /* error */ +}; + +static int daytab2[3][2][13] = { + { {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, + {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 52 } }, /* error */ + { {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, + {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } } , + { {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, + {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } } +}; diff --git a/test/arraydims.expect b/test/arraydims.expect new file mode 100644 index 0000000..41bd50a --- /dev/null +++ b/test/arraydims.expect @@ -0,0 +1,9 @@ + +arraydims.c:3:3: Initializer block for daytab[1] has 14 elements, but declared + as int [13]: 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 52 +arraydims.c:8:5: Initializer block for daytab2[0][1] has 14 elements, but + declared as int [13]: 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 52 + +Finished checking --- 2 code warnings, as expected + +Finished checking --- no warnings