diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-29 13:10:13 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-29 13:10:13 +0000 |
commit | 1fef821214bcc2300fd2346c05cffb1b800104c5 (patch) | |
tree | 48d8bbb88aebabd591df1a6a878e067b90259d66 /crawl-ref/source/prebuilt | |
parent | 86963da1ad6736cb71ae9a46b5bb48b60be6b847 (diff) | |
download | crawl-ref-1fef821214bcc2300fd2346c05cffb1b800104c5.tar.gz crawl-ref-1fef821214bcc2300fd2346c05cffb1b800104c5.zip |
Update canned level-compiler.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1946 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/prebuilt')
-rw-r--r-- | crawl-ref/source/prebuilt/levcomp.lex.cc | 1229 | ||||
-rw-r--r-- | crawl-ref/source/prebuilt/levcomp.tab.cc | 506 | ||||
-rw-r--r-- | crawl-ref/source/prebuilt/levcomp.tab.h | 36 |
3 files changed, 907 insertions, 864 deletions
diff --git a/crawl-ref/source/prebuilt/levcomp.lex.cc b/crawl-ref/source/prebuilt/levcomp.lex.cc index dcf0ac96b5..b31bcfdf40 100644 --- a/crawl-ref/source/prebuilt/levcomp.lex.cc +++ b/crawl-ref/source/prebuilt/levcomp.lex.cc @@ -377,8 +377,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 60 -#define YY_END_OF_BUFFER 61 +#define YY_NUM_RULES 61 +#define YY_END_OF_BUFFER 62 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -386,27 +386,27 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[756] = +static yyconst flex_int16_t yy_accept[779] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 61, 59, - 57, 58, 59, 55, 56, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 59, 59, 59, 57, 29, - 31, 59, 59, 59, 59, 59, 59, 60, 6, 60, - 60, 4, 2, 3, 60, 2, 2, 2, 2, 9, - 10, 60, 9, 9, 60, 12, 60, 59, 26, 59, - 55, 56, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 59, 59, 59, 29, 31, 59, 59, 59, - 59, 59, 59, 59, 24, 21, 24, 23, 56, 59, - - 59, 59, 59, 59, 59, 59, 59, 59, 59, 59, - 59, 59, 24, 29, 31, 59, 59, 59, 59, 59, - 59, 14, 15, 59, 13, 13, 13, 13, 13, 13, + 0, 0, 0, 0, 0, 0, 0, 0, 62, 60, + 58, 59, 60, 56, 57, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 58, 29, + 31, 60, 60, 60, 60, 60, 60, 61, 6, 61, + 61, 4, 2, 3, 61, 2, 2, 2, 2, 9, + 10, 61, 9, 9, 61, 12, 61, 60, 26, 60, + 56, 57, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 60, 60, 29, 31, 60, 60, 60, + 60, 60, 60, 60, 24, 21, 24, 23, 57, 60, + + 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 24, 29, 31, 60, 60, 60, 60, 60, + 60, 14, 15, 60, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, - 13, 13, 13, 13, 13, 17, 19, 20, 60, 18, - 60, 60, 57, 58, 56, 0, 0, 0, 0, 0, + 13, 13, 13, 13, 13, 17, 19, 20, 61, 18, + 61, 61, 58, 59, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 57, 29, 31, 0, 0, 0, 0, + 0, 0, 0, 58, 29, 31, 0, 0, 0, 0, 29, 0, 0, 0, 0, 0, 0, 0, 34, 6, 5, 0, 0, 2, 3, 2, 0, 2, 2, 2, @@ -414,7 +414,7 @@ static yyconst flex_int16_t yy_accept[756] = 25, 0, 26, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 29, 25, 25, 25, 25, 25, 25, - 25, 25, 0, 24, 21, 24, 21, 56, 0, 0, + 25, 25, 0, 24, 21, 24, 21, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24, 29, 0, 0, 0, 0, 0, 0, 0, 34, 14, 15, 0, 15, @@ -425,52 +425,54 @@ static yyconst flex_int16_t yy_accept[756] = 19, 20, 0, 0, 28, 0, 0, 27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 9, 9, 9, 7, 25, 25, 25, + 0, 0, 0, 2, 9, 9, 9, 7, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 22, 22, 22, 22, 22, 22, 22, 22, 22, + 25, 25, 25, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, + 22, 22, 22, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 0, 0, 0, 0, 0, 0, + 13, 13, 13, 13, 13, 13, 13, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, - 9, 8, 9, 7, 25, 25, 25, 25, 25, 25, + 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, + 0, 0, 0, 0, 2, 9, 8, 9, 7, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 0, 0, 25, 25, 25, 25, 22, 22, + 25, 25, 25, 25, 25, 25, 25, 25, 0, 0, + 25, 25, 25, 25, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, - 22, 22, 22, 22, 22, 22, 0, 0, 22, 22, - 22, 22, 13, 13, 13, 13, 13, 13, 13, 13, + 22, 22, 22, 0, 0, 22, 22, 22, 22, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 0, 0, 0, 49, 0, 0, 0, - 0, 48, 37, 0, 0, 0, 0, 0, 45, 0, - 0, 33, 0, 0, 0, 0, 2, 25, 25, 25, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 0, 0, 0, 50, 0, 0, 0, 0, 49, + 37, 0, 0, 0, 0, 0, 46, 0, 0, 0, + 33, 0, 0, 0, 0, 2, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 0, 25, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, - 22, 0, 22, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 0, - 39, 44, 52, 53, 54, 0, 0, 0, 41, 0, - 46, 0, 0, 0, 0, 36, 1, 25, 25, 25, + 22, 22, 0, 22, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 0, 39, 45, 53, 54, 55, 0, 0, 0, + 41, 0, 47, 0, 0, 0, 0, 0, 36, 1, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 22, 22, 22, 22, 22, 22, + 25, 25, 25, 25, 25, 25, 25, 25, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, - 22, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 42, 50, 47, 40, 0, 43, 0, 0, 0, 1, - 25, 25, 25, 25, 25, 25, 25, 25, 25, 22, - 22, 22, 22, 22, 22, 22, 22, 22, 13, 13, - - 13, 13, 51, 0, 0, 0, 0, 25, 25, 0, - 25, 25, 22, 22, 0, 22, 22, 13, 13, 0, - 32, 0, 0, 25, 25, 0, 25, 22, 22, 0, - 22, 13, 0, 35, 25, 25, 22, 22, 13, 0, - 25, 22, 13, 0, 25, 22, 13, 0, 25, 22, - 13, 38, 25, 22, 0 + 22, 22, 22, 22, 22, 22, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 43, 51, 48, 40, + 0, 44, 0, 0, 0, 0, 1, 25, 25, 25, + + 25, 25, 25, 25, 25, 25, 25, 22, 22, 22, + 22, 22, 22, 22, 22, 22, 22, 13, 13, 13, + 13, 13, 52, 42, 0, 0, 0, 0, 25, 25, + 25, 0, 25, 25, 22, 22, 22, 0, 22, 22, + 13, 13, 0, 32, 0, 0, 25, 25, 0, 25, + 22, 22, 0, 22, 13, 0, 35, 25, 25, 22, + 22, 13, 0, 25, 22, 13, 0, 25, 22, 13, + 0, 25, 22, 13, 38, 25, 22, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -514,190 +516,198 @@ static yyconst flex_int32_t yy_meta[49] = 6, 6, 6, 6, 6, 6, 1, 1 } ; -static yyconst flex_int16_t yy_base[780] = +static yyconst flex_int16_t yy_base[803] = { 0, 0, 34, 80, 85, 89, 91, 7, 14, 138, 172, - 219, 253, 301, 348, 94, 100, 103, 106, 1976, 1977, - 10, 1977, 1972, 1977, 1965, 1955, 1957, 1949, 1941, 92, - 99, 101, 1942, 1946, 2, 1956, 1951, 1930, 394, 0, - 1977, 102, 1919, 1921, 93, 84, 1915, 1977, 1977, 1958, - 117, 1977, 0, 1977, 1957, 357, 0, 1935, 103, 1910, - 1977, 1954, 82, 1908, 1952, 1977, 1951, 151, 1977, 1950, + 219, 253, 301, 348, 94, 100, 103, 106, 2030, 2031, + 10, 2031, 2026, 2031, 2019, 2009, 2011, 2003, 1995, 92, + 99, 101, 1996, 2000, 2, 2010, 2005, 1984, 394, 0, + 2031, 102, 1973, 1975, 93, 84, 1969, 2031, 2031, 2012, + 117, 2031, 0, 2031, 2011, 357, 0, 1989, 103, 1964, + 2031, 2008, 82, 1962, 2006, 2031, 2005, 151, 2031, 2004, 166, 225, 361, 365, 370, 379, 401, 405, 410, 421, 427, 432, 440, 450, 454, 247, 459, 465, 469, 473, - 477, 483, 489, 0, 493, 1977, 499, 1977, 1943, 1933, - - 1935, 1927, 1919, 374, 133, 103, 1920, 1924, 130, 1934, - 1929, 1908, 503, 23, 0, 214, 1897, 1899, 333, 322, - 1893, 507, 1977, 1936, 0, 1929, 1919, 1921, 1913, 1905, - 503, 353, 122, 1906, 1910, 355, 1920, 1915, 1894, 525, - 357, 1883, 1885, 375, 353, 121, 529, 1977, 1923, 1977, - 425, 481, 417, 1977, 1916, 1913, 1894, 1905, 1900, 1899, - 1875, 1878, 1875, 1872, 1869, 1861, 1871, 1873, 1848, 1861, - 1850, 1847, 1819, 0, 0, 1977, 1809, 1811, 378, 1795, - 0, 210, 1750, 1747, 1770, 404, 1741, 1733, 1977, 1977, - 1977, 1773, 520, 0, 1977, 0, 1772, 534, 1760, 1749, - - 502, 1724, 1723, 1977, 198, 1722, 538, 1764, 1977, 1977, - 542, 546, 1977, 550, 556, 561, 566, 570, 574, 578, + 477, 483, 489, 0, 493, 2031, 499, 2031, 1997, 1987, + + 1989, 1981, 1973, 374, 133, 103, 1974, 1978, 130, 1988, + 1983, 1962, 503, 23, 0, 214, 1951, 1953, 333, 322, + 1947, 507, 2031, 1990, 0, 1983, 1973, 1975, 1967, 1959, + 503, 353, 122, 1960, 1964, 355, 1974, 1966, 1942, 525, + 357, 1931, 1933, 375, 353, 121, 529, 2031, 1962, 2031, + 425, 481, 417, 2031, 1955, 1952, 1931, 1942, 1937, 1936, + 1916, 1914, 1907, 1904, 1904, 1886, 1896, 1903, 1873, 1830, + 1824, 424, 1804, 0, 0, 2031, 1794, 1796, 378, 1789, + 0, 210, 1802, 1797, 1815, 404, 1781, 1771, 2031, 2031, + 2031, 1811, 520, 0, 2031, 0, 1797, 534, 1774, 1763, + + 502, 1738, 1719, 2031, 198, 1709, 538, 1742, 2031, 2031, + 542, 546, 2031, 550, 556, 561, 566, 570, 574, 578, 586, 590, 594, 598, 604, 608, 618, 626, 631, 635, - 640, 644, 649, 653, 658, 662, 666, 670, 674, 684, - 688, 694, 441, 700, 1977, 704, 1977, 709, 551, 579, - 614, 599, 710, 636, 708, 689, 645, 717, 719, 724, - 725, 726, 732, 733, 740, 746, 0, 750, 758, 756, - 760, 762, 764, 766, 770, 772, 776, 1977, 1763, 1977, - 0, 1745, 1732, 1709, 1715, 1707, 1705, 1687, 1676, 1670, - 1669, 1663, 1654, 1661, 1645, 1620, 1602, 1592, 1589, 1566, - - 0, 325, 1567, 1557, 1577, 437, 1545, 1536, 781, 786, - 794, 1977, 1573, 436, 1977, 798, 806, 1977, 1535, 1524, - 1530, 1523, 1521, 1513, 1495, 1494, 1483, 1490, 1492, 1485, - 1481, 1473, 1436, 1430, 1435, 1408, 810, 788, 1390, 1397, - 1362, 1359, 1365, 814, 818, 822, 1977, 824, 829, 835, - 840, 845, 849, 855, 863, 867, 871, 876, 885, 889, - 894, 899, 903, 907, 911, 915, 921, 928, 932, 936, - 941, 841, 945, 937, 946, 880, 947, 872, 951, 955, - 957, 967, 971, 975, 983, 987, 988, 989, 994, 1001, - 1000, 1005, 1011, 1006, 1018, 1019, 1023, 1024, 1025, 1030, - - 1356, 1347, 1355, 1345, 1344, 1339, 1324, 1322, 1314, 1323, - 1322, 1315, 1313, 1306, 1289, 1281, 1286, 1265, 1034, 1036, - 1258, 1259, 1246, 1239, 1262, 1253, 1239, 1239, 1218, 1214, - 1207, 1213, 1210, 1204, 1182, 1181, 1189, 1179, 1162, 1170, - 1157, 1121, 1041, 1977, 1046, 1115, 1112, 1122, 1047, 1140, - 1053, 1977, 1057, 1977, 1064, 1069, 1074, 1080, 1084, 1093, - 1102, 1106, 1110, 1121, 1130, 1135, 1139, 1144, 1148, 1159, - 1163, 1168, 1180, 1174, 1184, 1188, 1192, 1196, 1059, 1169, - 1094, 1197, 1098, 1201, 1206, 1140, 1207, 1213, 1214, 1220, - 1225, 1131, 1227, 1236, 1234, 1243, 1248, 1252, 1253, 1257, - - 1258, 1259, 1125, 1111, 1100, 1114, 1090, 1095, 1089, 1094, - 1082, 1081, 1053, 1056, 1060, 1049, 1025, 1040, 1024, 995, - 986, 985, 1263, 1000, 991, 987, 1977, 974, 973, 972, - 944, 1977, 1977, 936, 935, 953, 933, 925, 1977, 900, - 889, 1977, 888, 888, 1264, 867, 880, 1268, 1272, 1276, - 1285, 1291, 1303, 1310, 1314, 1319, 1323, 1327, 1331, 1335, - 1342, 1347, 1357, 1361, 1365, 1369, 1373, 1377, 1381, 1387, - 1289, 1348, 1391, 1382, 1392, 1393, 1403, 1404, 1409, 1410, - 1414, 1415, 1416, 1420, 1422, 1428, 1433, 1434, 1435, 1443, - 1445, 1444, 1449, 877, 851, 845, 831, 826, 822, 795, - - 789, 781, 796, 782, 792, 765, 753, 742, 737, 743, - 1977, 1977, 1977, 1977, 1977, 737, 736, 731, 1977, 724, - 1977, 710, 656, 652, 639, 1977, 677, 1451, 1455, 1461, - 1465, 1470, 1477, 1482, 1493, 1497, 1504, 1508, 1512, 1516, - 1520, 1525, 1529, 1533, 1466, 1478, 1483, 1488, 1534, 1538, - 1539, 1540, 1546, 1550, 1552, 1556, 1560, 1561, 1566, 1567, - 1572, 667, 663, 651, 622, 611, 614, 571, 562, 549, - 1977, 1977, 1977, 1977, 563, 1977, 561, 1573, 529, 552, - 1577, 1581, 1585, 1589, 1593, 1602, 1608, 1613, 1617, 1594, - 1621, 1622, 1623, 1627, 1628, 1633, 1629, 1634, 539, 534, - - 1638, 500, 1977, 487, 1640, 452, 1642, 1644, 1649, 1653, - 1657, 1661, 1662, 1668, 1666, 1670, 1672, 458, 1676, 437, - 1977, 1677, 419, 1686, 1690, 1694, 1701, 1705, 1707, 1709, - 1713, 418, 361, 1977, 1723, 1727, 1728, 1732, 360, 333, - 1734, 1740, 187, 128, 1742, 1748, 112, 23, 1747, 1753, - 12, 1977, 1757, 1763, 1977, 1785, 1791, 1797, 1803, 1809, - 1815, 1821, 1827, 1833, 1839, 1845, 1851, 1857, 1863, 1869, - 1875, 1881, 1887, 1893, 0, 1899, 1905, 1911, 1917 + 640, 644, 649, 653, 659, 663, 667, 671, 685, 679, + 689, 693, 551, 701, 2031, 707, 2031, 711, 614, 579, + 636, 599, 712, 672, 717, 719, 721, 727, 729, 733, + 738, 734, 739, 751, 752, 753, 0, 758, 764, 765, + 770, 771, 776, 775, 781, 782, 790, 2031, 1741, 2031, + 0, 1731, 1728, 1707, 1714, 1706, 1702, 1675, 1678, 1663, + 1660, 1649, 1634, 1632, 1638, 1611, 1625, 1616, 766, 1593, + + 0, 325, 1592, 1584, 1589, 437, 1554, 1548, 795, 799, + 804, 2031, 1578, 436, 2031, 808, 813, 2031, 1548, 1538, + 1546, 1531, 1539, 1531, 1517, 1513, 1498, 1507, 1506, 1498, + 1492, 1484, 1461, 1449, 1456, 1454, 1432, 818, 822, 1420, + 1421, 1399, 1391, 1389, 826, 830, 834, 2031, 839, 844, + 848, 852, 856, 866, 875, 881, 885, 889, 893, 904, + 910, 916, 920, 924, 929, 934, 938, 951, 955, 959, + 963, 968, 972, 857, 898, 925, 964, 973, 939, 977, + 979, 981, 990, 994, 995, 1002, 1011, 1015, 1013, 1019, + 1025, 1029, 1030, 1031, 1035, 1046, 1036, 1050, 1052, 1054, + + 1056, 1058, 1064, 1384, 1375, 1383, 1364, 1375, 1365, 1351, + 1353, 1342, 1351, 1350, 1343, 1341, 1333, 1317, 1313, 1322, + 1320, 1286, 1065, 1069, 1279, 1287, 1270, 1264, 1272, 1253, + 1236, 1244, 1216, 1211, 1202, 1210, 1211, 1207, 1172, 1167, + 1171, 1163, 1149, 1163, 1141, 1128, 1107, 1070, 2031, 1075, + 1093, 1094, 1100, 1079, 1104, 1083, 2031, 1088, 2031, 1090, + 1096, 1104, 1108, 1115, 1119, 1123, 1133, 1145, 1152, 1141, + 1156, 1161, 1166, 1170, 1179, 1183, 1188, 1192, 1200, 1204, + 1210, 1214, 1218, 1222, 1128, 1193, 1205, 1226, 1100, 1227, + 1233, 1162, 1237, 1238, 1239, 1244, 1251, 1258, 1253, 1260, + + 1270, 1271, 1275, 1276, 1281, 1282, 1287, 1288, 1289, 1098, + 1089, 1069, 1077, 1053, 1053, 1034, 1035, 1035, 1034, 997, + 999, 1004, 993, 979, 993, 983, 966, 942, 940, 946, + 1293, 943, 941, 940, 2031, 935, 927, 925, 890, 2031, + 2031, 887, 882, 900, 879, 886, 2031, 863, 865, 845, + 2031, 842, 839, 1295, 819, 838, 1297, 1301, 1305, 1312, + 1321, 1333, 1342, 1346, 1351, 1355, 1359, 1363, 1367, 1374, + 1379, 1389, 1393, 1397, 1401, 1405, 1409, 1413, 1419, 1423, + 1319, 1380, 1424, 1325, 1428, 1434, 1440, 1414, 1430, 1446, + 1447, 1451, 1452, 1453, 1458, 1459, 1467, 1469, 1476, 1477, + + 1482, 1481, 1483, 1488, 840, 841, 837, 832, 828, 824, + 803, 797, 793, 807, 790, 793, 773, 773, 740, 727, + 715, 737, 2031, 2031, 2031, 2031, 2031, 727, 720, 715, + 2031, 700, 2031, 697, 685, 655, 657, 644, 2031, 674, + 1493, 1497, 1502, 1506, 1515, 1519, 1523, 1527, 1534, 1538, + 1543, 1547, 1551, 1555, 1560, 1564, 1569, 1573, 1574, 1489, + 1507, 1578, 1580, 1584, 1585, 1586, 1592, 1596, 1601, 1603, + 1605, 1607, 1609, 1615, 1616, 1621, 668, 660, 656, 650, + 635, 622, 611, 580, 580, 553, 2031, 2031, 2031, 2031, + 583, 2031, 563, 561, 1622, 529, 557, 1626, 1630, 1634, + + 1638, 1642, 1652, 1657, 1666, 1661, 1671, 1643, 1653, 1675, + 1676, 1677, 1681, 1683, 1687, 1689, 1694, 547, 539, 534, + 1695, 500, 2031, 2031, 487, 1696, 452, 1700, 1705, 1709, + 1714, 1718, 1722, 1726, 1710, 1730, 1732, 1736, 1744, 1748, + 458, 1749, 437, 2031, 1750, 419, 1754, 1758, 1766, 1770, + 1759, 1774, 1775, 1776, 418, 361, 2031, 1780, 1788, 1796, + 1797, 360, 333, 1801, 1802, 187, 128, 1806, 1807, 112, + 23, 1814, 1823, 12, 2031, 1825, 1829, 2031, 1846, 1852, + 1858, 1864, 1870, 1876, 1882, 1888, 1894, 1900, 1906, 1912, + 1918, 1924, 1930, 1936, 1942, 1948, 1954, 0, 1960, 1966, + + 1972, 1978 } ; -static yyconst flex_int16_t yy_def[780] = +static yyconst flex_int16_t yy_def[803] = { 0, - 756, 755, 757, 758, 759, 759, 760, 760, 761, 755, - 762, 755, 755, 13, 763, 763, 764, 764, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 765, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 766, 755, 767, 755, 755, 768, 767, 767, 767, 769, - 755, 755, 769, 769, 770, 755, 755, 771, 755, 755, - 771, 771, 771, 771, 771, 771, 771, 771, 771, 771, - 771, 771, 771, 771, 771, 772, 771, 771, 771, 771, - 771, 771, 771, 773, 755, 755, 755, 755, 773, 773, - - 773, 773, 773, 773, 773, 773, 773, 773, 773, 773, - 773, 773, 39, 774, 773, 773, 773, 773, 773, 773, - 773, 755, 755, 755, 775, 775, 775, 775, 775, 775, - 775, 775, 775, 775, 775, 775, 775, 775, 775, 39, - 775, 775, 775, 775, 775, 776, 755, 755, 755, 755, - 777, 777, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 39, 765, 755, 755, 755, 755, 755, - 765, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 767, 755, 767, 755, 767, 767, 767, - - 767, 769, 769, 755, 769, 769, 769, 770, 755, 755, - 771, 771, 755, 771, 771, 771, 771, 771, 771, 771, - 771, 771, 771, 771, 771, 771, 771, 771, 771, 771, - 771, 771, 772, 772, 771, 771, 771, 771, 771, 771, - 771, 771, 778, 755, 755, 755, 755, 778, 778, 778, + 779, 778, 780, 781, 782, 782, 783, 783, 784, 778, + 785, 778, 778, 13, 786, 786, 787, 787, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, - 778, 778, 778, 778, 778, 778, 113, 779, 778, 778, - 778, 778, 778, 778, 778, 778, 755, 755, 755, 755, - 775, 775, 775, 775, 775, 775, 775, 775, 775, 775, - 775, 775, 775, 775, 775, 775, 775, 775, 775, 775, - - 140, 775, 775, 775, 775, 775, 775, 775, 776, 776, - 755, 755, 755, 777, 755, 777, 777, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 767, 769, 769, 769, 755, 771, 771, 771, - 771, 771, 771, 771, 771, 771, 771, 771, 771, 771, - 771, 771, 771, 771, 771, 771, 771, 771, 771, 771, - 771, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778, 788, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, - 778, 779, 778, 778, 778, 778, 778, 778, 778, 778, - - 775, 775, 775, 775, 775, 775, 775, 775, 775, 775, - 775, 775, 775, 775, 775, 775, 775, 775, 775, 775, - 775, 775, 775, 775, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 767, - 769, 755, 769, 755, 771, 771, 771, 771, 771, 771, - 771, 771, 771, 771, 771, 771, 771, 771, 771, 771, - 771, 771, 771, 771, 771, 771, 771, 771, 778, 778, + 789, 778, 790, 778, 778, 791, 790, 790, 790, 792, + 778, 778, 792, 792, 793, 778, 778, 794, 778, 778, + 794, 794, 794, 794, 794, 794, 794, 794, 794, 794, + 794, 794, 794, 794, 794, 795, 794, 794, 794, 794, + 794, 794, 794, 796, 778, 778, 778, 778, 796, 796, + + 796, 796, 796, 796, 796, 796, 796, 796, 796, 796, + 796, 796, 39, 797, 796, 796, 796, 796, 796, 796, + 796, 778, 778, 778, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 39, + 798, 798, 798, 798, 798, 799, 778, 778, 778, 778, + 800, 800, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 39, 788, 778, 778, 778, 778, 778, + 788, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 790, 778, 790, 778, 790, 790, 790, + + 790, 792, 792, 778, 792, 792, 792, 793, 778, 778, + 794, 794, 778, 794, 794, 794, 794, 794, 794, 794, + 794, 794, 794, 794, 794, 794, 794, 794, 794, 794, + 794, 794, 795, 795, 794, 794, 794, 794, 794, 794, + 794, 794, 801, 778, 778, 778, 778, 801, 801, 801, + 801, 801, 801, 801, 801, 801, 801, 801, 801, 801, + 801, 801, 801, 801, 801, 801, 113, 802, 801, 801, + 801, 801, 801, 801, 801, 801, 778, 778, 778, 778, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + + 140, 798, 798, 798, 798, 798, 798, 798, 799, 799, + 778, 778, 778, 800, 778, 800, 800, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, - - 778, 778, 775, 775, 775, 775, 775, 775, 775, 775, - 775, 775, 775, 775, 775, 775, 775, 775, 775, 775, - 775, 775, 775, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 767, 771, 771, 771, - 771, 771, 771, 771, 771, 771, 771, 771, 771, 771, - 771, 771, 771, 771, 771, 771, 771, 771, 771, 771, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 790, 792, 792, 792, 778, 794, 794, + 794, 794, 794, 794, 794, 794, 794, 794, 794, 794, + 794, 794, 794, 794, 794, 794, 794, 794, 794, 794, + 794, 794, 794, 801, 801, 801, 801, 801, 801, 801, + 801, 801, 801, 801, 801, 801, 801, 801, 801, 801, + 801, 801, 801, 801, 802, 801, 801, 801, 801, 801, + + 801, 801, 801, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, - 778, 778, 778, 775, 775, 775, 775, 775, 775, 775, - - 775, 775, 775, 775, 775, 775, 775, 775, 775, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 767, 771, 771, 771, - 771, 771, 771, 771, 771, 771, 771, 771, 771, 771, - 771, 771, 771, 771, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, - 778, 775, 775, 775, 775, 775, 775, 775, 775, 775, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 767, - 771, 771, 771, 771, 771, 771, 771, 771, 771, 778, - 778, 778, 778, 778, 778, 778, 778, 778, 775, 775, - - 775, 775, 755, 755, 755, 755, 755, 771, 771, 771, - 771, 771, 778, 778, 778, 778, 778, 775, 775, 755, - 755, 755, 755, 771, 771, 771, 771, 778, 778, 778, - 778, 775, 755, 755, 771, 771, 778, 778, 775, 755, - 771, 778, 775, 755, 771, 778, 775, 755, 771, 778, - 775, 755, 771, 778, 0, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755 + 778, 778, 778, 778, 790, 792, 778, 792, 778, 794, + 794, 794, 794, 794, 794, 794, 794, 794, 794, 794, + 794, 794, 794, 794, 794, 794, 794, 794, 794, 794, + 794, 794, 794, 794, 801, 801, 801, 801, 801, 801, + 801, 801, 801, 801, 801, 801, 801, 801, 801, 801, + + 801, 801, 801, 801, 801, 801, 801, 801, 801, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 790, 794, 794, 794, 794, + 794, 794, 794, 794, 794, 794, 794, 794, 794, 794, + 794, 794, 794, 794, 794, 794, 794, 794, 794, 794, + 801, 801, 801, 801, 801, 801, 801, 801, 801, 801, + 801, 801, 801, 801, 801, 801, 801, 801, 801, 801, + + 801, 801, 801, 801, 798, 798, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 798, 798, 798, 798, + 798, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778, 790, + 794, 794, 794, 794, 794, 794, 794, 794, 794, 794, + 794, 794, 794, 794, 794, 794, 794, 794, 801, 801, + 801, 801, 801, 801, 801, 801, 801, 801, 801, 801, + 801, 801, 801, 801, 801, 801, 798, 798, 798, 798, + 798, 798, 798, 798, 798, 798, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 790, 794, 794, 794, + + 794, 794, 794, 794, 794, 794, 794, 801, 801, 801, + 801, 801, 801, 801, 801, 801, 801, 798, 798, 798, + 798, 798, 778, 778, 778, 778, 778, 778, 794, 794, + 794, 794, 794, 794, 801, 801, 801, 801, 801, 801, + 798, 798, 778, 778, 778, 778, 794, 794, 794, 794, + 801, 801, 801, 801, 798, 778, 778, 794, 794, 801, + 801, 798, 778, 794, 801, 798, 778, 794, 801, 798, + 778, 794, 801, 798, 778, 794, 801, 0, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, + + 778, 778 } ; -static yyconst flex_int16_t yy_nxt[2026] = +static yyconst flex_int16_t yy_nxt[2080] = { 0, - 755, 21, 22, 23, 21, 281, 24, 755, 25, 66, + 778, 21, 22, 23, 21, 281, 24, 778, 25, 66, 67, 153, 26, 27, 153, 28, 66, 67, 29, 169, - 30, 752, 31, 32, 33, 34, 181, 35, 36, 181, - 37, 170, 752, 38, 20, 39, 22, 23, 39, 40, + 30, 775, 31, 32, 33, 34, 181, 35, 36, 181, + 37, 170, 775, 38, 20, 39, 22, 23, 39, 40, 24, 20, 25, 41, 20, 20, 26, 27, 20, 28, 20, 20, 29, 20, 30, 20, 42, 32, 33, 34, 20, 35, 36, 20, 37, 20, 20, 38, 20, 20, @@ -709,9 +719,9 @@ static yyconst flex_int16_t yy_nxt[2026] = 161, 165, 182, 258, 162, 185, 187, 200, 188, 190, 192, 193, 310, 164, 205, 310, 164, 59, 166, 206, 259, 63, 292, 63, 152, 186, 64, 152, 64, 21, - 69, 70, 21, 256, 71, 201, 72, 262, 751, 293, + 69, 70, 21, 256, 71, 201, 72, 262, 774, 293, 73, 74, 212, 75, 212, 212, 76, 257, 77, 263, - 78, 79, 80, 81, 748, 82, 83, 212, 84, 212, + 78, 79, 80, 81, 771, 82, 83, 212, 84, 212, 212, 85, 68, 39, 69, 70, 39, 86, 71, 68, 72, 87, 68, 68, 73, 74, 68, 75, 68, 68, 76, 68, 77, 68, 88, 79, 80, 81, 68, 82, @@ -719,7 +729,7 @@ static yyconst flex_int16_t yy_nxt[2026] = 83, 68, 84, 68, 68, 85, 68, 68, 68, 68, 89, 68, 90, 68, 91, 68, 68, 92, 93, 68, 95, 96, 97, 95, 269, 98, 212, 99, 212, 212, - 747, 100, 101, 214, 102, 337, 326, 103, 257, 104, + 770, 100, 101, 214, 102, 338, 326, 103, 257, 104, 205, 105, 106, 107, 108, 206, 109, 110, 234, 111, 234, 234, 112, 94, 113, 96, 97, 113, 114, 98, 94, 99, 115, 94, 94, 100, 101, 94, 102, 94, @@ -732,199 +742,204 @@ static yyconst flex_int16_t yy_nxt[2026] = 125, 131, 125, 132, 133, 134, 135, 125, 136, 137, 125, 138, 20, 125, 139, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 20, 20, 140, - 419, 408, 140, 40, 274, 272, 275, 41, 191, 195, + 423, 411, 140, 40, 274, 272, 275, 41, 191, 195, 197, 198, 212, 290, 212, 212, 212, 302, 212, 212, - 141, 212, 296, 212, 212, 273, 744, 291, 215, 216, + 141, 212, 296, 212, 212, 273, 767, 291, 215, 216, 212, 291, 212, 212, 297, 307, 142, 308, 143, 253, 144, 217, 254, 145, 47, 174, 255, 305, 174, 175, - 743, 740, 212, 176, 212, 212, 212, 218, 212, 212, + 766, 763, 212, 176, 212, 212, 212, 218, 212, 212, 187, 212, 188, 212, 212, 222, 219, 306, 153, 220, 224, 153, 212, 221, 212, 212, 185, 315, 212, 223, 212, 212, 177, 212, 178, 212, 212, 225, 315, 179, - 180, 212, 243, 212, 212, 243, 186, 226, 227, 228, - 230, 212, 739, 212, 212, 212, 316, 212, 212, 305, - 212, 229, 212, 212, 231, 734, 212, 316, 212, 212, - 212, 733, 212, 212, 212, 235, 212, 212, 212, 306, + 180, 212, 335, 212, 212, 336, 186, 226, 227, 228, + 230, 212, 762, 212, 212, 212, 316, 212, 212, 305, + 212, 229, 212, 212, 231, 757, 212, 316, 212, 212, + 212, 756, 212, 212, 212, 235, 212, 212, 212, 306, 212, 212, 317, 318, 212, 317, 212, 212, 232, 223, - 212, 732, 212, 212, 244, 245, 246, 244, 721, 238, + 212, 755, 212, 212, 244, 245, 246, 244, 744, 238, 246, 247, 246, 246, 267, 245, 246, 267, 277, 278, 279, 277, 316, 236, 237, 240, 200, 241, 287, 239, - 720, 288, 190, 192, 193, 289, 301, 278, 279, 301, - 311, 312, 313, 311, 719, 242, 195, 197, 198, 346, - 347, 718, 346, 212, 201, 212, 212, 212, 703, 212, - 212, 212, 243, 212, 212, 243, 680, 212, 214, 212, - 212, 374, 212, 707, 212, 212, 348, 212, 704, 212, - 212, 212, 703, 212, 212, 212, 350, 212, 212, 212, - 243, 212, 212, 243, 351, 344, 349, 212, 352, 212, - 212, 212, 702, 212, 212, 212, 701, 212, 212, 212, - - 243, 212, 212, 243, 375, 212, 353, 212, 212, 212, - 354, 212, 212, 377, 700, 243, 355, 356, 243, 212, - 357, 212, 212, 676, 376, 699, 359, 212, 360, 212, - 212, 674, 212, 358, 212, 212, 212, 243, 212, 212, - 243, 212, 362, 212, 212, 212, 243, 212, 212, 243, - 234, 363, 234, 234, 234, 361, 234, 234, 364, 212, - 673, 212, 212, 212, 379, 212, 212, 212, 382, 212, - 212, 212, 672, 212, 212, 212, 671, 212, 212, 365, - 369, 680, 679, 366, 355, 212, 678, 212, 212, 212, - 243, 212, 212, 243, 367, 212, 238, 212, 212, 677, - - 368, 244, 245, 246, 244, 246, 245, 246, 246, 243, - 243, 243, 243, 243, 243, 381, 239, 373, 243, 676, - 243, 243, 370, 243, 378, 243, 243, 243, 243, 243, - 243, 371, 380, 243, 243, 386, 243, 243, 675, 383, - 674, 243, 385, 388, 243, 673, 672, 243, 384, 389, - 243, 268, 671, 181, 268, 387, 181, 243, 390, 243, - 243, 243, 243, 243, 243, 243, 243, 243, 243, 670, - 243, 243, 396, 243, 243, 669, 243, 277, 278, 279, - 277, 391, 310, 393, 381, 310, 397, 310, 394, 445, - 310, 668, 445, 667, 395, 311, 312, 313, 311, 317, - - 318, 621, 317, 666, 399, 619, 398, 317, 318, 665, - 317, 443, 444, 400, 443, 451, 452, 664, 451, 453, - 454, 663, 453, 346, 347, 212, 346, 212, 212, 316, - 212, 615, 212, 212, 446, 614, 212, 316, 212, 212, - 613, 212, 243, 212, 212, 243, 212, 455, 212, 212, - 212, 457, 212, 212, 612, 459, 212, 456, 212, 212, - 611, 344, 458, 460, 212, 344, 212, 212, 212, 203, - 212, 212, 212, 243, 212, 212, 243, 212, 461, 212, - 212, 243, 483, 462, 243, 464, 212, 465, 212, 212, - 212, 662, 212, 212, 463, 212, 481, 212, 212, 466, - - 212, 467, 212, 212, 212, 627, 212, 212, 212, 468, - 212, 212, 212, 626, 212, 212, 473, 444, 212, 473, - 625, 624, 474, 471, 212, 474, 469, 623, 622, 212, - 470, 212, 212, 212, 621, 212, 212, 212, 243, 212, - 212, 243, 212, 472, 212, 212, 243, 243, 243, 243, - 243, 243, 243, 373, 620, 243, 243, 366, 243, 243, - 479, 243, 619, 618, 617, 484, 476, 475, 243, 482, - 616, 243, 243, 477, 480, 243, 243, 486, 485, 243, - 478, 615, 614, 613, 243, 488, 489, 243, 243, 243, - 243, 243, 243, 243, 487, 243, 612, 490, 243, 491, - - 611, 243, 243, 492, 243, 243, 268, 498, 181, 268, - 498, 181, 497, 444, 610, 497, 493, 495, 609, 243, - 243, 494, 243, 243, 243, 243, 243, 243, 243, 243, - 608, 243, 496, 396, 243, 443, 444, 445, 443, 607, - 445, 606, 443, 444, 393, 443, 397, 445, 545, 539, - 445, 545, 499, 605, 451, 452, 500, 451, 453, 454, - 243, 453, 501, 243, 604, 212, 398, 212, 212, 502, - 212, 571, 212, 212, 603, 212, 548, 212, 212, 602, - 601, 212, 446, 212, 212, 212, 549, 212, 212, 551, - 533, 532, 446, 546, 212, 243, 212, 212, 243, 243, - - 203, 550, 243, 212, 203, 212, 212, 212, 600, 212, - 212, 212, 552, 212, 212, 553, 599, 598, 597, 556, - 555, 573, 212, 527, 212, 212, 575, 596, 595, 554, - 557, 212, 243, 212, 212, 243, 212, 594, 212, 212, - 212, 243, 212, 212, 243, 212, 584, 212, 212, 212, - 547, 212, 212, 560, 578, 544, 543, 558, 559, 561, - 212, 542, 212, 212, 212, 541, 212, 212, 563, 212, - 243, 212, 212, 243, 540, 474, 562, 212, 474, 539, - 564, 473, 444, 212, 473, 212, 572, 212, 212, 212, - 538, 212, 212, 212, 537, 212, 212, 569, 243, 212, - - 569, 243, 243, 536, 535, 243, 574, 243, 243, 534, - 243, 243, 565, 533, 243, 243, 579, 243, 243, 532, - 475, 243, 580, 576, 243, 568, 243, 531, 243, 243, - 566, 243, 567, 577, 530, 243, 529, 243, 243, 583, - 243, 581, 570, 582, 243, 586, 528, 243, 527, 497, - 444, 587, 497, 498, 243, 585, 498, 243, 243, 243, - 592, 243, 243, 592, 545, 545, 526, 545, 545, 212, - 525, 212, 212, 212, 524, 212, 212, 212, 523, 212, - 212, 629, 628, 522, 419, 630, 212, 588, 212, 212, - 243, 591, 212, 243, 212, 212, 521, 520, 499, 589, - - 631, 590, 519, 645, 212, 593, 212, 212, 518, 546, - 546, 212, 632, 212, 212, 212, 517, 212, 212, 633, - 212, 516, 212, 212, 212, 515, 212, 212, 212, 514, - 212, 212, 212, 513, 212, 212, 212, 512, 212, 212, - 634, 511, 510, 212, 637, 212, 212, 509, 212, 243, - 212, 212, 243, 508, 507, 635, 639, 646, 212, 636, - 212, 212, 212, 638, 212, 212, 212, 506, 212, 212, - 212, 505, 212, 212, 212, 504, 212, 212, 212, 503, - 212, 212, 569, 243, 212, 569, 243, 450, 212, 640, - 212, 212, 243, 243, 243, 243, 243, 243, 449, 448, - - 647, 648, 649, 641, 243, 243, 642, 243, 243, 643, - 243, 243, 650, 243, 243, 243, 243, 243, 243, 243, - 243, 243, 337, 243, 243, 654, 243, 570, 447, 243, - 651, 656, 243, 644, 243, 243, 243, 243, 243, 243, - 442, 655, 652, 653, 243, 592, 243, 243, 592, 243, - 243, 441, 212, 243, 212, 212, 212, 440, 212, 212, - 681, 657, 212, 439, 212, 212, 212, 243, 212, 212, - 243, 212, 658, 212, 212, 690, 659, 660, 212, 243, - 212, 212, 243, 212, 243, 212, 212, 243, 438, 243, - 593, 682, 243, 437, 212, 661, 212, 212, 212, 436, - - 212, 212, 683, 435, 434, 212, 684, 212, 212, 212, - 433, 212, 212, 212, 432, 212, 212, 212, 431, 212, - 212, 212, 685, 212, 212, 686, 212, 430, 212, 212, + 743, 288, 190, 192, 193, 289, 301, 278, 279, 301, + 311, 312, 313, 311, 742, 242, 195, 197, 198, 347, + 348, 741, 347, 212, 201, 212, 212, 212, 724, 212, + 212, 212, 243, 212, 212, 243, 723, 212, 214, 212, + 212, 697, 212, 728, 212, 212, 349, 212, 725, 212, + 212, 212, 724, 212, 212, 212, 351, 212, 212, 212, + 243, 212, 212, 243, 352, 345, 350, 212, 353, 212, + 212, 212, 723, 212, 212, 212, 722, 212, 212, 212, + + 243, 212, 212, 243, 377, 212, 354, 212, 212, 212, + 355, 212, 212, 379, 721, 243, 356, 357, 243, 212, + 358, 212, 212, 720, 376, 719, 360, 212, 361, 212, + 212, 692, 212, 359, 212, 212, 212, 243, 212, 212, + 243, 212, 363, 212, 212, 212, 378, 212, 212, 718, + 234, 364, 234, 234, 234, 362, 234, 234, 365, 690, + 212, 366, 212, 212, 212, 689, 212, 212, 212, 688, + 212, 212, 212, 243, 212, 212, 243, 687, 697, 367, + 212, 371, 212, 212, 368, 356, 212, 696, 212, 212, + 212, 695, 212, 212, 212, 369, 212, 212, 694, 693, + + 381, 370, 244, 245, 246, 244, 692, 238, 246, 245, + 246, 246, 243, 243, 691, 243, 243, 372, 243, 375, + 243, 243, 243, 243, 690, 243, 380, 239, 243, 689, + 243, 243, 373, 243, 243, 243, 688, 243, 243, 243, + 243, 382, 243, 243, 384, 383, 687, 686, 388, 385, + 390, 387, 243, 243, 243, 243, 243, 243, 386, 268, + 685, 181, 268, 389, 181, 243, 243, 391, 243, 243, + 392, 243, 243, 393, 243, 243, 243, 243, 684, 243, + 243, 399, 243, 243, 420, 243, 243, 421, 394, 396, + 383, 277, 278, 279, 277, 683, 310, 397, 400, 310, + + 310, 682, 633, 310, 398, 311, 312, 313, 311, 317, + 318, 681, 317, 402, 317, 318, 631, 317, 401, 448, + 449, 680, 448, 450, 403, 679, 450, 456, 457, 678, + 456, 458, 459, 627, 458, 347, 348, 626, 347, 316, + 212, 625, 212, 212, 316, 212, 624, 212, 212, 212, + 623, 212, 212, 212, 677, 212, 212, 212, 243, 212, + 212, 243, 460, 640, 462, 639, 464, 212, 451, 212, + 212, 638, 461, 345, 463, 637, 212, 345, 212, 212, + 465, 203, 212, 636, 212, 212, 212, 635, 212, 212, + 212, 634, 212, 212, 212, 633, 212, 212, 466, 243, + + 632, 467, 243, 469, 470, 212, 375, 212, 212, 631, + 630, 212, 468, 212, 212, 629, 628, 212, 471, 212, + 212, 212, 472, 212, 212, 212, 243, 212, 212, 243, + 212, 473, 212, 212, 627, 212, 626, 212, 212, 212, + 243, 212, 212, 243, 625, 476, 477, 474, 485, 624, + 623, 475, 479, 449, 212, 479, 480, 622, 212, 480, + 212, 488, 212, 212, 212, 243, 212, 212, 243, 212, + 478, 212, 212, 212, 243, 212, 212, 243, 243, 621, + 243, 243, 243, 243, 620, 243, 619, 489, 368, 487, + 618, 243, 486, 490, 243, 243, 243, 482, 243, 243, + + 617, 481, 547, 243, 491, 483, 243, 616, 615, 494, + 492, 484, 243, 495, 243, 243, 243, 243, 614, 243, + 243, 493, 613, 243, 612, 496, 243, 497, 498, 243, + 243, 243, 243, 243, 243, 243, 268, 505, 181, 268, + 505, 181, 502, 541, 540, 501, 499, 504, 449, 611, + 504, 243, 500, 243, 243, 243, 243, 243, 243, 243, + 243, 610, 243, 503, 399, 243, 448, 449, 243, 448, + 450, 448, 449, 450, 448, 609, 450, 396, 400, 450, + 554, 608, 506, 554, 456, 457, 535, 456, 507, 458, + 459, 212, 458, 212, 212, 508, 607, 212, 401, 212, + + 212, 243, 557, 509, 243, 212, 606, 212, 212, 212, + 605, 212, 212, 558, 556, 451, 212, 560, 212, 212, + 212, 451, 212, 212, 212, 555, 212, 212, 585, 243, + 203, 559, 243, 553, 212, 203, 212, 212, 552, 551, + 581, 562, 212, 561, 212, 212, 212, 564, 212, 212, + 563, 550, 549, 212, 565, 212, 212, 212, 548, 212, + 212, 566, 212, 243, 212, 212, 243, 212, 567, 212, + 212, 212, 547, 212, 212, 569, 588, 546, 545, 568, + 212, 570, 212, 212, 212, 544, 212, 212, 572, 212, + 543, 212, 212, 212, 243, 212, 212, 243, 571, 542, + + 573, 479, 449, 212, 479, 480, 243, 212, 480, 243, + 582, 212, 574, 212, 212, 212, 541, 212, 212, 212, + 540, 212, 212, 579, 539, 212, 579, 243, 243, 538, + 243, 243, 583, 537, 243, 584, 575, 243, 243, 243, + 243, 243, 243, 243, 536, 243, 589, 590, 243, 586, + 481, 578, 243, 535, 243, 243, 576, 243, 577, 243, + 587, 243, 243, 534, 243, 593, 591, 592, 580, 596, + 533, 243, 243, 594, 243, 243, 243, 504, 449, 243, + 504, 595, 505, 243, 532, 505, 243, 597, 243, 243, + 603, 243, 243, 603, 554, 598, 554, 554, 212, 554, + + 212, 212, 212, 531, 212, 212, 212, 530, 212, 212, + 642, 641, 423, 212, 643, 212, 212, 529, 528, 599, + 243, 602, 212, 243, 212, 212, 243, 506, 600, 243, + 644, 601, 527, 659, 212, 604, 212, 212, 526, 555, + 525, 555, 645, 212, 524, 212, 212, 212, 523, 212, + 212, 646, 212, 522, 212, 212, 212, 521, 212, 212, + 212, 520, 212, 212, 212, 519, 212, 212, 212, 518, + 212, 212, 647, 517, 516, 212, 650, 212, 212, 515, + 212, 243, 212, 212, 243, 514, 513, 648, 652, 660, + 212, 649, 212, 212, 212, 651, 212, 212, 212, 512, + + 212, 212, 212, 511, 212, 212, 212, 510, 212, 212, + 212, 455, 212, 212, 212, 243, 212, 212, 243, 654, + 579, 653, 212, 579, 212, 243, 212, 212, 243, 243, + 454, 243, 243, 661, 243, 243, 453, 662, 243, 655, + 665, 243, 656, 663, 243, 657, 338, 243, 243, 664, + 243, 243, 243, 243, 243, 243, 243, 243, 452, 243, + 243, 668, 243, 243, 447, 580, 446, 670, 243, 658, + 243, 243, 445, 243, 669, 666, 444, 243, 243, 667, + 243, 243, 243, 243, 603, 243, 243, 603, 443, 243, + 243, 672, 243, 243, 212, 671, 212, 212, 212, 442, + + 212, 212, 698, 212, 441, 212, 212, 212, 243, 212, + 212, 243, 440, 675, 673, 674, 212, 439, 212, 212, + 212, 438, 212, 212, 212, 437, 212, 212, 212, 604, + 212, 212, 699, 436, 676, 212, 700, 212, 212, 212, + 435, 212, 212, 701, 212, 434, 212, 212, 212, 433, + 212, 212, 212, 432, 212, 212, 212, 702, 212, 212, + 703, 212, 431, 212, 212, 212, 430, 212, 212, 704, 212, 429, 212, 212, 212, 243, 212, 212, 243, 243, - 243, 243, 243, 243, 243, 428, 427, 243, 691, 692, - 243, 243, 426, 243, 243, 693, 243, 243, 425, 688, - 243, 243, 243, 687, 243, 243, 694, 243, 243, 695, - 243, 243, 689, 243, 705, 312, 243, 705, 212, 424, - 212, 212, 212, 423, 212, 212, 212, 422, 212, 212, - 212, 421, 212, 212, 212, 243, 212, 212, 243, 420, - - 697, 418, 708, 212, 696, 212, 212, 417, 416, 212, - 698, 212, 212, 415, 710, 709, 212, 710, 212, 706, - 212, 212, 243, 243, 243, 243, 243, 243, 243, 243, - 715, 243, 243, 715, 243, 243, 713, 243, 243, 705, - 714, 705, 705, 722, 705, 212, 722, 212, 212, 414, - 212, 712, 212, 212, 710, 413, 212, 710, 212, 711, - 212, 212, 726, 243, 212, 726, 243, 715, 717, 243, - 715, 243, 243, 730, 243, 716, 730, 722, 722, 412, - 722, 722, 724, 411, 706, 410, 706, 212, 723, 212, - 212, 212, 409, 212, 212, 726, 408, 212, 726, 711, - - 407, 728, 212, 725, 212, 212, 243, 727, 243, 243, - 730, 243, 716, 730, 243, 406, 729, 243, 731, 405, - 735, 404, 723, 723, 212, 403, 212, 212, 212, 243, - 212, 212, 243, 243, 402, 212, 243, 212, 212, 737, - 727, 243, 401, 212, 243, 212, 212, 736, 212, 243, - 212, 212, 243, 282, 243, 731, 753, 243, 212, 738, - 212, 212, 754, 741, 243, 278, 209, 243, 742, 345, - 344, 203, 199, 343, 195, 190, 342, 745, 749, 341, - 340, 339, 338, 746, 750, 20, 20, 20, 20, 20, - 20, 48, 48, 48, 48, 48, 48, 53, 53, 53, - - 53, 53, 53, 60, 60, 60, 60, 60, 60, 65, - 65, 65, 65, 65, 65, 68, 68, 68, 68, 68, - 68, 94, 94, 94, 94, 94, 94, 146, 146, 146, - 146, 146, 146, 151, 151, 151, 151, 151, 151, 181, - 181, 189, 181, 181, 181, 191, 191, 191, 191, 191, - 191, 194, 184, 183, 336, 194, 194, 196, 196, 196, - 196, 196, 196, 202, 202, 335, 334, 202, 202, 208, - 208, 208, 333, 208, 208, 211, 211, 332, 211, 211, - 211, 233, 233, 331, 233, 233, 233, 243, 243, 330, - 329, 328, 243, 268, 268, 327, 268, 268, 268, 309, - - 309, 326, 325, 324, 309, 314, 314, 314, 314, 314, - 314, 372, 372, 323, 322, 321, 372, 392, 392, 320, - 392, 392, 392, 319, 155, 312, 304, 303, 300, 299, - 298, 295, 294, 286, 285, 284, 283, 282, 280, 276, - 271, 270, 266, 265, 264, 261, 260, 252, 251, 250, - 249, 248, 213, 210, 209, 207, 204, 203, 199, 195, - 190, 189, 184, 183, 173, 172, 171, 168, 167, 159, - 158, 157, 156, 155, 154, 755, 19, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755 + 312, 243, 243, 708, 243, 243, 243, 243, 243, 243, + 243, 428, 427, 243, 709, 710, 243, 243, 706, 426, + + 243, 711, 243, 705, 243, 243, 243, 243, 243, 243, + 243, 243, 707, 243, 713, 712, 243, 243, 425, 243, + 243, 714, 243, 726, 424, 243, 726, 212, 422, 212, + 212, 212, 419, 212, 212, 212, 418, 212, 212, 212, + 417, 212, 212, 212, 243, 212, 212, 243, 416, 716, + 415, 729, 715, 212, 243, 212, 212, 243, 212, 717, + 212, 212, 732, 414, 212, 732, 730, 212, 727, 212, + 212, 413, 212, 731, 212, 212, 243, 243, 243, 243, + 243, 243, 243, 412, 243, 243, 735, 243, 243, 411, + 738, 243, 736, 738, 737, 243, 726, 726, 243, 726, + + 726, 745, 410, 409, 745, 734, 212, 733, 212, 212, + 212, 243, 212, 212, 243, 212, 408, 212, 212, 732, + 407, 212, 732, 212, 406, 212, 212, 749, 740, 212, + 749, 243, 405, 243, 243, 739, 243, 738, 404, 282, + 738, 727, 727, 278, 209, 243, 746, 747, 243, 753, + 745, 745, 753, 745, 745, 212, 346, 212, 212, 212, + 243, 212, 212, 243, 733, 751, 345, 749, 748, 212, + 749, 212, 750, 212, 212, 243, 753, 243, 243, 753, + 243, 212, 739, 212, 212, 203, 199, 344, 758, 212, + 752, 212, 212, 760, 754, 746, 746, 243, 243, 195, + + 243, 243, 212, 243, 212, 212, 243, 212, 243, 212, + 212, 243, 750, 190, 343, 212, 759, 212, 212, 342, + 764, 754, 761, 776, 243, 341, 212, 243, 212, 212, + 243, 340, 777, 243, 339, 189, 765, 184, 183, 337, + 334, 333, 772, 773, 768, 769, 20, 20, 20, 20, + 20, 20, 48, 48, 48, 48, 48, 48, 53, 53, + 53, 53, 53, 53, 60, 60, 60, 60, 60, 60, + 65, 65, 65, 65, 65, 65, 68, 68, 68, 68, + 68, 68, 94, 94, 94, 94, 94, 94, 146, 146, + 146, 146, 146, 146, 151, 151, 151, 151, 151, 151, + + 181, 181, 332, 181, 181, 181, 191, 191, 191, 191, + 191, 191, 194, 331, 330, 329, 194, 194, 196, 196, + 196, 196, 196, 196, 202, 202, 328, 327, 202, 202, + 208, 208, 208, 326, 208, 208, 211, 211, 325, 211, + 211, 211, 233, 233, 324, 233, 233, 233, 243, 243, + 323, 322, 321, 243, 268, 268, 320, 268, 268, 268, + 309, 309, 319, 155, 312, 309, 314, 314, 314, 314, + 314, 314, 374, 374, 304, 303, 300, 374, 395, 395, + 299, 395, 395, 395, 298, 295, 294, 286, 285, 284, + 283, 282, 280, 276, 271, 270, 266, 265, 264, 261, + + 260, 252, 251, 250, 249, 248, 213, 210, 209, 207, + 204, 203, 199, 195, 190, 189, 184, 183, 173, 172, + 171, 168, 167, 159, 158, 157, 156, 155, 154, 778, + 19, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778 } ; -static yyconst flex_int16_t yy_chk[2026] = +static yyconst flex_int16_t yy_chk[2080] = { 0, - 0, 1, 1, 1, 1, 775, 1, 0, 1, 7, + 0, 1, 1, 1, 1, 798, 1, 0, 1, 7, 7, 21, 1, 1, 21, 1, 8, 8, 1, 35, - 1, 751, 1, 1, 1, 1, 114, 1, 1, 114, - 1, 35, 748, 1, 2, 2, 2, 2, 2, 2, + 1, 774, 1, 1, 1, 1, 114, 1, 1, 114, + 1, 35, 771, 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, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -936,9 +951,9 @@ static yyconst flex_int16_t yy_chk[2026] = 30, 32, 42, 106, 30, 45, 46, 59, 46, 51, 51, 51, 146, 31, 63, 146, 42, 4, 32, 63, 106, 5, 133, 6, 17, 45, 5, 18, 6, 9, - 9, 9, 9, 105, 9, 59, 9, 109, 747, 133, + 9, 9, 9, 105, 9, 59, 9, 109, 770, 133, 9, 9, 68, 9, 68, 68, 9, 105, 9, 109, - 9, 9, 9, 9, 744, 9, 9, 71, 9, 71, + 9, 9, 9, 9, 767, 9, 9, 71, 9, 71, 71, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, @@ -946,7 +961,7 @@ static yyconst flex_int16_t yy_chk[2026] = 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 116, 11, 72, 11, 72, 72, - 743, 11, 11, 72, 11, 182, 182, 11, 116, 11, + 766, 11, 11, 72, 11, 182, 182, 11, 116, 11, 205, 11, 11, 11, 11, 205, 11, 11, 86, 11, 86, 86, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, @@ -961,198 +976,203 @@ static yyconst flex_int16_t yy_chk[2026] = 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 302, 302, 14, 14, 120, 119, 120, 14, 56, 56, 56, 56, 73, 132, 73, 73, 74, 141, 74, 74, - 14, 75, 136, 75, 75, 119, 740, 132, 73, 74, + 14, 75, 136, 75, 75, 119, 763, 132, 73, 74, 76, 141, 76, 76, 136, 145, 14, 145, 14, 104, 14, 75, 104, 14, 14, 39, 104, 144, 39, 39, - 739, 733, 77, 39, 77, 77, 78, 76, 78, 78, + 762, 756, 77, 39, 77, 77, 78, 76, 78, 78, 179, 79, 179, 79, 79, 78, 77, 144, 153, 77, 79, 153, 80, 77, 80, 80, 186, 151, 81, 78, 81, 81, 39, 82, 39, 82, 82, 79, 314, 39, - 39, 83, 243, 83, 83, 243, 186, 80, 81, 82, - 83, 84, 732, 84, 84, 85, 151, 85, 85, 306, - 87, 82, 87, 87, 84, 723, 88, 314, 88, 88, - 89, 720, 89, 89, 90, 88, 90, 90, 91, 306, + 39, 83, 172, 83, 83, 172, 186, 80, 81, 82, + 83, 84, 755, 84, 84, 85, 151, 85, 85, 306, + 87, 82, 87, 87, 84, 746, 88, 314, 88, 88, + 89, 743, 89, 89, 90, 88, 90, 90, 91, 306, 91, 91, 152, 152, 92, 152, 92, 92, 85, 88, - 93, 718, 93, 93, 95, 95, 95, 95, 706, 91, + 93, 741, 93, 93, 95, 95, 95, 95, 727, 91, 97, 97, 97, 97, 113, 113, 113, 113, 122, 122, 122, 122, 152, 89, 90, 92, 201, 92, 131, 91, - 704, 131, 193, 193, 193, 131, 140, 140, 140, 140, - 147, 147, 147, 147, 702, 93, 198, 198, 198, 207, - 207, 700, 207, 211, 201, 211, 211, 212, 699, 212, - 212, 214, 249, 214, 214, 249, 680, 215, 214, 215, - 215, 249, 216, 679, 216, 216, 215, 217, 677, 217, - 217, 218, 675, 218, 218, 219, 217, 219, 219, 220, + 725, 131, 193, 193, 193, 131, 140, 140, 140, 140, + 147, 147, 147, 147, 722, 93, 198, 198, 198, 207, + 207, 720, 207, 211, 201, 211, 211, 212, 719, 212, + 212, 214, 243, 214, 214, 243, 718, 215, 214, 215, + 215, 697, 216, 696, 216, 216, 215, 217, 694, 217, + 217, 218, 693, 218, 218, 219, 217, 219, 219, 220, 250, 220, 220, 250, 218, 207, 216, 221, 219, 221, - 221, 222, 670, 222, 222, 223, 669, 223, 223, 224, + 221, 222, 691, 222, 222, 223, 686, 223, 223, 224, 252, 224, 224, 252, 250, 225, 220, 225, 225, 226, - 221, 226, 226, 252, 668, 251, 222, 223, 251, 227, - 224, 227, 227, 667, 251, 666, 226, 228, 227, 228, - 228, 665, 229, 225, 229, 229, 230, 254, 230, 230, - 254, 231, 229, 231, 231, 232, 257, 232, 232, 257, - 233, 230, 233, 233, 234, 228, 234, 234, 231, 235, - 664, 235, 235, 236, 254, 236, 236, 237, 257, 237, - 237, 238, 663, 238, 238, 239, 662, 239, 239, 232, - 238, 627, 625, 235, 235, 240, 624, 240, 240, 241, - 256, 241, 241, 256, 236, 242, 239, 242, 242, 623, - - 237, 244, 244, 244, 244, 246, 246, 246, 246, 255, - 248, 253, 255, 248, 253, 256, 239, 248, 258, 622, - 259, 258, 240, 259, 253, 260, 261, 262, 260, 261, - 262, 241, 255, 263, 264, 261, 263, 264, 620, 258, - 618, 265, 260, 263, 265, 617, 616, 266, 259, 264, - 266, 268, 610, 268, 268, 262, 268, 270, 265, 269, - 270, 271, 269, 272, 271, 273, 272, 274, 273, 609, - 274, 275, 272, 276, 275, 608, 276, 277, 277, 277, - 277, 266, 309, 269, 269, 309, 273, 310, 270, 338, - 310, 607, 338, 606, 271, 311, 311, 311, 311, 316, - - 316, 605, 316, 604, 274, 603, 273, 317, 317, 602, - 317, 337, 337, 275, 337, 344, 344, 601, 344, 345, - 345, 600, 345, 346, 346, 348, 346, 348, 348, 316, - 349, 599, 349, 349, 338, 598, 350, 317, 350, 350, - 597, 351, 372, 351, 351, 372, 352, 348, 352, 352, - 353, 350, 353, 353, 596, 352, 354, 349, 354, 354, - 595, 344, 351, 353, 355, 345, 355, 355, 356, 346, - 356, 356, 357, 378, 357, 357, 378, 358, 354, 358, - 358, 376, 378, 355, 376, 357, 359, 358, 359, 359, - 360, 594, 360, 360, 356, 361, 376, 361, 361, 359, - - 362, 360, 362, 362, 363, 547, 363, 363, 364, 361, - 364, 364, 365, 546, 365, 365, 366, 366, 366, 366, - 544, 543, 367, 364, 367, 367, 362, 541, 540, 368, - 363, 368, 368, 369, 538, 369, 369, 370, 374, 370, - 370, 374, 371, 365, 371, 371, 373, 375, 377, 373, - 375, 377, 379, 373, 537, 379, 380, 369, 381, 380, - 374, 381, 536, 535, 534, 379, 368, 367, 382, 377, - 531, 382, 383, 370, 375, 383, 384, 381, 380, 384, - 371, 530, 529, 528, 385, 383, 384, 385, 386, 387, - 388, 386, 387, 388, 382, 389, 526, 385, 389, 386, - - 525, 391, 390, 387, 391, 390, 392, 394, 392, 392, - 394, 392, 393, 393, 524, 393, 388, 390, 522, 395, - 396, 389, 395, 396, 397, 398, 399, 397, 398, 399, - 521, 400, 391, 397, 400, 419, 419, 420, 419, 520, - 420, 519, 443, 443, 396, 443, 398, 445, 449, 518, - 445, 449, 394, 517, 451, 451, 395, 451, 453, 453, - 479, 453, 399, 479, 516, 455, 398, 455, 455, 400, - 456, 479, 456, 456, 515, 457, 455, 457, 457, 514, - 513, 458, 420, 458, 458, 459, 456, 459, 459, 458, - 512, 511, 445, 449, 460, 481, 460, 460, 481, 483, - - 451, 457, 483, 461, 453, 461, 461, 462, 510, 462, - 462, 463, 459, 463, 463, 460, 509, 508, 507, 463, - 462, 481, 464, 506, 464, 464, 483, 505, 504, 461, - 464, 465, 492, 465, 465, 492, 466, 503, 466, 466, - 467, 486, 467, 467, 486, 468, 492, 468, 468, 469, - 450, 469, 469, 467, 486, 448, 447, 465, 466, 468, - 470, 446, 470, 470, 471, 442, 471, 471, 470, 472, - 480, 472, 472, 480, 441, 474, 469, 474, 474, 440, - 471, 473, 473, 473, 473, 475, 480, 475, 475, 476, - 439, 476, 476, 477, 438, 477, 477, 478, 482, 478, - - 478, 482, 484, 437, 436, 484, 482, 485, 487, 435, - 485, 487, 472, 434, 488, 489, 487, 488, 489, 433, - 474, 490, 488, 484, 490, 477, 491, 432, 493, 491, - 475, 493, 476, 485, 431, 495, 430, 494, 495, 491, - 494, 489, 478, 490, 496, 494, 429, 496, 428, 497, - 497, 495, 497, 498, 499, 493, 498, 499, 500, 501, - 502, 500, 501, 502, 523, 545, 427, 523, 545, 548, - 426, 548, 548, 549, 425, 549, 549, 550, 424, 550, - 550, 549, 548, 423, 422, 550, 551, 496, 551, 551, - 571, 501, 552, 571, 552, 552, 421, 418, 498, 499, - - 552, 500, 417, 571, 553, 502, 553, 553, 416, 523, - 545, 554, 553, 554, 554, 555, 415, 555, 555, 554, - 556, 414, 556, 556, 557, 413, 557, 557, 558, 412, - 558, 558, 559, 411, 559, 559, 560, 410, 560, 560, - 555, 409, 408, 561, 560, 561, 561, 407, 562, 572, - 562, 562, 572, 406, 405, 558, 562, 572, 563, 559, - 563, 563, 564, 561, 564, 564, 565, 404, 565, 565, - 566, 403, 566, 566, 567, 402, 567, 567, 568, 401, - 568, 568, 569, 574, 569, 569, 574, 343, 570, 564, - 570, 570, 573, 575, 576, 573, 575, 576, 342, 341, - - 573, 575, 576, 565, 577, 578, 567, 577, 578, 568, - 579, 580, 577, 579, 580, 581, 582, 583, 581, 582, - 583, 584, 340, 585, 584, 583, 585, 569, 339, 586, - 578, 585, 586, 570, 587, 588, 589, 587, 588, 589, - 336, 584, 581, 582, 590, 592, 591, 590, 592, 591, - 593, 335, 628, 593, 628, 628, 629, 334, 629, 629, - 628, 587, 630, 333, 630, 630, 631, 645, 631, 631, - 645, 632, 588, 632, 632, 645, 590, 591, 633, 646, - 633, 633, 646, 634, 647, 634, 634, 647, 332, 648, - 592, 634, 648, 331, 635, 593, 635, 635, 636, 330, - - 636, 636, 635, 329, 328, 637, 636, 637, 637, 638, - 327, 638, 638, 639, 326, 639, 639, 640, 325, 640, - 640, 641, 638, 641, 641, 640, 642, 324, 642, 642, - 643, 323, 643, 643, 644, 649, 644, 644, 649, 650, - 651, 652, 650, 651, 652, 322, 321, 653, 651, 652, - 653, 654, 320, 655, 654, 653, 655, 656, 319, 642, - 656, 657, 658, 641, 657, 658, 655, 659, 660, 657, - 659, 660, 643, 661, 678, 313, 661, 678, 681, 308, - 681, 681, 682, 307, 682, 682, 683, 305, 683, 683, - 684, 304, 684, 684, 685, 690, 685, 685, 690, 303, - - 659, 300, 685, 686, 658, 686, 686, 299, 298, 687, - 660, 687, 687, 297, 688, 687, 688, 688, 689, 678, - 689, 689, 691, 692, 693, 691, 692, 693, 694, 695, - 697, 694, 695, 697, 696, 698, 694, 696, 698, 701, - 696, 705, 701, 707, 705, 708, 707, 708, 708, 296, - 709, 689, 709, 709, 710, 295, 710, 710, 711, 688, - 711, 711, 712, 713, 712, 712, 713, 715, 698, 714, - 715, 716, 714, 717, 716, 697, 717, 719, 722, 294, - 719, 722, 709, 293, 701, 292, 705, 724, 707, 724, - 724, 725, 291, 725, 725, 726, 290, 726, 726, 710, - - 289, 714, 727, 711, 727, 727, 728, 712, 729, 728, - 730, 729, 715, 730, 731, 288, 716, 731, 717, 287, - 724, 286, 719, 722, 735, 285, 735, 735, 736, 737, - 736, 736, 737, 738, 284, 741, 738, 741, 741, 728, - 726, 742, 283, 745, 742, 745, 745, 727, 749, 746, - 749, 749, 746, 282, 750, 730, 749, 750, 753, 731, - 753, 753, 750, 735, 754, 279, 208, 754, 737, 206, - 203, 202, 200, 199, 197, 192, 188, 741, 745, 187, - 185, 184, 183, 742, 746, 756, 756, 756, 756, 756, - 756, 757, 757, 757, 757, 757, 757, 758, 758, 758, - - 758, 758, 758, 759, 759, 759, 759, 759, 759, 760, - 760, 760, 760, 760, 760, 761, 761, 761, 761, 761, - 761, 762, 762, 762, 762, 762, 762, 763, 763, 763, - 763, 763, 763, 764, 764, 764, 764, 764, 764, 765, - 765, 180, 765, 765, 765, 766, 766, 766, 766, 766, - 766, 767, 178, 177, 173, 767, 767, 768, 768, 768, - 768, 768, 768, 769, 769, 172, 171, 769, 769, 770, - 770, 770, 170, 770, 770, 771, 771, 169, 771, 771, - 771, 772, 772, 168, 772, 772, 772, 773, 773, 167, - 166, 165, 773, 774, 774, 164, 774, 774, 774, 776, - - 776, 163, 162, 161, 776, 777, 777, 777, 777, 777, - 777, 778, 778, 160, 159, 158, 778, 779, 779, 157, - 779, 779, 779, 156, 155, 149, 143, 142, 139, 138, - 137, 135, 134, 130, 129, 128, 127, 126, 124, 121, - 118, 117, 112, 111, 110, 108, 107, 103, 102, 101, - 100, 99, 70, 67, 65, 64, 62, 60, 58, 55, - 50, 47, 44, 43, 38, 37, 36, 34, 33, 29, - 28, 27, 26, 25, 23, 19, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755, 755, 755, 755, 755, 755, - 755, 755, 755, 755, 755 + 221, 226, 226, 252, 685, 249, 222, 223, 249, 227, + 224, 227, 227, 684, 249, 683, 226, 228, 227, 228, + 228, 682, 229, 225, 229, 229, 230, 251, 230, 230, + 251, 231, 229, 231, 231, 232, 251, 232, 232, 681, + 233, 230, 233, 233, 234, 228, 234, 234, 231, 680, + 235, 231, 235, 235, 236, 679, 236, 236, 237, 678, + 237, 237, 238, 254, 238, 238, 254, 677, 640, 232, + 240, 238, 240, 240, 235, 235, 239, 638, 239, 239, + 241, 637, 241, 241, 242, 236, 242, 242, 636, 635, + + 254, 237, 244, 244, 244, 244, 634, 239, 246, 246, + 246, 246, 248, 253, 632, 248, 253, 240, 255, 248, + 256, 255, 257, 256, 630, 257, 253, 239, 258, 629, + 259, 258, 241, 259, 260, 262, 628, 260, 262, 261, + 263, 255, 261, 263, 257, 256, 622, 621, 261, 258, + 263, 260, 264, 265, 266, 264, 265, 266, 259, 268, + 620, 268, 268, 262, 268, 269, 270, 264, 269, 270, + 265, 271, 272, 265, 271, 272, 274, 273, 619, 274, + 273, 272, 275, 276, 299, 275, 276, 299, 266, 269, + 269, 277, 277, 277, 277, 618, 309, 270, 273, 309, + + 310, 617, 616, 310, 271, 311, 311, 311, 311, 316, + 316, 615, 316, 274, 317, 317, 614, 317, 273, 338, + 338, 613, 338, 339, 275, 612, 339, 345, 345, 611, + 345, 346, 346, 610, 346, 347, 347, 609, 347, 316, + 349, 608, 349, 349, 317, 350, 607, 350, 350, 351, + 606, 351, 351, 352, 605, 352, 352, 353, 374, 353, + 353, 374, 349, 556, 351, 555, 353, 354, 339, 354, + 354, 553, 350, 345, 352, 552, 355, 346, 355, 355, + 354, 347, 356, 550, 356, 356, 357, 549, 357, 357, + 358, 548, 358, 358, 359, 546, 359, 359, 355, 375, + + 545, 356, 375, 358, 359, 360, 375, 360, 360, 544, + 543, 361, 357, 361, 361, 542, 539, 362, 360, 362, + 362, 363, 361, 363, 363, 364, 376, 364, 364, 376, + 365, 362, 365, 365, 538, 366, 537, 366, 366, 367, + 379, 367, 367, 379, 536, 365, 366, 363, 376, 534, + 533, 364, 368, 368, 368, 368, 369, 532, 369, 369, + 370, 379, 370, 370, 371, 377, 371, 371, 377, 372, + 367, 372, 372, 373, 378, 373, 373, 378, 380, 530, + 381, 380, 382, 381, 529, 382, 528, 380, 371, 378, + 527, 383, 377, 381, 383, 384, 385, 370, 384, 385, + + 526, 369, 525, 386, 382, 372, 386, 524, 523, 385, + 383, 373, 387, 386, 389, 387, 388, 389, 522, 388, + 390, 384, 521, 390, 520, 387, 391, 388, 389, 391, + 392, 393, 394, 392, 393, 394, 395, 397, 395, 395, + 397, 395, 393, 519, 518, 392, 390, 396, 396, 517, + 396, 398, 391, 399, 398, 400, 399, 401, 400, 402, + 401, 516, 402, 394, 400, 403, 423, 423, 403, 423, + 424, 448, 448, 424, 448, 515, 450, 399, 401, 450, + 454, 514, 397, 454, 456, 456, 513, 456, 398, 458, + 458, 460, 458, 460, 460, 402, 512, 461, 401, 461, + + 461, 489, 460, 403, 489, 462, 511, 462, 462, 463, + 510, 463, 463, 461, 455, 424, 464, 463, 464, 464, + 465, 450, 465, 465, 466, 454, 466, 466, 489, 485, + 456, 462, 485, 453, 467, 458, 467, 467, 452, 451, + 485, 465, 470, 464, 470, 470, 468, 467, 468, 468, + 466, 447, 446, 469, 468, 469, 469, 471, 445, 471, + 471, 469, 472, 492, 472, 472, 492, 473, 470, 473, + 473, 474, 444, 474, 474, 472, 492, 443, 442, 471, + 475, 473, 475, 475, 476, 441, 476, 476, 475, 477, + 440, 477, 477, 478, 486, 478, 478, 486, 474, 439, + + 476, 479, 479, 479, 479, 480, 487, 480, 480, 487, + 486, 481, 477, 481, 481, 482, 438, 482, 482, 483, + 437, 483, 483, 484, 436, 484, 484, 488, 490, 435, + 488, 490, 487, 434, 491, 488, 478, 491, 493, 494, + 495, 493, 494, 495, 433, 496, 493, 494, 496, 490, + 480, 483, 497, 432, 499, 497, 481, 499, 482, 498, + 491, 500, 498, 431, 500, 497, 495, 496, 484, 500, + 430, 501, 502, 498, 501, 502, 503, 504, 504, 503, + 504, 499, 505, 506, 429, 505, 506, 501, 507, 508, + 509, 507, 508, 509, 531, 502, 554, 531, 557, 554, + + 557, 557, 558, 428, 558, 558, 559, 427, 559, 559, + 558, 557, 426, 560, 559, 560, 560, 425, 422, 503, + 581, 508, 561, 581, 561, 561, 584, 505, 506, 584, + 561, 507, 421, 581, 562, 509, 562, 562, 420, 531, + 419, 554, 562, 563, 418, 563, 563, 564, 417, 564, + 564, 563, 565, 416, 565, 565, 566, 415, 566, 566, + 567, 414, 567, 567, 568, 413, 568, 568, 569, 412, + 569, 569, 564, 411, 410, 570, 569, 570, 570, 409, + 571, 582, 571, 571, 582, 408, 407, 567, 571, 582, + 572, 568, 572, 572, 573, 570, 573, 573, 574, 406, + + 574, 574, 575, 405, 575, 575, 576, 404, 576, 576, + 577, 344, 577, 577, 578, 588, 578, 578, 588, 574, + 579, 573, 579, 579, 580, 583, 580, 580, 583, 585, + 343, 589, 585, 583, 589, 586, 342, 585, 586, 575, + 588, 587, 577, 586, 587, 578, 341, 590, 591, 587, + 590, 591, 592, 593, 594, 592, 593, 594, 340, 595, + 596, 593, 595, 596, 337, 579, 336, 595, 597, 580, + 598, 597, 335, 598, 594, 591, 334, 599, 600, 592, + 599, 600, 602, 601, 603, 602, 601, 603, 333, 604, + 660, 598, 604, 660, 641, 597, 641, 641, 642, 332, + + 642, 642, 641, 643, 331, 643, 643, 644, 661, 644, + 644, 661, 330, 602, 599, 601, 645, 329, 645, 645, + 646, 328, 646, 646, 647, 327, 647, 647, 648, 603, + 648, 648, 647, 326, 604, 649, 648, 649, 649, 650, + 325, 650, 650, 649, 651, 324, 651, 651, 652, 323, + 652, 652, 653, 322, 653, 653, 654, 651, 654, 654, + 653, 655, 321, 655, 655, 656, 320, 656, 656, 654, + 657, 319, 657, 657, 658, 659, 658, 658, 659, 662, + 313, 663, 662, 659, 663, 664, 665, 666, 664, 665, + 666, 308, 307, 667, 665, 666, 667, 668, 656, 305, + + 668, 667, 669, 655, 670, 669, 671, 670, 672, 671, + 673, 672, 657, 673, 671, 669, 674, 675, 304, 674, + 675, 672, 676, 695, 303, 676, 695, 698, 300, 698, + 698, 699, 298, 699, 699, 700, 297, 700, 700, 701, + 296, 701, 701, 702, 708, 702, 702, 708, 295, 674, + 294, 702, 673, 703, 709, 703, 703, 709, 704, 675, + 704, 704, 706, 293, 706, 706, 704, 705, 695, 705, + 705, 292, 707, 705, 707, 707, 710, 711, 712, 710, + 711, 712, 713, 291, 714, 713, 712, 714, 715, 290, + 716, 715, 714, 716, 715, 717, 721, 726, 717, 721, + + 726, 728, 289, 288, 728, 707, 729, 706, 729, 729, + 730, 735, 730, 730, 735, 731, 287, 731, 731, 732, + 286, 732, 732, 733, 285, 733, 733, 734, 717, 734, + 734, 736, 284, 737, 736, 716, 737, 738, 283, 282, + 738, 721, 726, 279, 208, 739, 728, 731, 739, 740, + 742, 745, 740, 742, 745, 747, 206, 747, 747, 748, + 751, 748, 748, 751, 732, 737, 203, 749, 733, 749, + 749, 750, 734, 750, 750, 752, 753, 754, 752, 753, + 754, 758, 738, 758, 758, 202, 200, 199, 747, 759, + 739, 759, 759, 751, 740, 742, 745, 760, 761, 197, + + 760, 761, 764, 765, 764, 764, 765, 768, 769, 768, + 768, 769, 749, 192, 188, 772, 750, 772, 772, 187, + 758, 753, 754, 772, 773, 185, 776, 773, 776, 776, + 777, 184, 773, 777, 183, 180, 760, 178, 177, 173, + 171, 170, 768, 769, 764, 765, 779, 779, 779, 779, + 779, 779, 780, 780, 780, 780, 780, 780, 781, 781, + 781, 781, 781, 781, 782, 782, 782, 782, 782, 782, + 783, 783, 783, 783, 783, 783, 784, 784, 784, 784, + 784, 784, 785, 785, 785, 785, 785, 785, 786, 786, + 786, 786, 786, 786, 787, 787, 787, 787, 787, 787, + + 788, 788, 169, 788, 788, 788, 789, 789, 789, 789, + 789, 789, 790, 168, 167, 166, 790, 790, 791, 791, + 791, 791, 791, 791, 792, 792, 165, 164, 792, 792, + 793, 793, 793, 163, 793, 793, 794, 794, 162, 794, + 794, 794, 795, 795, 161, 795, 795, 795, 796, 796, + 160, 159, 158, 796, 797, 797, 157, 797, 797, 797, + 799, 799, 156, 155, 149, 799, 800, 800, 800, 800, + 800, 800, 801, 801, 143, 142, 139, 801, 802, 802, + 138, 802, 802, 802, 137, 135, 134, 130, 129, 128, + 127, 126, 124, 121, 118, 117, 112, 111, 110, 108, + + 107, 103, 102, 101, 100, 99, 70, 67, 65, 64, + 62, 60, 58, 55, 50, 47, 44, 43, 38, 37, + 36, 34, 33, 29, 28, 27, 26, 25, 23, 19, + 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778, 778, + 778, 778, 778, 778, 778, 778, 778, 778, 778 } ; /* Table of booleans, true if rule could match eol. */ -static yyconst flex_int32_t yy_rule_can_match_eol[61] = +static yyconst flex_int32_t yy_rule_can_match_eol[62] = { 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 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, 1, 0, - 0, }; + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, + 0, 0, }; static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; @@ -1249,7 +1269,7 @@ static void settext(bool trim_right = false, int strip_trailing = 0) -#line 1253 "levcomp.lex.cc" +#line 1273 "levcomp.lex.cc" #define INITIAL 0 #define MAPDEF 1 @@ -1416,7 +1436,7 @@ YY_DECL #line 89 "levcomp.lpp" -#line 1420 "levcomp.lex.cc" +#line 1440 "levcomp.lex.cc" if ( !(yy_init) ) { @@ -1470,13 +1490,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 756 ) + if ( yy_current_state >= 779 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 755 ); + while ( yy_current_state != 778 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1776,7 +1796,7 @@ YY_RULE_SETUP case 42: YY_RULE_SETUP #line 191 "levcomp.lpp" -return CHANCE; +{ BEGIN(ARGUMENT); return WELCOME; } YY_BREAK case 43: YY_RULE_SETUP @@ -1786,7 +1806,7 @@ return CHANCE; case 44: YY_RULE_SETUP #line 193 "levcomp.lpp" -{ BEGIN(KEYWORDS); return TAGS; } +return CHANCE; YY_BREAK case 45: YY_RULE_SETUP @@ -1796,84 +1816,89 @@ YY_RULE_SETUP case 46: YY_RULE_SETUP #line 195 "levcomp.lpp" -{ BEGIN(ITEM_LIST); return SUBST; } +{ BEGIN(KEYWORDS); return TAGS; } YY_BREAK case 47: YY_RULE_SETUP #line 196 "levcomp.lpp" -{ BEGIN(ITEM_LIST); return NSUBST; } +{ BEGIN(ITEM_LIST); return SUBST; } YY_BREAK case 48: YY_RULE_SETUP #line 197 "levcomp.lpp" -{ BEGIN(MNAME); return MONS; } +{ BEGIN(ITEM_LIST); return NSUBST; } YY_BREAK case 49: YY_RULE_SETUP #line 198 "levcomp.lpp" -{ BEGIN(ITEM_LIST); return ITEM; } +{ BEGIN(MNAME); return MONS; } YY_BREAK case 50: YY_RULE_SETUP #line 199 "levcomp.lpp" -{ BEGIN(TOEOL); return MARKER; } +{ BEGIN(ITEM_LIST); return ITEM; } YY_BREAK case 51: YY_RULE_SETUP #line 200 "levcomp.lpp" -{ BEGIN(ITEM_LIST); return SHUFFLE; } +{ BEGIN(TOEOL); return MARKER; } YY_BREAK case 52: YY_RULE_SETUP -#line 202 "levcomp.lpp" -{ BEGIN(ARGUMENT); return KFEAT; } +#line 201 "levcomp.lpp" +{ BEGIN(ITEM_LIST); return SHUFFLE; } YY_BREAK case 53: YY_RULE_SETUP #line 203 "levcomp.lpp" -{ BEGIN(ARGUMENT); return KITEM; } +{ BEGIN(ARGUMENT); return KFEAT; } YY_BREAK case 54: YY_RULE_SETUP #line 204 "levcomp.lpp" -{ BEGIN(ARGUMENT); return KMONS; } +{ BEGIN(ARGUMENT); return KITEM; } YY_BREAK case 55: YY_RULE_SETUP -#line 206 "levcomp.lpp" -return COMMA; +#line 205 "levcomp.lpp" +{ BEGIN(ARGUMENT); return KMONS; } YY_BREAK case 56: YY_RULE_SETUP -#line 208 "levcomp.lpp" +#line 207 "levcomp.lpp" +return COMMA; + YY_BREAK +case 57: +YY_RULE_SETUP +#line 209 "levcomp.lpp" { clean(); yylval.i = atoi(yytext); return INTEGER; } YY_BREAK -case 57: -YY_RULE_SETUP -#line 214 "levcomp.lpp" -; - YY_BREAK case 58: -/* rule 58 can match eol */ YY_RULE_SETUP #line 215 "levcomp.lpp" ; YY_BREAK case 59: +/* rule 59 can match eol */ YY_RULE_SETUP #line 216 "levcomp.lpp" -return CHARACTER; +; YY_BREAK case 60: YY_RULE_SETUP -#line 218 "levcomp.lpp" +#line 217 "levcomp.lpp" +return CHARACTER; + YY_BREAK +case 61: +YY_RULE_SETUP +#line 219 "levcomp.lpp" ECHO; YY_BREAK -#line 1877 "levcomp.lex.cc" +#line 1902 "levcomp.lex.cc" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(MAPDEF): case YY_STATE_EOF(LUA): @@ -2167,7 +2192,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 756 ) + if ( yy_current_state >= 779 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2195,11 +2220,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 756 ) + if ( yy_current_state >= 779 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 755); + yy_is_jam = (yy_current_state == 778); return yy_is_jam ? 0 : yy_current_state; } @@ -2621,7 +2646,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) /** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. - * @param str a NUL-terminated string to scan + * @param yystr a NUL-terminated string to scan * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use @@ -2878,7 +2903,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 218 "levcomp.lpp" +#line 219 "levcomp.lpp" diff --git a/crawl-ref/source/prebuilt/levcomp.tab.cc b/crawl-ref/source/prebuilt/levcomp.tab.cc index f162035030..27a769fedc 100644 --- a/crawl-ref/source/prebuilt/levcomp.tab.cc +++ b/crawl-ref/source/prebuilt/levcomp.tab.cc @@ -86,14 +86,15 @@ VALIDATE = 275, VETO = 276, NSUBST = 277, - COMMA = 278, - INTEGER = 279, - CHARACTER = 280, - STRING = 281, - MAP_LINE = 282, - MONSTER_NAME = 283, - ITEM_INFO = 284, - LUA_LINE = 285 + WELCOME = 278, + COMMA = 279, + INTEGER = 280, + CHARACTER = 281, + STRING = 282, + MAP_LINE = 283, + MONSTER_NAME = 284, + ITEM_INFO = 285, + LUA_LINE = 286 }; #endif /* Tokens. */ @@ -117,14 +118,15 @@ #define VALIDATE 275 #define VETO 276 #define NSUBST 277 -#define COMMA 278 -#define INTEGER 279 -#define CHARACTER 280 -#define STRING 281 -#define MAP_LINE 282 -#define MONSTER_NAME 283 -#define ITEM_INFO 284 -#define LUA_LINE 285 +#define WELCOME 278 +#define COMMA 279 +#define INTEGER 280 +#define CHARACTER 281 +#define STRING 282 +#define MAP_LINE 283 +#define MONSTER_NAME 284 +#define ITEM_INFO 285 +#define LUA_LINE 286 @@ -202,7 +204,7 @@ typedef union YYSTYPE raw_range range; } /* Line 193 of yacc.c. */ -#line 206 "levcomp.tab.c" +#line 208 "levcomp.tab.c" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -215,7 +217,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 219 "levcomp.tab.c" +#line 221 "levcomp.tab.c" #ifdef short # undef short @@ -430,20 +432,20 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 56 +#define YYLAST 58 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 31 +#define YYNTOKENS 32 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 60 +#define YYNNTS 61 /* YYNRULES -- Number of rules. */ -#define YYNRULES 103 +#define YYNRULES 105 /* YYNRULES -- Number of states. */ -#define YYNSTATES 116 +#define YYNSTATES 119 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 -#define YYMAXUTOK 285 +#define YYMAXUTOK 286 #define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) @@ -479,7 +481,7 @@ static const yytype_uint8 yytranslate[] = 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30 + 25, 26, 27, 28, 29, 30, 31 }; #if YYDEBUG @@ -490,43 +492,44 @@ static const yytype_uint8 yyprhs[] = 0, 0, 3, 5, 6, 9, 11, 13, 15, 17, 19, 22, 25, 26, 29, 31, 33, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, - 62, 64, 66, 68, 70, 72, 74, 77, 78, 81, - 83, 86, 87, 90, 92, 95, 96, 99, 101, 104, - 105, 108, 110, 113, 114, 117, 119, 121, 124, 126, - 129, 131, 134, 137, 139, 143, 145, 148, 149, 152, - 154, 155, 159, 161, 162, 165, 167, 170, 172, 176, - 178, 181, 183, 187, 189, 191, 194, 198, 200, 202, - 204, 207, 211, 213, 215, 218, 220, 223, 226, 228, - 231, 233, 236, 238 + 62, 64, 66, 68, 70, 72, 74, 76, 79, 80, + 83, 85, 88, 89, 92, 94, 97, 98, 101, 103, + 106, 107, 110, 112, 115, 116, 119, 121, 123, 126, + 128, 131, 133, 136, 139, 141, 145, 147, 150, 151, + 154, 156, 157, 161, 163, 164, 167, 169, 172, 174, + 178, 180, 183, 185, 189, 191, 193, 196, 200, 202, + 204, 206, 209, 213, 215, 217, 220, 222, 225, 228, + 230, 233, 236, 238, 241, 243 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int8 yyrhs[] = { - 32, 0, -1, 33, -1, -1, 33, 34, -1, 36, - -1, 38, -1, 25, -1, 37, -1, 43, -1, 3, - 26, -1, 41, 39, -1, -1, 39, 40, -1, 42, - -1, 88, -1, 10, 26, -1, 84, -1, 85, -1, - 86, -1, 87, -1, 81, -1, 78, -1, 67, -1, - 75, -1, 72, -1, 61, -1, 64, -1, 58, -1, - 60, -1, 59, -1, 46, -1, 55, -1, 49, -1, - 52, -1, 35, -1, 19, 44, -1, -1, 44, 45, - -1, 30, -1, 19, 47, -1, -1, 47, 48, -1, - 30, -1, 20, 50, -1, -1, 50, 51, -1, 30, - -1, 21, 53, -1, -1, 53, 54, -1, 30, -1, - 18, 56, -1, -1, 56, 57, -1, 30, -1, 7, - -1, 7, 26, -1, 9, -1, 9, 26, -1, 8, - -1, 8, 26, -1, 4, 62, -1, 63, -1, 62, - 23, 63, -1, 29, -1, 6, 65, -1, -1, 65, - 66, -1, 26, -1, -1, 17, 68, 69, -1, 70, - -1, -1, 70, 71, -1, 26, -1, 22, 73, -1, - 74, -1, 73, 23, 74, -1, 29, -1, 5, 76, - -1, 77, -1, 77, 23, 76, -1, 29, -1, 16, - -1, 16, 79, -1, 79, 23, 80, -1, 80, -1, - 29, -1, 15, -1, 15, 82, -1, 83, 23, 82, - -1, 83, -1, 28, -1, 13, 26, -1, 11, -1, - 11, 26, -1, 14, 24, -1, 12, -1, 12, 26, - -1, 89, -1, 89, 90, -1, 90, -1, 27, -1 + 33, 0, -1, 34, -1, -1, 34, 35, -1, 37, + -1, 39, -1, 26, -1, 38, -1, 44, -1, 3, + 27, -1, 42, 40, -1, -1, 40, 41, -1, 43, + -1, 90, -1, 10, 27, -1, 85, -1, 86, -1, + 87, -1, 88, -1, 89, -1, 82, -1, 79, -1, + 68, -1, 76, -1, 73, -1, 62, -1, 65, -1, + 59, -1, 61, -1, 60, -1, 47, -1, 56, -1, + 50, -1, 53, -1, 36, -1, 19, 45, -1, -1, + 45, 46, -1, 31, -1, 19, 48, -1, -1, 48, + 49, -1, 31, -1, 20, 51, -1, -1, 51, 52, + -1, 31, -1, 21, 54, -1, -1, 54, 55, -1, + 31, -1, 18, 57, -1, -1, 57, 58, -1, 31, + -1, 7, -1, 7, 27, -1, 9, -1, 9, 27, + -1, 8, -1, 8, 27, -1, 4, 63, -1, 64, + -1, 63, 24, 64, -1, 30, -1, 6, 66, -1, + -1, 66, 67, -1, 27, -1, -1, 17, 69, 70, + -1, 71, -1, -1, 71, 72, -1, 27, -1, 22, + 74, -1, 75, -1, 74, 24, 75, -1, 30, -1, + 5, 77, -1, 78, -1, 78, 24, 77, -1, 30, + -1, 16, -1, 16, 80, -1, 80, 24, 81, -1, + 81, -1, 30, -1, 15, -1, 15, 83, -1, 84, + 24, 83, -1, 84, -1, 29, -1, 13, 27, -1, + 11, -1, 11, 27, -1, 14, 25, -1, 12, -1, + 12, 27, -1, 23, 27, -1, 91, -1, 91, 92, + -1, 92, -1, 28, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -535,14 +538,14 @@ static const yytype_uint16 yyrline[] = 0, 66, 66, 69, 70, 73, 74, 77, 83, 84, 87, 97, 119, 120, 123, 124, 127, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, - 164, 165, 166, 167, 168, 169, 172, 174, 175, 178, - 183, 185, 186, 189, 194, 196, 197, 200, 205, 207, - 208, 211, 216, 218, 219, 222, 227, 228, 236, 237, - 245, 246, 254, 257, 258, 261, 269, 272, 273, 276, - 286, 285, 296, 298, 299, 302, 314, 317, 318, 321, - 330, 333, 334, 337, 346, 347, 350, 351, 354, 362, - 363, 366, 367, 370, 379, 388, 389, 398, 406, 407, - 416, 419, 420, 423 + 164, 165, 166, 167, 168, 169, 170, 173, 175, 176, + 179, 184, 186, 187, 190, 195, 197, 198, 201, 206, + 208, 209, 212, 217, 219, 220, 223, 228, 229, 237, + 238, 246, 247, 255, 258, 259, 262, 270, 273, 274, + 277, 287, 286, 297, 299, 300, 303, 315, 318, 319, + 322, 331, 334, 335, 338, 347, 348, 351, 352, 355, + 363, 364, 367, 368, 371, 380, 389, 390, 399, 407, + 408, 417, 426, 429, 430, 433 }; #endif @@ -554,8 +557,8 @@ static const char *const yytname[] = "$end", "error", "$undefined", "DEFAULT_DEPTH", "SHUFFLE", "SUBST", "TAGS", "KFEAT", "KITEM", "KMONS", "NAME", "DEPTH", "ORIENT", "PLACE", "CHANCE", "MONS", "ITEM", "MARKER", "PRELUDE", "MAIN", "VALIDATE", - "VETO", "NSUBST", "COMMA", "INTEGER", "CHARACTER", "STRING", "MAP_LINE", - "MONSTER_NAME", "ITEM_INFO", "LUA_LINE", "$accept", "file", + "VETO", "NSUBST", "WELCOME", "COMMA", "INTEGER", "CHARACTER", "STRING", + "MAP_LINE", "MONSTER_NAME", "ITEM_INFO", "LUA_LINE", "$accept", "file", "definitions", "definition", "error_seq", "def", "defdepth", "level", "map_specs", "map_spec", "name", "metaline", "global_lua", "global_lua_lines", "global_lua_line", "main_lua", "main_lua_lines", @@ -567,7 +570,8 @@ static const char *const yytname[] = "mspec_segments", "mspec_segment", "nsubst", "nsubst_specifiers", "nsubst_spec", "subst", "subst_specifiers", "subst_spec", "items", "item_specifiers", "item_specifier", "mons", "mnames", "mname", "place", - "depth", "chance", "orientation", "map_def", "map_lines", "map_line", 0 + "depth", "chance", "orientation", "welcome", "map_def", "map_lines", + "map_line", 0 }; #endif @@ -579,24 +583,24 @@ static const yytype_uint16 yytoknum[] = 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, - 285 + 285, 286 }; # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ static const yytype_uint8 yyr1[] = { - 0, 31, 32, 33, 33, 34, 34, 35, 36, 36, - 37, 38, 39, 39, 40, 40, 41, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 42, 43, 44, 44, 45, - 46, 47, 47, 48, 49, 50, 50, 51, 52, 53, - 53, 54, 55, 56, 56, 57, 58, 58, 59, 59, - 60, 60, 61, 62, 62, 63, 64, 65, 65, 66, - 68, 67, 69, 70, 70, 71, 72, 73, 73, 74, - 75, 76, 76, 77, 78, 78, 79, 79, 80, 81, - 81, 82, 82, 83, 84, 85, 85, 86, 87, 87, - 88, 89, 89, 90 + 0, 32, 33, 34, 34, 35, 35, 36, 37, 37, + 38, 39, 40, 40, 41, 41, 42, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 43, 43, 43, + 43, 43, 43, 43, 43, 43, 43, 44, 45, 45, + 46, 47, 48, 48, 49, 50, 51, 51, 52, 53, + 54, 54, 55, 56, 57, 57, 58, 59, 59, 60, + 60, 61, 61, 62, 63, 63, 64, 65, 66, 66, + 67, 69, 68, 70, 71, 71, 72, 73, 74, 74, + 75, 76, 77, 77, 78, 79, 79, 80, 80, 81, + 82, 82, 83, 83, 84, 85, 86, 86, 87, 88, + 88, 89, 90, 91, 91, 92 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -605,14 +609,14 @@ static const yytype_uint8 yyr2[] = 0, 2, 1, 0, 2, 1, 1, 1, 1, 1, 2, 2, 0, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 0, 2, 1, - 2, 0, 2, 1, 2, 0, 2, 1, 2, 0, - 2, 1, 2, 0, 2, 1, 1, 2, 1, 2, - 1, 2, 2, 1, 3, 1, 2, 0, 2, 1, - 0, 3, 1, 0, 2, 1, 2, 1, 3, 1, - 2, 1, 3, 1, 1, 2, 3, 1, 1, 1, - 2, 3, 1, 1, 2, 1, 2, 2, 1, 2, - 1, 2, 1, 1 + 1, 1, 1, 1, 1, 1, 1, 2, 0, 2, + 1, 2, 0, 2, 1, 2, 0, 2, 1, 2, + 0, 2, 1, 2, 0, 2, 1, 1, 2, 1, + 2, 1, 2, 2, 1, 3, 1, 2, 0, 2, + 1, 0, 3, 1, 0, 2, 1, 2, 1, 3, + 1, 2, 1, 3, 1, 1, 2, 3, 1, 1, + 1, 2, 3, 1, 1, 2, 1, 2, 2, 1, + 2, 2, 1, 2, 1, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -620,59 +624,61 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 3, 0, 2, 1, 0, 0, 37, 4, 5, 8, - 6, 12, 9, 10, 16, 36, 11, 39, 38, 0, - 0, 67, 56, 60, 58, 95, 98, 0, 0, 89, - 84, 70, 53, 41, 45, 49, 0, 7, 103, 35, - 13, 14, 31, 33, 34, 32, 28, 30, 29, 26, - 27, 23, 25, 24, 22, 21, 17, 18, 19, 20, - 15, 100, 102, 65, 62, 63, 83, 80, 81, 66, - 57, 61, 59, 96, 99, 94, 97, 93, 90, 92, - 88, 85, 87, 73, 52, 40, 44, 48, 79, 76, - 77, 101, 0, 0, 69, 68, 0, 0, 71, 72, - 55, 54, 43, 42, 47, 46, 51, 50, 0, 64, - 82, 91, 86, 75, 74, 78 + 3, 0, 2, 1, 0, 0, 38, 4, 5, 8, + 6, 12, 9, 10, 16, 37, 11, 40, 39, 0, + 0, 68, 57, 61, 59, 96, 99, 0, 0, 90, + 85, 71, 54, 42, 46, 50, 0, 0, 7, 105, + 36, 13, 14, 32, 34, 35, 33, 29, 31, 30, + 27, 28, 24, 26, 25, 23, 22, 17, 18, 19, + 20, 21, 15, 102, 104, 66, 63, 64, 84, 81, + 82, 67, 58, 62, 60, 97, 100, 95, 98, 94, + 91, 93, 89, 86, 88, 74, 53, 41, 45, 49, + 80, 77, 78, 101, 103, 0, 0, 70, 69, 0, + 0, 72, 73, 56, 55, 44, 43, 48, 47, 52, + 51, 0, 65, 83, 92, 87, 76, 75, 79 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int8 yydefgoto[] = { - -1, 1, 2, 7, 39, 8, 9, 10, 16, 40, - 11, 41, 12, 15, 18, 42, 85, 103, 43, 86, - 105, 44, 87, 107, 45, 84, 101, 46, 47, 48, - 49, 64, 65, 50, 69, 95, 51, 83, 98, 99, - 114, 52, 89, 90, 53, 67, 68, 54, 81, 82, - 55, 78, 79, 56, 57, 58, 59, 60, 61, 62 + -1, 1, 2, 7, 40, 8, 9, 10, 16, 41, + 11, 42, 12, 15, 18, 43, 87, 106, 44, 88, + 108, 45, 89, 110, 46, 86, 104, 47, 48, 49, + 50, 66, 67, 51, 71, 98, 52, 85, 101, 102, + 117, 53, 91, 92, 54, 69, 70, 55, 83, 84, + 56, 80, 81, 57, 58, 59, 60, 61, 62, 63, + 64 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -63 +#define YYPACT_NINF -64 static const yytype_int8 yypact[] = { - -63, 6, 16, -63, -6, -2, -63, -63, -63, -63, - -63, -63, -63, -63, -63, -8, -4, -63, -63, -1, - 0, -63, 1, 4, 5, 7, 8, 10, 13, -3, - 3, -63, -63, -63, -63, -63, 9, -63, -63, -63, - -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, - -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, - -63, 12, -63, -63, 17, -63, -63, -63, 18, 19, - -63, -63, -63, -63, -63, -63, -63, -63, -63, 20, - -63, 21, -63, -63, 22, 23, 24, 25, -63, 26, - -63, -63, -1, 0, -63, -63, -3, 3, -63, 30, - -63, -63, -63, -63, -63, -63, -63, -63, 9, -63, - -63, -63, -63, -63, -63, -63 + -64, 6, 17, -64, -6, -2, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -8, -4, -64, -64, -1, + 0, -64, 1, 4, 5, 7, 8, 10, 13, -3, + 3, -64, -64, -64, -64, -64, 9, 14, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, 12, -64, -64, 18, -64, -64, -64, + 19, 20, -64, -64, -64, -64, -64, -64, -64, -64, + -64, 21, -64, 22, -64, -64, 23, 24, 25, 26, + -64, 27, -64, -64, -64, -1, 0, -64, -64, -3, + 3, -64, 31, -64, -64, -64, -64, -64, -64, -64, + -64, 9, -64, -64, -64, -64, -64, -64, -64 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { - -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, - -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, - -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, - -63, -63, -50, -63, -63, -63, -63, -63, -63, -63, - -63, -63, -63, -62, -63, -46, -63, -63, -63, -49, - -63, -45, -63, -63, -63, -63, -63, -63, -63, -11 + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -51, -64, -64, -64, -64, -64, -64, -64, + -64, -64, -64, -63, -64, -47, -64, -64, -64, -50, + -64, -46, -64, -64, -64, -64, -64, -64, -64, -64, + -11 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -683,39 +689,39 @@ static const yytype_int8 yypgoto[] = static const yytype_uint8 yytable[] = { 19, 20, 21, 22, 23, 24, 3, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 4, - 13, 37, 17, 38, 14, 77, 5, 70, 63, 66, - 71, 72, 80, 73, 74, 6, 75, 76, 88, 38, - 92, 93, 109, 96, 97, 94, 115, 110, 112, 108, - 91, 111, 100, 102, 104, 106, 113 + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 4, 13, 38, 17, 39, 14, 79, 5, 72, 65, + 68, 73, 74, 82, 75, 76, 6, 77, 78, 90, + 39, 93, 95, 96, 112, 99, 100, 97, 118, 113, + 115, 111, 94, 114, 103, 105, 107, 109, 116 }; static const yytype_uint8 yycheck[] = { 4, 5, 6, 7, 8, 9, 0, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, 22, 3, - 26, 25, 30, 27, 26, 28, 10, 26, 29, 29, - 26, 26, 29, 26, 26, 19, 26, 24, 29, 27, - 23, 23, 92, 23, 23, 26, 108, 93, 97, 23, - 61, 96, 30, 30, 30, 30, 26 + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 3, 27, 26, 31, 28, 27, 29, 10, 27, 30, + 30, 27, 27, 30, 27, 27, 19, 27, 25, 30, + 28, 27, 24, 24, 95, 24, 24, 27, 111, 96, + 100, 24, 63, 99, 31, 31, 31, 31, 27 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { - 0, 32, 33, 0, 3, 10, 19, 34, 36, 37, - 38, 41, 43, 26, 26, 44, 39, 30, 45, 4, + 0, 33, 34, 0, 3, 10, 19, 35, 37, 38, + 39, 42, 44, 27, 27, 45, 40, 31, 46, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 25, 27, 35, - 40, 42, 46, 49, 52, 55, 58, 59, 60, 61, - 64, 67, 72, 75, 78, 81, 84, 85, 86, 87, - 88, 89, 90, 29, 62, 63, 29, 76, 77, 65, - 26, 26, 26, 26, 26, 26, 24, 28, 82, 83, - 29, 79, 80, 68, 56, 47, 50, 53, 29, 73, - 74, 90, 23, 23, 26, 66, 23, 23, 69, 70, - 30, 57, 30, 48, 30, 51, 30, 54, 23, 63, - 76, 82, 80, 26, 71, 74 + 16, 17, 18, 19, 20, 21, 22, 23, 26, 28, + 36, 41, 43, 47, 50, 53, 56, 59, 60, 61, + 62, 65, 68, 73, 76, 79, 82, 85, 86, 87, + 88, 89, 90, 91, 92, 30, 63, 64, 30, 77, + 78, 66, 27, 27, 27, 27, 27, 27, 25, 29, + 83, 84, 30, 80, 81, 69, 57, 48, 51, 54, + 30, 74, 75, 27, 92, 24, 24, 27, 67, 24, + 24, 70, 71, 31, 58, 31, 49, 31, 52, 31, + 55, 24, 64, 77, 83, 81, 27, 72, 75 }; #define yyerrok (yyerrstatus = 0) @@ -1650,18 +1656,13 @@ yyreduce: } break; - case 35: -#line 169 "levcomp.ypp" - {} - break; - case 36: -#line 172 "levcomp.ypp" - { } +#line 170 "levcomp.ypp" + {} break; case 37: -#line 174 "levcomp.ypp" +#line 173 "levcomp.ypp" { } break; @@ -1671,19 +1672,19 @@ yyreduce: break; case 39: -#line 179 "levcomp.ypp" - { - lc_global_prelude.add(yylineno, (yyvsp[(1) - (1)].text)); - } +#line 176 "levcomp.ypp" + { } break; case 40: -#line 183 "levcomp.ypp" - { } +#line 180 "levcomp.ypp" + { + lc_global_prelude.add(yylineno, (yyvsp[(1) - (1)].text)); + } break; case 41: -#line 185 "levcomp.ypp" +#line 184 "levcomp.ypp" { } break; @@ -1693,19 +1694,19 @@ yyreduce: break; case 43: -#line 190 "levcomp.ypp" - { - lc_map.main.add(yylineno, (yyvsp[(1) - (1)].text)); - } +#line 187 "levcomp.ypp" + { } break; case 44: -#line 194 "levcomp.ypp" - { } +#line 191 "levcomp.ypp" + { + lc_map.main.add(yylineno, (yyvsp[(1) - (1)].text)); + } break; case 45: -#line 196 "levcomp.ypp" +#line 195 "levcomp.ypp" { } break; @@ -1715,19 +1716,19 @@ yyreduce: break; case 47: -#line 201 "levcomp.ypp" - { - lc_map.validate.add(yylineno, (yyvsp[(1) - (1)].text)); - } +#line 198 "levcomp.ypp" + { } break; case 48: -#line 205 "levcomp.ypp" - { } +#line 202 "levcomp.ypp" + { + lc_map.validate.add(yylineno, (yyvsp[(1) - (1)].text)); + } break; case 49: -#line 207 "levcomp.ypp" +#line 206 "levcomp.ypp" { } break; @@ -1737,19 +1738,19 @@ yyreduce: break; case 51: -#line 212 "levcomp.ypp" - { - lc_map.veto.add(yylineno, (yyvsp[(1) - (1)].text)); - } +#line 209 "levcomp.ypp" + { } break; case 52: -#line 216 "levcomp.ypp" - { } +#line 213 "levcomp.ypp" + { + lc_map.veto.add(yylineno, (yyvsp[(1) - (1)].text)); + } break; case 53: -#line 218 "levcomp.ypp" +#line 217 "levcomp.ypp" { } break; @@ -1759,19 +1760,24 @@ yyreduce: break; case 55: -#line 223 "levcomp.ypp" +#line 220 "levcomp.ypp" + { } + break; + + case 56: +#line 224 "levcomp.ypp" { lc_map.prelude.add(yylineno, (yyvsp[(1) - (1)].text)); } break; - case 56: -#line 227 "levcomp.ypp" + case 57: +#line 228 "levcomp.ypp" { } break; - case 57: -#line 229 "levcomp.ypp" + case 58: +#line 230 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1780,13 +1786,13 @@ yyreduce: } break; - case 58: -#line 236 "levcomp.ypp" + case 59: +#line 237 "levcomp.ypp" { } break; - case 59: -#line 238 "levcomp.ypp" + case 60: +#line 239 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1795,13 +1801,13 @@ yyreduce: } break; - case 60: -#line 245 "levcomp.ypp" + case 61: +#line 246 "levcomp.ypp" { } break; - case 61: -#line 247 "levcomp.ypp" + case 62: +#line 248 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1810,13 +1816,13 @@ yyreduce: } break; - case 62: -#line 254 "levcomp.ypp" + case 63: +#line 255 "levcomp.ypp" {} break; - case 65: -#line 262 "levcomp.ypp" + case 66: +#line 263 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1825,13 +1831,13 @@ yyreduce: } break; - case 66: -#line 269 "levcomp.ypp" + case 67: +#line 270 "levcomp.ypp" {} break; - case 69: -#line 277 "levcomp.ypp" + case 70: +#line 278 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1840,23 +1846,23 @@ yyreduce: } break; - case 70: -#line 286 "levcomp.ypp" + case 71: +#line 287 "levcomp.ypp" { lc_map.main.add(yylineno, "marker("); start_marker_segment = true; } break; - case 71: -#line 291 "levcomp.ypp" + case 72: +#line 292 "levcomp.ypp" { lc_map.main.add(yylineno, ")"); } break; - case 75: -#line 303 "levcomp.ypp" + case 76: +#line 304 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1868,13 +1874,13 @@ yyreduce: } break; - case 76: -#line 314 "levcomp.ypp" + case 77: +#line 315 "levcomp.ypp" { } break; - case 79: -#line 322 "levcomp.ypp" + case 80: +#line 323 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1883,13 +1889,13 @@ yyreduce: } break; - case 80: -#line 330 "levcomp.ypp" + case 81: +#line 331 "levcomp.ypp" { } break; - case 83: -#line 338 "levcomp.ypp" + case 84: +#line 339 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1898,18 +1904,18 @@ yyreduce: } break; - case 84: -#line 346 "levcomp.ypp" + case 85: +#line 347 "levcomp.ypp" {} break; - case 85: -#line 347 "levcomp.ypp" + case 86: +#line 348 "levcomp.ypp" {} break; - case 88: -#line 355 "levcomp.ypp" + case 89: +#line 356 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1918,18 +1924,18 @@ yyreduce: } break; - case 89: -#line 362 "levcomp.ypp" + case 90: +#line 363 "levcomp.ypp" {} break; - case 90: -#line 363 "levcomp.ypp" + case 91: +#line 364 "levcomp.ypp" {} break; - case 93: -#line 371 "levcomp.ypp" + case 94: +#line 372 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1938,8 +1944,8 @@ yyreduce: } break; - case 94: -#line 380 "levcomp.ypp" + case 95: +#line 381 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1948,13 +1954,13 @@ yyreduce: } break; - case 95: -#line 388 "levcomp.ypp" + case 96: +#line 389 "levcomp.ypp" {} break; - case 96: -#line 390 "levcomp.ypp" + case 97: +#line 391 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1963,8 +1969,8 @@ yyreduce: } break; - case 97: -#line 399 "levcomp.ypp" + case 98: +#line 400 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1972,13 +1978,13 @@ yyreduce: } break; - case 98: -#line 406 "levcomp.ypp" + case 99: +#line 407 "levcomp.ypp" {} break; - case 99: -#line 408 "levcomp.ypp" + case 100: +#line 409 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1987,8 +1993,18 @@ yyreduce: } break; - case 103: -#line 424 "levcomp.ypp" + case 101: +#line 418 "levcomp.ypp" + { + lc_map.main.add( + yylineno, + make_stringf("welcome(\"%s\")", + quote_lua_string((yyvsp[(2) - (2)].text)).c_str())); + } + break; + + case 105: +#line 434 "levcomp.ypp" { lc_map.main.add( yylineno, @@ -1999,7 +2015,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2003 "levcomp.tab.c" +#line 2019 "levcomp.tab.c" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2213,6 +2229,6 @@ yyreturn: } -#line 432 "levcomp.ypp" +#line 442 "levcomp.ypp" diff --git a/crawl-ref/source/prebuilt/levcomp.tab.h b/crawl-ref/source/prebuilt/levcomp.tab.h index c270bb0f82..edd969eb0a 100644 --- a/crawl-ref/source/prebuilt/levcomp.tab.h +++ b/crawl-ref/source/prebuilt/levcomp.tab.h @@ -59,14 +59,15 @@ VALIDATE = 275, VETO = 276, NSUBST = 277, - COMMA = 278, - INTEGER = 279, - CHARACTER = 280, - STRING = 281, - MAP_LINE = 282, - MONSTER_NAME = 283, - ITEM_INFO = 284, - LUA_LINE = 285 + WELCOME = 278, + COMMA = 279, + INTEGER = 280, + CHARACTER = 281, + STRING = 282, + MAP_LINE = 283, + MONSTER_NAME = 284, + ITEM_INFO = 285, + LUA_LINE = 286 }; #endif /* Tokens. */ @@ -90,14 +91,15 @@ #define VALIDATE 275 #define VETO 276 #define NSUBST 277 -#define COMMA 278 -#define INTEGER 279 -#define CHARACTER 280 -#define STRING 281 -#define MAP_LINE 282 -#define MONSTER_NAME 283 -#define ITEM_INFO 284 -#define LUA_LINE 285 +#define WELCOME 278 +#define COMMA 279 +#define INTEGER 280 +#define CHARACTER 281 +#define STRING 282 +#define MAP_LINE 283 +#define MONSTER_NAME 284 +#define ITEM_INFO 285 +#define LUA_LINE 286 @@ -111,7 +113,7 @@ typedef union YYSTYPE raw_range range; } /* Line 1529 of yacc.c. */ -#line 115 "levcomp.tab.h" +#line 117 "levcomp.tab.h" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 |