summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/prebuilt
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-26 11:30:02 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-26 11:30:02 +0000
commitdae15d11b2a27f9310bf49f0e421fd267f713f28 (patch)
treeb1aef85eaddde16e75225c41e40841df644095b4 /crawl-ref/source/prebuilt
parentf2a19d9971bb076f4a80a9e41ba601bc862d0fdf (diff)
downloadcrawl-ref-dae15d11b2a27f9310bf49f0e421fd267f713f28.tar.gz
crawl-ref-dae15d11b2a27f9310bf49f0e421fd267f713f28.zip
Update level compiler.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1931 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/prebuilt')
-rw-r--r--crawl-ref/source/prebuilt/levcomp.lex.cc1598
-rw-r--r--crawl-ref/source/prebuilt/levcomp.tab.cc379
-rw-r--r--crawl-ref/source/prebuilt/levcomp.tab.h2
3 files changed, 1018 insertions, 961 deletions
diff --git a/crawl-ref/source/prebuilt/levcomp.lex.cc b/crawl-ref/source/prebuilt/levcomp.lex.cc
index a82f1e59bd..dcf0ac96b5 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 58
-#define YY_END_OF_BUFFER 59
+#define YY_NUM_RULES 60
+#define YY_END_OF_BUFFER 61
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -386,90 +386,91 @@ struct yy_trans_info
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static yyconst flex_int16_t yy_accept[747] =
+static yyconst flex_int16_t yy_accept[756] =
{ 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 59, 57, 55, 56,
- 57, 53, 54, 57, 57, 57, 57, 57, 57, 57,
- 57, 57, 57, 57, 57, 57, 55, 27, 29, 57,
- 57, 57, 57, 57, 57, 58, 6, 58, 58, 4,
- 2, 3, 58, 2, 2, 2, 2, 9, 10, 58,
- 9, 9, 58, 12, 58, 57, 26, 57, 53, 54,
- 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
- 57, 57, 57, 27, 29, 57, 57, 57, 57, 57,
- 57, 57, 24, 21, 24, 23, 54, 57, 57, 57,
-
- 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
- 24, 27, 29, 57, 57, 57, 57, 57, 57, 14,
- 15, 57, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 14, 13, 13,
- 13, 13, 13, 17, 19, 20, 58, 18, 55, 56,
- 54, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 55,
- 27, 29, 0, 0, 0, 0, 27, 0, 0, 0,
- 0, 0, 0, 0, 32, 6, 5, 0, 0, 2,
- 3, 2, 0, 2, 2, 2, 2, 9, 9, 10,
-
- 9, 9, 9, 0, 11, 12, 25, 0, 26, 25,
+ 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,
+ 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,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 57, 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,
+
+ 2, 9, 9, 10, 9, 9, 9, 0, 11, 12,
+ 25, 0, 26, 25, 25, 25, 25, 25, 25, 25,
25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
- 25, 25, 25, 25, 25, 25, 25, 25, 25, 27,
- 25, 25, 25, 25, 25, 25, 25, 25, 0, 24,
- 21, 24, 21, 54, 0, 0, 0, 0, 0, 0,
+ 25, 25, 25, 29, 25, 25, 25, 25, 25, 25,
+ 25, 25, 0, 24, 21, 24, 21, 56, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 24, 27, 0, 0, 0, 0, 0, 0,
- 0, 32, 14, 15, 0, 15, 13, 13, 13, 13,
+ 0, 0, 0, 0, 0, 0, 24, 29, 0, 0,
+ 0, 0, 0, 0, 0, 34, 14, 15, 0, 15,
+ 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, 14, 13, 13, 13,
- 13, 13, 13, 13, 16, 0, 19, 20, 0, 0,
+ 14, 13, 13, 13, 13, 13, 13, 13, 16, 0,
+ 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, 0, 2, 9, 9, 9, 7, 25, 25,
+ 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,
- 25, 25, 22, 22, 22, 22, 22, 22, 22, 22,
+ 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, 0, 0, 0, 0, 0,
+ 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 13, 13, 13, 13, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 28, 0, 0, 0, 0, 0,
- 2, 9, 8, 9, 7, 25, 25, 25, 25, 25,
+ 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, 25, 25, 25,
- 25, 25, 25, 0, 0, 25, 25, 25, 25, 22,
+ 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, 0, 0, 22,
- 22, 22, 22, 13, 13, 13, 13, 13, 13, 13,
+ 22, 22, 22, 22, 22, 22, 0, 0, 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, 0, 0, 0, 47, 0, 0,
- 0, 0, 46, 35, 0, 0, 0, 0, 0, 43,
- 0, 0, 31, 0, 0, 0, 0, 2, 25, 25,
+ 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,
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,
+ 25, 25, 25, 25, 25, 25, 25, 25, 0, 25,
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,
+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+ 22, 0, 22, 13, 13, 13, 13, 13, 13, 13,
- 0, 37, 42, 50, 51, 52, 0, 0, 0, 39,
- 0, 44, 0, 0, 0, 0, 34, 1, 25, 25,
+ 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,
25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
- 25, 25, 25, 25, 25, 22, 22, 22, 22, 22,
+ 25, 25, 25, 25, 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, 40, 48, 45, 38, 0, 41, 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, 49, 0, 0, 0, 0, 25, 25,
-
- 0, 25, 25, 22, 22, 0, 22, 22, 13, 13,
- 0, 30, 0, 0, 25, 25, 0, 25, 22, 22,
- 0, 22, 13, 0, 33, 25, 25, 22, 22, 13,
- 0, 25, 22, 13, 0, 25, 22, 13, 0, 25,
- 22, 13, 36, 25, 22, 0
+ 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
} ;
static yyconst flex_int32_t yy_ec[256] =
@@ -483,11 +484,11 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
20, 27, 28, 29, 30, 20, 31, 20, 20, 20,
- 1, 1, 1, 1, 20, 1, 32, 20, 20, 33,
+ 1, 32, 1, 1, 20, 1, 33, 20, 20, 34,
- 34, 35, 20, 36, 37, 20, 20, 38, 20, 20,
- 39, 40, 20, 41, 42, 43, 44, 45, 20, 20,
- 20, 20, 46, 1, 47, 1, 1, 1, 1, 1,
+ 35, 36, 20, 37, 38, 20, 20, 39, 20, 20,
+ 40, 41, 20, 42, 43, 44, 45, 46, 20, 20,
+ 20, 20, 47, 1, 48, 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,
@@ -504,633 +505,654 @@ static yyconst flex_int32_t yy_ec[256] =
1, 1, 1, 1, 1
} ;
-static yyconst flex_int32_t yy_meta[48] =
+static yyconst flex_int32_t yy_meta[49] =
{ 0,
1, 2, 3, 4, 1, 1, 5, 6, 6, 1,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
- 6, 6, 6, 6, 6, 1, 1
+ 6, 1, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 6, 6, 6, 6, 6, 1, 1
} ;
-static yyconst flex_int16_t yy_base[766] =
+static yyconst flex_int16_t yy_base[780] =
{ 0,
- 0, 46, 54, 59, 51, 63, 46, 67, 110, 156,
- 202, 248, 294, 340, 73, 92, 1893, 1894, 77, 1894,
- 1889, 1894, 1882, 1872, 1874, 1866, 1858, 84, 62, 57,
- 1859, 1863, 72, 1873, 1868, 1848, 385, 0, 1894, 148,
- 1837, 1839, 30, 49, 1833, 1894, 1894, 1875, 160, 1894,
- 0, 1894, 1874, 165, 0, 1852, 145, 1828, 1894, 1871,
- 62, 1826, 1869, 1894, 1868, 170, 1894, 1867, 176, 180,
- 255, 259, 263, 347, 351, 364, 360, 356, 392, 397,
- 186, 274, 401, 278, 405, 415, 432, 437, 441, 445,
- 449, 0, 453, 1894, 457, 1894, 1860, 1850, 1852, 1844,
-
- 1836, 176, 175, 78, 1837, 1841, 153, 1851, 1846, 1826,
- 463, 248, 0, 245, 1815, 1817, 239, 243, 1811, 467,
- 1894, 1853, 0, 1846, 1836, 1838, 1830, 1822, 268, 332,
- 165, 1823, 1827, 329, 1837, 1832, 1812, 482, 368, 1801,
- 1803, 331, 366, 264, 486, 1894, 1840, 1894, 379, 1894,
- 1833, 1830, 1814, 1825, 1817, 1816, 1801, 1801, 1798, 1800,
- 1795, 1784, 1794, 1801, 1776, 1788, 1778, 1770, 1753, 0,
- 0, 1894, 1733, 1735, 379, 1729, 0, 395, 1732, 1693,
- 1715, 406, 1687, 1681, 1894, 1894, 1894, 1720, 470, 0,
- 1894, 0, 1718, 477, 1706, 1695, 362, 1669, 1654, 1894,
-
- 386, 1653, 491, 1683, 1894, 1894, 495, 499, 1894, 503,
- 509, 513, 517, 521, 525, 529, 539, 543, 547, 551,
- 555, 561, 571, 579, 584, 588, 593, 597, 602, 606,
- 611, 615, 619, 623, 631, 637, 641, 646, 504, 653,
- 1894, 657, 1894, 661, 567, 662, 589, 663, 667, 647,
- 669, 675, 530, 681, 685, 687, 694, 693, 695, 707,
- 706, 708, 0, 712, 724, 716, 725, 726, 730, 731,
- 736, 624, 742, 1894, 1675, 1894, 0, 1661, 1657, 1638,
- 1643, 1625, 1620, 1604, 1603, 1590, 1589, 1576, 1552, 1545,
- 1548, 1528, 1540, 1533, 1523, 1503, 0, 535, 1502, 1496,
-
- 1515, 421, 1477, 1454, 737, 747, 752, 1894, 1482, 1452,
- 1443, 1446, 1436, 1444, 1435, 1422, 1420, 1412, 1421, 1420,
- 1413, 1400, 1391, 1362, 1352, 1355, 1335, 758, 760, 1322,
- 1324, 1312, 1299, 1307, 765, 771, 775, 1894, 779, 784,
- 788, 792, 796, 806, 812, 821, 825, 829, 833, 844,
- 850, 856, 860, 864, 869, 873, 877, 885, 889, 893,
- 897, 902, 780, 838, 898, 906, 907, 797, 865, 908,
- 912, 916, 923, 924, 928, 940, 941, 942, 947, 948,
- 954, 955, 959, 965, 960, 967, 972, 977, 976, 978,
- 984, 1302, 1293, 1301, 1282, 1293, 1283, 1269, 1271, 1260,
-
- 1269, 1268, 1261, 1259, 1251, 1232, 1228, 1233, 1213, 988,
- 990, 1201, 1212, 1196, 1189, 1211, 1188, 1166, 1178, 1149,
- 1153, 1129, 1133, 1134, 1130, 1102, 1105, 1106, 1101, 1083,
- 1101, 1084, 1049, 998, 1894, 992, 1042, 1040, 1050, 1002,
- 1063, 1006, 1894, 1011, 1894, 1015, 1022, 1027, 1037, 1041,
- 1052, 1057, 1061, 1067, 1076, 1085, 1090, 1094, 1099, 1103,
- 1114, 1118, 1047, 1123, 1129, 1133, 1137, 1141, 1145, 1020,
- 1032, 1149, 1150, 1077, 1157, 1156, 1095, 1161, 1162, 1168,
- 1163, 1180, 1181, 1187, 1188, 1151, 1197, 1198, 1202, 1203,
- 1207, 1209, 1208, 1060, 1050, 1032, 1034, 1006, 1007, 993,
-
- 997, 1000, 992, 968, 961, 969, 957, 919, 928, 914,
- 876, 872, 882, 1213, 881, 875, 874, 1894, 873, 847,
- 846, 824, 1894, 1894, 821, 812, 829, 810, 818, 1894,
- 795, 781, 1894, 776, 772, 1215, 749, 765, 1217, 1221,
- 1225, 1232, 1242, 1253, 1260, 1264, 1269, 1273, 1277, 1281,
- 1285, 1292, 1297, 1307, 1311, 1315, 1319, 1323, 1327, 1331,
- 1337, 1238, 1298, 1341, 1062, 1342, 1352, 1353, 1343, 1332,
- 1359, 1363, 1364, 1369, 1373, 1371, 1380, 1382, 1384, 1386,
- 1392, 1394, 1396, 1398, 772, 765, 761, 756, 754, 748,
- 713, 705, 693, 710, 681, 691, 664, 653, 652, 649,
-
- 669, 1894, 1894, 1894, 1894, 1894, 634, 630, 621, 1894,
- 615, 1894, 612, 575, 580, 560, 1894, 582, 1400, 1404,
- 1410, 1414, 1419, 1425, 1429, 1433, 1443, 1447, 1452, 1456,
- 1460, 1464, 1469, 1473, 1477, 1478, 1415, 1482, 1484, 1488,
- 1489, 1490, 1494, 1496, 1500, 1506, 1507, 1508, 1512, 1517,
- 1518, 1522, 569, 567, 558, 557, 535, 536, 499, 503,
- 481, 1894, 1894, 1894, 1894, 506, 1894, 502, 1523, 468,
- 493, 1527, 1531, 1535, 1539, 1543, 1552, 1558, 1563, 1568,
- 1544, 1569, 1573, 1574, 1575, 1579, 1581, 1585, 1586, 482,
- 444, 1590, 404, 1894, 399, 1591, 378, 1592, 1596, 1601,
-
- 1606, 1610, 1614, 1602, 1620, 1619, 1621, 1625, 385, 1627,
- 382, 1894, 1637, 366, 1641, 1645, 1653, 1657, 1646, 1639,
- 1661, 1667, 374, 352, 1894, 1672, 1677, 1682, 1683, 332,
- 305, 1687, 1688, 301, 256, 1692, 1693, 236, 241, 1700,
- 1704, 167, 1894, 1713, 1706, 1894, 1731, 1737, 1743, 1749,
- 1755, 1761, 1767, 1773, 1779, 1785, 1791, 1797, 1803, 1809,
- 1815, 102, 1821, 1827, 1833
+ 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,
+ 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,
+ 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
} ;
-static yyconst flex_int16_t yy_def[766] =
+static yyconst flex_int16_t yy_def[780] =
{ 0,
- 746, 1, 747, 748, 749, 749, 750, 750, 746, 9,
- 746, 11, 746, 13, 751, 751, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 752, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 753, 746,
- 754, 746, 746, 755, 754, 754, 754, 756, 746, 746,
- 756, 756, 757, 746, 746, 758, 746, 746, 758, 758,
- 758, 758, 758, 758, 758, 758, 758, 758, 758, 758,
- 758, 758, 758, 759, 758, 758, 758, 758, 758, 758,
- 758, 760, 746, 746, 746, 746, 760, 760, 760, 760,
-
- 760, 760, 760, 760, 760, 760, 760, 760, 760, 760,
- 37, 761, 760, 760, 760, 760, 760, 760, 760, 746,
- 746, 746, 762, 762, 762, 762, 762, 762, 762, 762,
- 762, 762, 762, 762, 762, 762, 762, 37, 762, 762,
- 762, 762, 762, 763, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 37,
- 752, 746, 746, 746, 746, 746, 752, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 754,
- 746, 754, 746, 754, 754, 754, 754, 756, 756, 746,
-
- 756, 756, 756, 757, 746, 746, 758, 758, 746, 758,
- 758, 758, 758, 758, 758, 758, 758, 758, 758, 758,
- 758, 758, 758, 758, 758, 758, 758, 758, 759, 759,
- 758, 758, 758, 758, 758, 758, 758, 758, 764, 746,
- 746, 746, 746, 764, 764, 764, 764, 764, 764, 764,
- 764, 764, 764, 764, 764, 764, 764, 764, 764, 764,
- 764, 764, 111, 765, 764, 764, 764, 764, 764, 764,
- 764, 764, 746, 746, 746, 746, 762, 762, 762, 762,
- 762, 762, 762, 762, 762, 762, 762, 762, 762, 762,
- 762, 762, 762, 762, 762, 762, 138, 762, 762, 762,
-
- 762, 762, 762, 762, 763, 763, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 754, 756, 756, 756, 746, 758, 758,
- 758, 758, 758, 758, 758, 758, 758, 758, 758, 758,
- 758, 758, 758, 758, 758, 758, 758, 758, 758, 758,
- 758, 758, 764, 764, 764, 764, 764, 764, 764, 764,
- 764, 764, 764, 764, 764, 764, 764, 764, 764, 764,
- 764, 764, 765, 764, 764, 764, 764, 764, 764, 764,
- 764, 762, 762, 762, 762, 762, 762, 762, 762, 762,
-
- 762, 762, 762, 762, 762, 762, 762, 762, 762, 762,
- 762, 762, 762, 762, 762, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 754, 756, 746, 756, 746, 758, 758, 758, 758, 758,
- 758, 758, 758, 758, 758, 758, 758, 758, 758, 758,
- 758, 758, 758, 758, 758, 758, 758, 758, 758, 764,
- 764, 764, 764, 764, 764, 764, 764, 764, 764, 764,
- 764, 764, 764, 764, 764, 764, 764, 764, 764, 764,
- 764, 764, 764, 762, 762, 762, 762, 762, 762, 762,
-
- 762, 762, 762, 762, 762, 762, 762, 762, 762, 762,
- 762, 762, 762, 762, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 754, 758, 758,
- 758, 758, 758, 758, 758, 758, 758, 758, 758, 758,
- 758, 758, 758, 758, 758, 758, 758, 758, 758, 758,
- 758, 764, 764, 764, 764, 764, 764, 764, 764, 764,
- 764, 764, 764, 764, 764, 764, 764, 764, 764, 764,
- 764, 764, 764, 764, 762, 762, 762, 762, 762, 762,
- 762, 762, 762, 762, 762, 762, 762, 762, 762, 762,
-
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 754, 758, 758,
- 758, 758, 758, 758, 758, 758, 758, 758, 758, 758,
- 758, 758, 758, 758, 758, 764, 764, 764, 764, 764,
- 764, 764, 764, 764, 764, 764, 764, 764, 764, 764,
- 764, 764, 762, 762, 762, 762, 762, 762, 762, 762,
- 762, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 754, 758, 758, 758, 758, 758, 758, 758, 758, 758,
- 764, 764, 764, 764, 764, 764, 764, 764, 764, 762,
- 762, 762, 762, 746, 746, 746, 746, 746, 758, 758,
-
- 758, 758, 758, 764, 764, 764, 764, 764, 762, 762,
- 746, 746, 746, 746, 758, 758, 758, 758, 764, 764,
- 764, 764, 762, 746, 746, 758, 758, 764, 764, 762,
- 746, 758, 764, 762, 746, 758, 764, 762, 746, 758,
- 764, 762, 746, 758, 764, 0, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746
+ 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,
+ 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, 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,
+ 778, 778, 778, 778, 778, 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, 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, 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
} ;
-static yyconst flex_int16_t yy_nxt[1942] =
+static yyconst flex_int16_t yy_nxt[2026] =
{ 0,
- 18, 19, 20, 21, 19, 18, 22, 18, 23, 18,
- 18, 18, 24, 25, 18, 26, 18, 18, 27, 18,
- 28, 18, 29, 30, 31, 32, 18, 33, 34, 18,
- 35, 18, 36, 18, 18, 18, 18, 18, 18, 18,
- 18, 18, 18, 18, 18, 18, 18, 37, 64, 65,
- 37, 38, 181, 59, 60, 39, 47, 48, 49, 50,
- 46, 52, 53, 54, 55, 59, 60, 161, 40, 64,
- 65, 182, 159, 56, 145, 146, 147, 145, 149, 148,
- 183, 149, 184, 41, 162, 42, 160, 43, 254, 165,
- 44, 45, 61, 145, 146, 147, 145, 62, 148, 156,
-
- 57, 166, 157, 201, 61, 255, 158, 277, 202, 62,
- 66, 19, 67, 68, 19, 66, 69, 66, 70, 66,
- 66, 66, 71, 72, 66, 73, 66, 66, 74, 66,
- 75, 66, 76, 77, 78, 79, 66, 80, 81, 66,
- 82, 66, 83, 66, 66, 66, 66, 66, 66, 66,
- 66, 66, 66, 66, 66, 66, 66, 37, 178, 196,
- 37, 84, 186, 188, 189, 85, 187, 191, 193, 194,
- 258, 208, 160, 208, 208, 288, 743, 208, 86, 208,
- 208, 208, 259, 208, 208, 252, 197, 208, 210, 208,
- 208, 249, 289, 87, 250, 88, 226, 89, 251, 253,
-
- 90, 91, 92, 93, 94, 95, 93, 92, 96, 92,
- 97, 92, 92, 92, 98, 99, 92, 100, 92, 92,
- 101, 92, 102, 92, 103, 104, 105, 106, 92, 107,
- 108, 92, 109, 92, 110, 92, 92, 92, 92, 92,
- 92, 92, 92, 92, 92, 92, 92, 92, 92, 111,
- 743, 177, 111, 112, 177, 265, 208, 113, 208, 208,
- 208, 268, 208, 208, 208, 306, 208, 208, 306, 253,
- 114, 742, 211, 212, 270, 208, 271, 208, 208, 230,
- 269, 230, 230, 283, 213, 115, 284, 116, 227, 117,
- 285, 739, 118, 119, 18, 120, 121, 122, 120, 18,
-
- 22, 123, 124, 18, 123, 123, 125, 126, 123, 127,
- 123, 123, 128, 123, 129, 123, 130, 131, 132, 133,
- 123, 134, 135, 123, 136, 123, 137, 123, 123, 123,
- 123, 123, 123, 123, 123, 123, 123, 123, 123, 18,
- 18, 138, 286, 738, 138, 38, 292, 735, 208, 39,
- 208, 208, 208, 301, 208, 208, 287, 208, 293, 208,
- 208, 208, 139, 208, 208, 208, 215, 208, 208, 216,
- 220, 734, 302, 217, 218, 214, 196, 140, 298, 141,
- 149, 142, 222, 149, 143, 45, 170, 221, 219, 170,
- 171, 731, 287, 208, 172, 208, 208, 303, 208, 304,
-
- 208, 208, 208, 197, 208, 208, 208, 730, 208, 208,
- 183, 725, 184, 223, 224, 724, 208, 723, 208, 208,
- 328, 317, 173, 712, 174, 231, 225, 201, 181, 175,
- 176, 711, 202, 208, 228, 208, 208, 710, 208, 219,
- 208, 208, 208, 301, 208, 208, 208, 182, 208, 208,
- 208, 709, 208, 208, 240, 241, 242, 240, 242, 243,
- 242, 242, 302, 234, 263, 241, 242, 263, 273, 274,
- 275, 273, 186, 188, 189, 232, 236, 233, 237, 191,
- 193, 194, 235, 297, 274, 275, 297, 307, 308, 309,
- 307, 694, 337, 338, 238, 337, 208, 671, 208, 208,
-
- 208, 698, 208, 208, 208, 239, 208, 208, 239, 695,
- 208, 210, 208, 208, 208, 694, 208, 208, 208, 339,
- 208, 208, 208, 693, 208, 208, 208, 341, 208, 208,
- 208, 239, 208, 208, 239, 342, 692, 335, 340, 343,
- 208, 691, 208, 208, 208, 667, 208, 208, 208, 690,
- 208, 208, 208, 373, 208, 208, 208, 344, 208, 208,
- 410, 399, 208, 345, 208, 208, 665, 664, 239, 346,
- 347, 239, 208, 348, 208, 208, 663, 365, 662, 350,
- 208, 351, 208, 208, 349, 208, 671, 208, 208, 208,
- 239, 208, 208, 239, 208, 353, 208, 208, 208, 367,
-
- 208, 208, 670, 230, 354, 230, 230, 230, 352, 230,
- 230, 355, 208, 669, 208, 208, 208, 668, 208, 208,
- 208, 667, 208, 208, 208, 239, 208, 208, 239, 666,
- 665, 356, 208, 360, 208, 208, 357, 346, 208, 664,
- 208, 208, 208, 663, 208, 208, 358, 208, 239, 208,
- 208, 239, 359, 234, 240, 241, 242, 240, 242, 241,
- 242, 242, 239, 239, 239, 239, 239, 239, 239, 364,
- 239, 239, 235, 239, 361, 370, 239, 368, 662, 239,
- 661, 369, 239, 362, 660, 239, 239, 366, 239, 239,
- 659, 239, 658, 371, 239, 239, 239, 239, 239, 239,
-
- 612, 372, 657, 374, 377, 376, 379, 239, 239, 239,
- 239, 239, 239, 264, 375, 177, 264, 239, 177, 610,
- 239, 656, 378, 380, 381, 239, 239, 239, 239, 239,
- 239, 239, 239, 655, 239, 239, 387, 239, 306, 654,
- 239, 306, 382, 273, 274, 275, 273, 385, 306, 384,
- 372, 306, 388, 307, 308, 309, 307, 606, 386, 434,
- 435, 436, 434, 605, 436, 604, 442, 443, 390, 442,
- 603, 389, 444, 445, 602, 444, 337, 338, 391, 337,
- 208, 239, 208, 208, 239, 208, 653, 208, 208, 208,
- 618, 208, 208, 208, 617, 208, 208, 208, 239, 208,
-
- 208, 239, 446, 616, 448, 437, 450, 208, 615, 208,
- 208, 335, 447, 208, 449, 208, 208, 335, 614, 473,
- 451, 199, 208, 613, 208, 208, 208, 612, 208, 208,
- 208, 611, 208, 208, 208, 452, 208, 208, 610, 239,
- 609, 453, 239, 455, 456, 208, 364, 208, 208, 608,
- 607, 208, 454, 208, 208, 606, 605, 208, 457, 208,
- 208, 208, 458, 208, 208, 208, 239, 208, 208, 239,
- 208, 459, 208, 208, 208, 474, 208, 208, 464, 435,
- 208, 464, 604, 603, 602, 462, 465, 460, 208, 465,
- 208, 461, 208, 208, 208, 601, 208, 208, 208, 239,
-
- 208, 208, 239, 208, 463, 208, 208, 239, 239, 239,
- 239, 239, 239, 239, 600, 599, 239, 239, 357, 598,
- 239, 470, 475, 472, 239, 239, 467, 239, 239, 239,
- 466, 597, 239, 468, 471, 476, 477, 530, 479, 480,
- 469, 239, 239, 239, 239, 239, 239, 596, 239, 239,
- 478, 239, 239, 482, 481, 239, 239, 483, 239, 239,
- 264, 489, 177, 264, 489, 177, 488, 435, 239, 488,
- 486, 239, 595, 239, 484, 485, 239, 239, 239, 239,
- 239, 239, 239, 594, 593, 239, 487, 387, 239, 434,
- 435, 436, 434, 436, 436, 592, 436, 384, 388, 434,
-
- 435, 524, 434, 536, 491, 490, 536, 442, 443, 523,
- 442, 591, 444, 445, 492, 444, 208, 389, 208, 208,
- 590, 239, 493, 208, 239, 208, 208, 539, 208, 589,
- 208, 208, 562, 239, 588, 437, 239, 437, 208, 540,
- 208, 208, 208, 518, 208, 208, 542, 537, 208, 563,
- 208, 208, 199, 208, 541, 208, 208, 199, 208, 587,
- 208, 208, 208, 239, 208, 208, 239, 586, 208, 543,
- 208, 208, 585, 538, 544, 546, 547, 208, 239, 208,
- 208, 239, 535, 534, 545, 548, 208, 533, 208, 208,
- 556, 208, 532, 208, 208, 208, 239, 208, 208, 239,
-
- 208, 531, 208, 208, 208, 566, 208, 208, 551, 569,
- 530, 529, 549, 550, 552, 208, 528, 208, 208, 208,
- 527, 208, 208, 554, 464, 435, 208, 464, 526, 525,
- 465, 553, 208, 465, 208, 555, 208, 208, 208, 524,
- 208, 208, 208, 523, 208, 208, 560, 522, 208, 560,
- 239, 239, 239, 239, 239, 239, 521, 239, 239, 565,
- 239, 239, 239, 239, 239, 239, 239, 239, 578, 239,
- 570, 571, 239, 559, 466, 520, 564, 519, 557, 567,
- 558, 239, 239, 568, 239, 239, 573, 518, 239, 239,
- 561, 239, 239, 517, 574, 572, 575, 577, 239, 488,
-
- 435, 239, 488, 489, 239, 516, 489, 239, 239, 583,
- 239, 239, 583, 239, 536, 576, 536, 536, 208, 536,
- 208, 208, 208, 515, 208, 208, 208, 514, 208, 208,
- 620, 619, 513, 208, 621, 208, 208, 410, 512, 239,
- 579, 582, 239, 208, 511, 208, 208, 490, 580, 510,
- 581, 622, 636, 584, 208, 509, 208, 208, 537, 508,
- 537, 208, 623, 208, 208, 208, 507, 208, 208, 624,
- 208, 506, 208, 208, 208, 505, 208, 208, 208, 504,
- 208, 208, 208, 503, 208, 208, 208, 502, 208, 208,
- 625, 501, 500, 208, 628, 208, 208, 499, 208, 239,
-
- 208, 208, 239, 498, 497, 626, 630, 637, 208, 627,
- 208, 208, 208, 629, 208, 208, 208, 496, 208, 208,
- 208, 495, 208, 208, 208, 494, 208, 208, 208, 441,
- 208, 208, 560, 239, 208, 560, 239, 440, 208, 631,
- 208, 208, 239, 239, 239, 239, 239, 239, 439, 328,
- 638, 639, 632, 239, 239, 633, 239, 239, 634, 438,
- 239, 640, 641, 239, 239, 239, 433, 239, 239, 642,
- 239, 432, 239, 239, 239, 239, 561, 239, 645, 431,
- 647, 239, 635, 239, 239, 239, 239, 239, 239, 430,
- 239, 643, 644, 239, 646, 239, 239, 583, 239, 239,
-
- 583, 208, 239, 208, 208, 208, 429, 208, 208, 672,
- 648, 208, 428, 208, 208, 208, 239, 208, 208, 239,
- 208, 649, 208, 208, 650, 651, 208, 427, 208, 208,
- 208, 426, 208, 208, 208, 425, 208, 208, 673, 424,
- 423, 584, 674, 652, 208, 422, 208, 208, 208, 421,
- 208, 208, 675, 208, 420, 208, 208, 208, 419, 208,
- 208, 208, 418, 208, 208, 208, 676, 208, 208, 677,
- 208, 417, 208, 208, 208, 416, 208, 208, 208, 239,
- 208, 208, 239, 239, 308, 239, 239, 681, 239, 239,
- 239, 239, 239, 239, 239, 239, 415, 239, 239, 682,
-
- 239, 239, 679, 683, 239, 684, 678, 239, 239, 239,
- 239, 239, 239, 239, 414, 680, 239, 686, 239, 239,
- 685, 239, 239, 239, 696, 413, 239, 696, 208, 412,
- 208, 208, 208, 411, 208, 208, 208, 409, 208, 208,
- 208, 408, 208, 208, 208, 239, 208, 208, 239, 407,
- 688, 406, 699, 208, 687, 208, 208, 405, 404, 208,
- 689, 208, 208, 403, 701, 700, 208, 701, 697, 208,
- 239, 208, 208, 239, 239, 239, 239, 239, 239, 239,
- 239, 402, 239, 239, 704, 239, 706, 239, 705, 706,
- 239, 696, 696, 713, 696, 696, 713, 208, 401, 208,
-
- 208, 703, 208, 239, 208, 208, 239, 701, 702, 208,
- 701, 208, 400, 208, 208, 717, 399, 208, 717, 708,
- 706, 239, 239, 706, 239, 239, 721, 398, 713, 721,
- 707, 713, 397, 715, 396, 697, 697, 714, 713, 395,
- 239, 713, 208, 239, 208, 208, 208, 239, 208, 208,
- 239, 702, 719, 394, 717, 716, 208, 717, 208, 718,
- 208, 208, 721, 393, 707, 721, 720, 392, 239, 278,
- 722, 239, 714, 208, 726, 208, 208, 274, 208, 728,
- 208, 208, 714, 239, 239, 205, 239, 239, 208, 239,
- 208, 208, 239, 208, 239, 208, 208, 239, 718, 336,
-
- 335, 208, 727, 208, 208, 239, 722, 239, 239, 744,
- 239, 732, 729, 745, 208, 199, 208, 208, 195, 334,
- 191, 733, 186, 333, 332, 331, 330, 740, 741, 736,
- 737, 46, 46, 46, 46, 46, 46, 51, 51, 51,
- 51, 51, 51, 58, 58, 58, 58, 58, 58, 63,
- 63, 63, 63, 63, 63, 144, 144, 144, 144, 144,
- 144, 177, 177, 329, 177, 177, 177, 187, 187, 187,
- 187, 187, 187, 190, 185, 180, 179, 190, 190, 192,
- 192, 192, 192, 192, 192, 198, 198, 327, 326, 198,
- 198, 204, 204, 204, 325, 204, 204, 207, 207, 324,
-
- 207, 207, 207, 229, 229, 323, 229, 229, 229, 239,
- 239, 322, 321, 320, 239, 264, 264, 319, 264, 264,
- 264, 305, 305, 318, 317, 316, 305, 363, 363, 315,
- 314, 313, 363, 383, 383, 312, 383, 383, 383, 311,
- 310, 151, 308, 300, 299, 296, 295, 294, 291, 290,
- 282, 281, 280, 279, 278, 276, 272, 267, 266, 262,
- 261, 260, 257, 256, 248, 247, 246, 245, 244, 209,
- 206, 205, 203, 200, 199, 195, 191, 186, 185, 180,
- 179, 169, 168, 167, 164, 163, 155, 154, 153, 152,
- 151, 150, 746, 17, 746, 746, 746, 746, 746, 746,
-
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746
+ 755, 21, 22, 23, 21, 281, 24, 755, 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,
+ 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,
+ 20, 20, 43, 20, 44, 20, 45, 20, 20, 46,
+ 47, 20, 49, 50, 51, 52, 48, 54, 55, 56,
+ 57, 61, 62, 61, 62, 147, 148, 149, 147, 58,
+
+ 150, 147, 148, 149, 147, 48, 150, 160, 48, 163,
+ 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,
+ 73, 74, 212, 75, 212, 212, 76, 257, 77, 263,
+ 78, 79, 80, 81, 748, 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,
+
+ 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,
+ 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,
+ 94, 103, 94, 104, 94, 116, 106, 107, 108, 94,
+ 109, 110, 94, 111, 94, 94, 112, 94, 94, 94,
+ 94, 117, 94, 118, 94, 119, 94, 94, 120, 121,
+
+ 94, 20, 122, 123, 124, 122, 20, 24, 125, 126,
+ 20, 125, 125, 127, 128, 125, 129, 125, 125, 130,
+ 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,
+ 197, 198, 212, 290, 212, 212, 212, 302, 212, 212,
+ 141, 212, 296, 212, 212, 273, 744, 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,
+ 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,
+ 212, 212, 317, 318, 212, 317, 212, 212, 232, 223,
+ 212, 732, 212, 212, 244, 245, 246, 244, 721, 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,
+ 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
} ;
-static yyconst flex_int16_t yy_chk[1942] =
+static yyconst flex_int16_t yy_chk[2026] =
{ 0,
- 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, 7, 7,
- 2, 2, 43, 5, 5, 2, 3, 3, 3, 3,
- 4, 4, 4, 4, 4, 6, 6, 30, 2, 8,
- 8, 43, 29, 4, 15, 15, 15, 15, 19, 15,
- 44, 19, 44, 2, 30, 2, 29, 2, 104, 33,
- 2, 2, 5, 16, 16, 16, 16, 5, 16, 28,
-
- 4, 33, 28, 61, 6, 104, 28, 762, 61, 6,
- 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
- 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
- 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
- 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
- 9, 9, 9, 9, 9, 9, 9, 10, 40, 57,
- 10, 10, 49, 49, 49, 10, 54, 54, 54, 54,
- 107, 66, 40, 66, 66, 131, 742, 69, 10, 69,
- 69, 70, 107, 70, 70, 103, 57, 81, 70, 81,
- 81, 102, 131, 10, 102, 10, 81, 10, 102, 103,
-
- 10, 10, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 11, 11, 12,
- 739, 112, 12, 12, 112, 114, 71, 12, 71, 71,
- 72, 117, 72, 72, 73, 144, 73, 73, 144, 114,
- 12, 738, 71, 72, 118, 82, 118, 82, 82, 84,
- 117, 84, 84, 129, 73, 12, 129, 12, 82, 12,
- 129, 735, 12, 12, 13, 13, 13, 13, 13, 13,
-
- 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+ 0, 1, 1, 1, 1, 775, 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,
+ 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, 2, 2, 2, 2,
+ 2, 2, 3, 3, 3, 3, 4, 4, 4, 4,
+ 4, 5, 5, 6, 6, 15, 15, 15, 15, 4,
+
+ 15, 16, 16, 16, 16, 17, 16, 30, 18, 31,
+ 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, 68, 9, 68, 68, 9, 105, 9, 109,
+ 9, 9, 9, 9, 744, 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,
+
+ 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,
+ 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,
+ 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+ 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+
+ 12, 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, 13, 13, 13, 13, 13, 13, 13, 13,
- 13, 14, 130, 734, 14, 14, 134, 731, 74, 14,
- 74, 74, 75, 142, 75, 75, 130, 78, 134, 78,
- 78, 77, 14, 77, 77, 76, 75, 76, 76, 75,
- 77, 730, 142, 75, 76, 74, 197, 14, 139, 14,
- 149, 14, 78, 149, 14, 14, 37, 77, 76, 37,
- 37, 724, 139, 79, 37, 79, 79, 143, 80, 143,
-
- 80, 80, 83, 197, 83, 83, 85, 723, 85, 85,
- 175, 714, 175, 79, 80, 711, 86, 709, 86, 86,
- 178, 178, 37, 697, 37, 86, 80, 201, 182, 37,
- 37, 695, 201, 87, 83, 87, 87, 693, 88, 86,
- 88, 88, 89, 302, 89, 89, 90, 182, 90, 90,
- 91, 691, 91, 91, 93, 93, 93, 93, 95, 95,
- 95, 95, 302, 89, 111, 111, 111, 111, 120, 120,
- 120, 120, 189, 189, 189, 87, 90, 88, 90, 194,
- 194, 194, 89, 138, 138, 138, 138, 145, 145, 145,
- 145, 690, 203, 203, 91, 203, 207, 671, 207, 207,
-
- 208, 670, 208, 208, 210, 239, 210, 210, 239, 668,
- 211, 210, 211, 211, 212, 666, 212, 212, 213, 211,
- 213, 213, 214, 661, 214, 214, 215, 213, 215, 215,
- 216, 253, 216, 216, 253, 214, 660, 203, 212, 215,
- 217, 659, 217, 217, 218, 658, 218, 218, 219, 657,
- 219, 219, 220, 253, 220, 220, 221, 216, 221, 221,
- 298, 298, 222, 217, 222, 222, 656, 655, 245, 218,
- 219, 245, 223, 220, 223, 223, 654, 245, 653, 222,
- 224, 223, 224, 224, 221, 225, 618, 225, 225, 226,
- 247, 226, 226, 247, 227, 225, 227, 227, 228, 247,
-
- 228, 228, 616, 229, 226, 229, 229, 230, 224, 230,
- 230, 227, 231, 615, 231, 231, 232, 614, 232, 232,
- 233, 613, 233, 233, 234, 272, 234, 234, 272, 611,
- 609, 228, 235, 234, 235, 235, 231, 231, 236, 608,
- 236, 236, 237, 607, 237, 237, 232, 238, 250, 238,
- 238, 250, 233, 235, 240, 240, 240, 240, 242, 242,
- 242, 242, 244, 246, 248, 244, 246, 248, 249, 244,
- 251, 249, 235, 251, 236, 250, 252, 248, 601, 252,
- 600, 249, 254, 237, 599, 254, 255, 246, 256, 255,
- 598, 256, 597, 251, 258, 257, 259, 258, 257, 259,
-
- 596, 252, 595, 254, 257, 256, 259, 261, 260, 262,
- 261, 260, 262, 264, 255, 264, 264, 266, 264, 594,
- 266, 593, 258, 260, 261, 265, 267, 268, 265, 267,
- 268, 269, 270, 592, 269, 270, 268, 271, 305, 591,
- 271, 305, 262, 273, 273, 273, 273, 266, 306, 265,
- 265, 306, 269, 307, 307, 307, 307, 590, 267, 328,
- 328, 329, 328, 589, 329, 588, 335, 335, 270, 335,
- 587, 269, 336, 336, 586, 336, 337, 337, 271, 337,
- 339, 363, 339, 339, 363, 340, 585, 340, 340, 341,
- 538, 341, 341, 342, 537, 342, 342, 343, 368, 343,
-
- 343, 368, 339, 535, 341, 329, 343, 344, 534, 344,
- 344, 335, 340, 345, 342, 345, 345, 336, 532, 368,
- 344, 337, 346, 531, 346, 346, 347, 529, 347, 347,
- 348, 528, 348, 348, 349, 345, 349, 349, 527, 364,
- 526, 346, 364, 348, 349, 350, 364, 350, 350, 525,
- 522, 351, 347, 351, 351, 521, 520, 352, 350, 352,
- 352, 353, 351, 353, 353, 354, 369, 354, 354, 369,
- 355, 352, 355, 355, 356, 369, 356, 356, 357, 357,
- 357, 357, 519, 517, 516, 355, 358, 353, 358, 358,
- 359, 354, 359, 359, 360, 515, 360, 360, 361, 365,
-
- 361, 361, 365, 362, 356, 362, 362, 366, 367, 370,
- 366, 367, 370, 371, 513, 512, 371, 372, 360, 511,
- 372, 365, 370, 367, 373, 374, 359, 373, 374, 375,
- 358, 510, 375, 361, 366, 371, 372, 509, 374, 375,
- 362, 376, 377, 378, 376, 377, 378, 508, 379, 380,
- 373, 379, 380, 377, 376, 381, 382, 378, 381, 382,
- 383, 385, 383, 383, 385, 383, 384, 384, 386, 384,
- 381, 386, 507, 387, 379, 380, 387, 389, 388, 390,
- 389, 388, 390, 506, 505, 391, 382, 388, 391, 410,
- 410, 411, 410, 436, 411, 504, 436, 387, 389, 434,
-
- 434, 503, 434, 440, 386, 385, 440, 442, 442, 502,
- 442, 501, 444, 444, 390, 444, 446, 389, 446, 446,
- 500, 470, 391, 447, 470, 447, 447, 446, 448, 499,
- 448, 448, 470, 471, 498, 411, 471, 436, 449, 447,
- 449, 449, 450, 497, 450, 450, 449, 440, 463, 471,
- 463, 463, 442, 451, 448, 451, 451, 444, 452, 496,
- 452, 452, 453, 565, 453, 453, 565, 495, 454, 450,
- 454, 454, 494, 441, 451, 453, 454, 455, 474, 455,
- 455, 474, 439, 438, 452, 455, 456, 437, 456, 456,
- 463, 457, 433, 457, 457, 458, 477, 458, 458, 477,
-
- 459, 432, 459, 459, 460, 474, 460, 460, 458, 477,
- 431, 430, 456, 457, 459, 461, 429, 461, 461, 462,
- 428, 462, 462, 461, 464, 464, 464, 464, 427, 426,
- 465, 460, 465, 465, 466, 462, 466, 466, 467, 425,
- 467, 467, 468, 424, 468, 468, 469, 423, 469, 469,
- 472, 473, 486, 472, 473, 486, 422, 476, 475, 473,
- 476, 475, 478, 479, 481, 478, 479, 481, 486, 480,
- 478, 479, 480, 468, 465, 421, 472, 420, 466, 475,
- 467, 482, 483, 476, 482, 483, 481, 419, 484, 485,
- 469, 484, 485, 418, 482, 480, 483, 485, 487, 488,
-
- 488, 487, 488, 489, 490, 417, 489, 490, 491, 493,
- 492, 491, 493, 492, 514, 484, 536, 514, 539, 536,
- 539, 539, 540, 416, 540, 540, 541, 415, 541, 541,
- 540, 539, 414, 542, 541, 542, 542, 413, 412, 562,
- 487, 492, 562, 543, 409, 543, 543, 489, 490, 408,
- 491, 543, 562, 493, 544, 407, 544, 544, 514, 406,
- 536, 545, 544, 545, 545, 546, 405, 546, 546, 545,
- 547, 404, 547, 547, 548, 403, 548, 548, 549, 402,
- 549, 549, 550, 401, 550, 550, 551, 400, 551, 551,
- 546, 399, 398, 552, 551, 552, 552, 397, 553, 563,
-
- 553, 553, 563, 396, 395, 549, 553, 563, 554, 550,
- 554, 554, 555, 552, 555, 555, 556, 394, 556, 556,
- 557, 393, 557, 557, 558, 392, 558, 558, 559, 334,
- 559, 559, 560, 570, 560, 560, 570, 333, 561, 555,
- 561, 561, 564, 566, 569, 564, 566, 569, 332, 331,
- 564, 566, 556, 567, 568, 558, 567, 568, 559, 330,
- 571, 567, 568, 571, 572, 573, 327, 572, 573, 569,
- 574, 326, 576, 574, 575, 576, 560, 575, 574, 325,
- 576, 577, 561, 578, 577, 579, 578, 580, 579, 324,
- 580, 572, 573, 581, 575, 582, 581, 583, 582, 584,
-
- 583, 619, 584, 619, 619, 620, 323, 620, 620, 619,
- 578, 621, 322, 621, 621, 622, 637, 622, 622, 637,
- 623, 579, 623, 623, 581, 582, 624, 321, 624, 624,
- 625, 320, 625, 625, 626, 319, 626, 626, 625, 318,
- 317, 583, 626, 584, 627, 316, 627, 627, 628, 315,
- 628, 628, 627, 629, 314, 629, 629, 630, 313, 630,
- 630, 631, 312, 631, 631, 632, 629, 632, 632, 631,
- 633, 311, 633, 633, 634, 310, 634, 634, 635, 636,
- 635, 635, 636, 638, 309, 639, 638, 636, 639, 640,
- 641, 642, 640, 641, 642, 643, 304, 644, 643, 642,
-
- 644, 645, 633, 643, 645, 644, 632, 646, 647, 648,
- 646, 647, 648, 649, 303, 634, 649, 648, 650, 651,
- 646, 650, 651, 652, 669, 301, 652, 669, 672, 300,
- 672, 672, 673, 299, 673, 673, 674, 296, 674, 674,
- 675, 295, 675, 675, 676, 681, 676, 676, 681, 294,
- 650, 293, 676, 677, 649, 677, 677, 292, 291, 678,
- 651, 678, 678, 290, 679, 678, 679, 679, 669, 680,
- 682, 680, 680, 682, 683, 684, 685, 683, 684, 685,
- 686, 289, 687, 686, 685, 687, 688, 689, 687, 688,
- 689, 692, 696, 698, 692, 696, 698, 699, 288, 699,
-
- 699, 680, 700, 704, 700, 700, 704, 701, 679, 701,
- 701, 702, 287, 702, 702, 703, 286, 703, 703, 689,
- 706, 705, 707, 706, 705, 707, 708, 285, 710, 708,
- 688, 710, 284, 700, 283, 692, 696, 698, 713, 282,
- 720, 713, 715, 720, 715, 715, 716, 719, 716, 716,
- 719, 701, 705, 281, 717, 702, 717, 717, 718, 703,
- 718, 718, 721, 280, 706, 721, 707, 279, 722, 278,
- 708, 722, 710, 726, 715, 726, 726, 275, 727, 719,
- 727, 727, 713, 728, 729, 204, 728, 729, 732, 733,
- 732, 732, 733, 736, 737, 736, 736, 737, 717, 202,
-
- 199, 740, 718, 740, 740, 741, 721, 745, 741, 740,
- 745, 726, 722, 741, 744, 198, 744, 744, 196, 195,
- 193, 728, 188, 184, 183, 181, 180, 736, 737, 732,
- 733, 747, 747, 747, 747, 747, 747, 748, 748, 748,
- 748, 748, 748, 749, 749, 749, 749, 749, 749, 750,
- 750, 750, 750, 750, 750, 751, 751, 751, 751, 751,
- 751, 752, 752, 179, 752, 752, 752, 753, 753, 753,
- 753, 753, 753, 754, 176, 174, 173, 754, 754, 755,
- 755, 755, 755, 755, 755, 756, 756, 169, 168, 756,
- 756, 757, 757, 757, 167, 757, 757, 758, 758, 166,
-
- 758, 758, 758, 759, 759, 165, 759, 759, 759, 760,
- 760, 164, 163, 162, 760, 761, 761, 161, 761, 761,
- 761, 763, 763, 160, 159, 158, 763, 764, 764, 157,
- 156, 155, 764, 765, 765, 154, 765, 765, 765, 153,
- 152, 151, 147, 141, 140, 137, 136, 135, 133, 132,
- 128, 127, 126, 125, 124, 122, 119, 116, 115, 110,
- 109, 108, 106, 105, 101, 100, 99, 98, 97, 68,
- 65, 63, 62, 60, 58, 56, 53, 48, 45, 42,
- 41, 36, 35, 34, 32, 31, 27, 26, 25, 24,
- 23, 21, 17, 746, 746, 746, 746, 746, 746, 746,
-
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746, 746, 746, 746, 746, 746, 746, 746, 746, 746,
- 746
+ 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,
+ 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,
+ 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,
+ 91, 91, 152, 152, 92, 152, 92, 92, 85, 88,
+ 93, 718, 93, 93, 95, 95, 95, 95, 706, 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,
+ 250, 220, 220, 250, 218, 207, 216, 221, 219, 221,
+ 221, 222, 670, 222, 222, 223, 669, 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
} ;
/* Table of booleans, true if rule could match eol. */
-static yyconst flex_int32_t yy_rule_can_match_eol[59] =
+static yyconst flex_int32_t yy_rule_can_match_eol[61] =
{ 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, 1, 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;
@@ -1188,14 +1210,12 @@ static void clean()
alloced = false;
}
-static void settext(bool trim_right = false, int strip_trailing = 0)
+static char *copy_text(bool trim_right, int strip_trailing)
{
- clean();
char *newstring = NULL;
if ((yylval.text = newstring = strdup(yytext)))
{
alloced = true;
-
char *s = NULL;
if (trim_right)
{
@@ -1211,6 +1231,14 @@ static void settext(bool trim_right = false, int strip_trailing = 0)
*s-- = 0;
}
}
+ return (newstring);
+}
+
+static void settext(bool trim_right = false, int strip_trailing = 0)
+{
+ clean();
+ char *newstring = copy_text(trim_right, strip_trailing);
+ yylval.text = newstring;
}
@@ -1220,7 +1248,8 @@ static void settext(bool trim_right = false, int strip_trailing = 0)
-#line 1224 "levcomp.lex.cc"
+
+#line 1253 "levcomp.lex.cc"
#define INITIAL 0
#define MAPDEF 1
@@ -1230,6 +1259,7 @@ static void settext(bool trim_right = false, int strip_trailing = 0)
#define MNAME 5
#define KEYWORDS 6
#define ITEM_LIST 7
+#define TOEOL 8
#ifndef YY_NO_UNISTD_H
/* Special case for "unistd.h", since it is non-ANSI. We include it way
@@ -1383,10 +1413,10 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 82 "levcomp.lpp"
+#line 89 "levcomp.lpp"
-#line 1390 "levcomp.lex.cc"
+#line 1420 "levcomp.lex.cc"
if ( !(yy_init) )
{
@@ -1440,13 +1470,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 >= 747 )
+ if ( yy_current_state >= 756 )
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 != 746 );
+ while ( yy_current_state != 755 );
yy_cp = (yy_last_accepting_cpos);
yy_current_state = (yy_last_accepting_state);
@@ -1478,12 +1508,12 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 84 "levcomp.lpp"
+#line 91 "levcomp.lpp"
{ BEGIN(INITIAL); }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 86 "levcomp.lpp"
+#line 93 "levcomp.lpp"
{
settext(true);
return MAP_LINE;
@@ -1492,23 +1522,23 @@ YY_RULE_SETUP
case 3:
/* rule 3 can match eol */
YY_RULE_SETUP
-#line 91 "levcomp.lpp"
+#line 98 "levcomp.lpp"
return CHARACTER;
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 92 "levcomp.lpp"
+#line 99 "levcomp.lpp"
return CHARACTER;
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 93 "levcomp.lpp"
+#line 100 "levcomp.lpp"
return CHARACTER;
YY_BREAK
case 6:
/* rule 6 can match eol */
YY_RULE_SETUP
-#line 95 "levcomp.lpp"
+#line 102 "levcomp.lpp"
;
YY_BREAK
case 7:
@@ -1516,7 +1546,7 @@ case 7:
(yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 97 "levcomp.lpp"
+#line 104 "levcomp.lpp"
{ BEGIN(INITIAL); }
YY_BREAK
case 8:
@@ -1524,7 +1554,7 @@ case 8:
(yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 98 "levcomp.lpp"
+#line 105 "levcomp.lpp"
{
settext(true, 2);
BEGIN(INITIAL);
@@ -1533,7 +1563,7 @@ YY_RULE_SETUP
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 103 "levcomp.lpp"
+#line 110 "levcomp.lpp"
{
settext();
return LUA_LINE;
@@ -1542,7 +1572,7 @@ YY_RULE_SETUP
case 10:
/* rule 10 can match eol */
YY_RULE_SETUP
-#line 107 "levcomp.lpp"
+#line 114 "levcomp.lpp"
;
YY_BREAK
case 11:
@@ -1550,7 +1580,7 @@ case 11:
(yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 109 "levcomp.lpp"
+#line 116 "levcomp.lpp"
{
settext();
return LUA_LINE;
@@ -1559,12 +1589,12 @@ YY_RULE_SETUP
case 12:
/* rule 12 can match eol */
YY_RULE_SETUP
-#line 113 "levcomp.lpp"
+#line 120 "levcomp.lpp"
{ BEGIN(INITIAL); }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 115 "levcomp.lpp"
+#line 122 "levcomp.lpp"
{
settext();
return STRING;
@@ -1572,18 +1602,18 @@ YY_RULE_SETUP
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 120 "levcomp.lpp"
+#line 127 "levcomp.lpp"
;
YY_BREAK
case 15:
/* rule 15 can match eol */
YY_RULE_SETUP
-#line 121 "levcomp.lpp"
+#line 128 "levcomp.lpp"
{ BEGIN(INITIAL); }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 123 "levcomp.lpp"
+#line 130 "levcomp.lpp"
{
settext();
return ITEM_INFO;
@@ -1591,7 +1621,7 @@ YY_RULE_SETUP
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 128 "levcomp.lpp"
+#line 135 "levcomp.lpp"
{
settext();
return ITEM_INFO;
@@ -1599,29 +1629,29 @@ YY_RULE_SETUP
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 133 "levcomp.lpp"
+#line 140 "levcomp.lpp"
return COMMA;
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 134 "levcomp.lpp"
+#line 141 "levcomp.lpp"
;
YY_BREAK
case 20:
/* rule 20 can match eol */
YY_RULE_SETUP
-#line 135 "levcomp.lpp"
+#line 142 "levcomp.lpp"
{ BEGIN(INITIAL); }
YY_BREAK
case 21:
/* rule 21 can match eol */
YY_RULE_SETUP
-#line 137 "levcomp.lpp"
+#line 144 "levcomp.lpp"
{ BEGIN(INITIAL); }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 139 "levcomp.lpp"
+#line 146 "levcomp.lpp"
{
settext();
return MONSTER_NAME;
@@ -1629,17 +1659,17 @@ YY_RULE_SETUP
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 144 "levcomp.lpp"
+#line 151 "levcomp.lpp"
return COMMA;
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 145 "levcomp.lpp"
+#line 152 "levcomp.lpp"
;
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 147 "levcomp.lpp"
+#line 154 "levcomp.lpp"
{
BEGIN(INITIAL);
settext();
@@ -1649,178 +1679,201 @@ YY_RULE_SETUP
case 26:
/* rule 26 can match eol */
YY_RULE_SETUP
-#line 153 "levcomp.lpp"
+#line 160 "levcomp.lpp"
{ BEGIN(INITIAL); }
YY_BREAK
case 27:
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 155 "levcomp.lpp"
-;
+#line 162 "levcomp.lpp"
+{
+ settext(true, 1);
+ return STRING;
+ }
YY_BREAK
case 28:
*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
(yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 157 "levcomp.lpp"
-{ BEGIN(MAPDEF); }
+#line 167 "levcomp.lpp"
+{
+ BEGIN(INITIAL);
+ settext();
+ return STRING;
+ }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 159 "levcomp.lpp"
-{ BEGIN(LUA_ONELINER); return MAIN; }
+#line 173 "levcomp.lpp"
+;
YY_BREAK
case 30:
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
+(yy_c_buf_p) = yy_cp -= 1;
+YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 161 "levcomp.lpp"
-{ BEGIN(LUA); return PRELUDE; }
+#line 175 "levcomp.lpp"
+{ BEGIN(MAPDEF); }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 162 "levcomp.lpp"
-{ BEGIN(LUA); return MAIN; }
+#line 177 "levcomp.lpp"
+{ BEGIN(LUA_ONELINER); return MAIN; }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 163 "levcomp.lpp"
-{ BEGIN(LUA); return MAIN; }
+#line 179 "levcomp.lpp"
+{ BEGIN(LUA); return PRELUDE; }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 164 "levcomp.lpp"
-{ BEGIN(LUA); return VALIDATE; }
+#line 180 "levcomp.lpp"
+{ BEGIN(LUA); return MAIN; }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 165 "levcomp.lpp"
-{ BEGIN(LUA); return VETO; }
+#line 181 "levcomp.lpp"
+{ BEGIN(LUA); return MAIN; }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 168 "levcomp.lpp"
-{ BEGIN(ARGUMENT); return NAME; }
+#line 182 "levcomp.lpp"
+{ BEGIN(LUA); return VALIDATE; }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 169 "levcomp.lpp"
-{ BEGIN(ARGUMENT); return DEFAULT_DEPTH; }
+#line 183 "levcomp.lpp"
+{ BEGIN(LUA); return VETO; }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 170 "levcomp.lpp"
-{ BEGIN(ARGUMENT); return DEPTH; }
+#line 186 "levcomp.lpp"
+{ BEGIN(ARGUMENT); return NAME; }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 171 "levcomp.lpp"
-{ BEGIN(ARGUMENT); return ORIENT; }
+#line 187 "levcomp.lpp"
+{ BEGIN(ARGUMENT); return DEFAULT_DEPTH; }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 172 "levcomp.lpp"
-{ BEGIN(ARGUMENT); return PLACE; }
+#line 188 "levcomp.lpp"
+{ BEGIN(ARGUMENT); return DEPTH; }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 173 "levcomp.lpp"
-return CHANCE;
+#line 189 "levcomp.lpp"
+{ BEGIN(ARGUMENT); return ORIENT; }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 174 "levcomp.lpp"
-return CHANCE;
+#line 190 "levcomp.lpp"
+{ BEGIN(ARGUMENT); return PLACE; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 175 "levcomp.lpp"
-{ BEGIN(KEYWORDS); return TAGS; }
+#line 191 "levcomp.lpp"
+return CHANCE;
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 176 "levcomp.lpp"
-{ BEGIN(KEYWORDS); return TAGS; }
+#line 192 "levcomp.lpp"
+return CHANCE;
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 177 "levcomp.lpp"
-{ BEGIN(ITEM_LIST); return SUBST; }
+#line 193 "levcomp.lpp"
+{ BEGIN(KEYWORDS); return TAGS; }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 178 "levcomp.lpp"
-{ BEGIN(ITEM_LIST); return NSUBST; }
+#line 194 "levcomp.lpp"
+{ BEGIN(KEYWORDS); return TAGS; }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 179 "levcomp.lpp"
-{ BEGIN(MNAME); return MONS; }
+#line 195 "levcomp.lpp"
+{ BEGIN(ITEM_LIST); return SUBST; }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 180 "levcomp.lpp"
-{ BEGIN(ITEM_LIST); return ITEM; }
+#line 196 "levcomp.lpp"
+{ BEGIN(ITEM_LIST); return NSUBST; }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 181 "levcomp.lpp"
-{ BEGIN(ITEM_LIST); return MARKER; }
+#line 197 "levcomp.lpp"
+{ BEGIN(MNAME); return MONS; }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 182 "levcomp.lpp"
-{ BEGIN(ITEM_LIST); return SHUFFLE; }
+#line 198 "levcomp.lpp"
+{ BEGIN(ITEM_LIST); return ITEM; }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 184 "levcomp.lpp"
-{ BEGIN(ARGUMENT); return KFEAT; }
+#line 199 "levcomp.lpp"
+{ BEGIN(TOEOL); return MARKER; }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 185 "levcomp.lpp"
-{ BEGIN(ARGUMENT); return KITEM; }
+#line 200 "levcomp.lpp"
+{ BEGIN(ITEM_LIST); return SHUFFLE; }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 186 "levcomp.lpp"
-{ BEGIN(ARGUMENT); return KMONS; }
+#line 202 "levcomp.lpp"
+{ BEGIN(ARGUMENT); return KFEAT; }
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 188 "levcomp.lpp"
-return COMMA;
+#line 203 "levcomp.lpp"
+{ BEGIN(ARGUMENT); return KITEM; }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 190 "levcomp.lpp"
+#line 204 "levcomp.lpp"
+{ BEGIN(ARGUMENT); return KMONS; }
+ YY_BREAK
+case 55:
+YY_RULE_SETUP
+#line 206 "levcomp.lpp"
+return COMMA;
+ YY_BREAK
+case 56:
+YY_RULE_SETUP
+#line 208 "levcomp.lpp"
{
clean();
yylval.i = atoi(yytext);
return INTEGER;
}
YY_BREAK
-case 55:
+case 57:
YY_RULE_SETUP
-#line 196 "levcomp.lpp"
+#line 214 "levcomp.lpp"
;
YY_BREAK
-case 56:
-/* rule 56 can match eol */
+case 58:
+/* rule 58 can match eol */
YY_RULE_SETUP
-#line 197 "levcomp.lpp"
+#line 215 "levcomp.lpp"
;
YY_BREAK
-case 57:
+case 59:
YY_RULE_SETUP
-#line 198 "levcomp.lpp"
+#line 216 "levcomp.lpp"
return CHARACTER;
YY_BREAK
-case 58:
+case 60:
YY_RULE_SETUP
-#line 200 "levcomp.lpp"
+#line 218 "levcomp.lpp"
ECHO;
YY_BREAK
-#line 1824 "levcomp.lex.cc"
+#line 1877 "levcomp.lex.cc"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(MAPDEF):
case YY_STATE_EOF(LUA):
@@ -1829,6 +1882,7 @@ case YY_STATE_EOF(ARGUMENT):
case YY_STATE_EOF(MNAME):
case YY_STATE_EOF(KEYWORDS):
case YY_STATE_EOF(ITEM_LIST):
+case YY_STATE_EOF(TOEOL):
yyterminate();
case YY_END_OF_BUFFER:
@@ -2113,7 +2167,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 >= 747 )
+ if ( yy_current_state >= 756 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2141,11 +2195,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 >= 747 )
+ if ( yy_current_state >= 756 )
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 == 746);
+ yy_is_jam = (yy_current_state == 755);
return yy_is_jam ? 0 : yy_current_state;
}
@@ -2567,7 +2621,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 yystr a NUL-terminated string to scan
+ * @param str 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
@@ -2824,7 +2878,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 200 "levcomp.lpp"
+#line 218 "levcomp.lpp"
diff --git a/crawl-ref/source/prebuilt/levcomp.tab.cc b/crawl-ref/source/prebuilt/levcomp.tab.cc
index af90e4dd6b..f162035030 100644
--- a/crawl-ref/source/prebuilt/levcomp.tab.cc
+++ b/crawl-ref/source/prebuilt/levcomp.tab.cc
@@ -148,6 +148,8 @@ int yylex();
extern int yylineno;
+static bool start_marker_segment = false;
+
void yyerror(const char *e)
{
if (strstr(e, lc_desfile.c_str()) == e)
@@ -193,14 +195,14 @@ level_range set_range(const char *s, int start, int end)
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 44 "levcomp.ypp"
+#line 46 "levcomp.ypp"
{
int i;
const char *text;
raw_range range;
}
/* Line 193 of yacc.c. */
-#line 204 "levcomp.tab.c"
+#line 206 "levcomp.tab.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -213,7 +215,7 @@ typedef union YYSTYPE
/* Line 216 of yacc.c. */
-#line 217 "levcomp.tab.c"
+#line 219 "levcomp.tab.c"
#ifdef short
# undef short
@@ -428,14 +430,14 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 63
+#define YYLAST 56
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 31
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 58
+#define YYNNTS 60
/* YYNRULES -- Number of rules. */
-#define YYNRULES 101
+#define YYNRULES 103
/* YYNRULES -- Number of states. */
#define YYNSTATES 116
@@ -492,10 +494,10 @@ static const yytype_uint8 yyprhs[] =
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, 157, 159, 163, 165, 168, 170, 174, 176, 179,
- 181, 185, 187, 189, 192, 196, 198, 200, 202, 205,
- 209, 211, 213, 216, 218, 221, 224, 226, 229, 231,
- 234, 236
+ 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
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -504,9 +506,9 @@ 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, 86, -1, 10, 26, -1, 82, -1, 83, -1,
- 84, -1, 85, -1, 79, -1, 76, -1, 67, -1,
- 73, -1, 70, -1, 61, -1, 64, -1, 58, -1,
+ -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,
@@ -516,31 +518,31 @@ static const yytype_int8 yyrhs[] =
-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, 17, 68, -1, 69, -1, 68,
- 23, 69, -1, 29, -1, 22, 71, -1, 72, -1,
- 71, 23, 72, -1, 29, -1, 5, 74, -1, 75,
- -1, 75, 23, 74, -1, 29, -1, 16, -1, 16,
- 77, -1, 77, 23, 78, -1, 78, -1, 29, -1,
- 15, -1, 15, 80, -1, 81, 23, 80, -1, 81,
- -1, 28, -1, 13, 26, -1, 11, -1, 11, 26,
- -1, 14, 24, -1, 12, -1, 12, 26, -1, 87,
- -1, 87, 88, -1, 88, -1, 27, -1
+ 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
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 64, 64, 67, 68, 71, 72, 75, 81, 82,
- 85, 95, 117, 118, 121, 122, 125, 149, 150, 151,
- 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
- 162, 163, 164, 165, 166, 167, 170, 172, 173, 176,
- 181, 183, 184, 187, 192, 194, 195, 198, 203, 205,
- 206, 209, 214, 216, 217, 220, 225, 226, 234, 235,
- 243, 244, 252, 255, 256, 259, 267, 270, 271, 274,
- 283, 286, 287, 290, 299, 302, 303, 306, 315, 318,
- 319, 322, 331, 332, 335, 336, 339, 347, 348, 351,
- 352, 355, 364, 373, 374, 383, 391, 392, 401, 404,
- 405, 408
+ 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
};
#endif
@@ -561,11 +563,11 @@ static const char *const yytname[] =
"validate_lua_line", "veto_lua", "veto_lua_lines", "veto_lua_line",
"prelude_lua", "prelude_lua_lines", "prelude_lua_line", "kfeat", "kmons",
"kitem", "shuffle", "shuffle_specifiers", "shuffle_spec", "tags",
- "tagstrings", "tagstring", "marker", "marker_specs", "marker_spec",
- "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
+ "tagstrings", "tagstring", "marker", "@1", "marker_spec",
+ "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
};
#endif
@@ -591,10 +593,10 @@ static const yytype_uint8 yyr1[] =
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,
- 67, 68, 68, 69, 70, 71, 71, 72, 73, 74,
- 74, 75, 76, 76, 77, 77, 78, 79, 79, 80,
- 80, 81, 82, 83, 83, 84, 85, 85, 86, 87,
- 87, 88
+ 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
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -607,10 +609,10 @@ static const yytype_uint8 yyr2[] =
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,
- 2, 1, 3, 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
+ 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
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -620,57 +622,57 @@ 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, 93, 96, 0, 0, 87,
- 82, 0, 53, 41, 45, 49, 0, 7, 101, 35,
+ 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, 98, 100, 65, 62, 63, 81, 78, 79, 66,
- 57, 61, 59, 94, 97, 92, 95, 91, 88, 90,
- 86, 83, 85, 73, 70, 71, 52, 40, 44, 48,
- 77, 74, 75, 99, 0, 0, 69, 68, 0, 0,
- 0, 55, 54, 43, 42, 47, 46, 51, 50, 0,
- 64, 80, 89, 84, 72, 76
+ 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
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int8 yydefgoto[] =
{
-1, 1, 2, 7, 39, 8, 9, 10, 16, 40,
- 11, 41, 12, 15, 18, 42, 87, 104, 43, 88,
- 106, 44, 89, 108, 45, 86, 102, 46, 47, 48,
- 49, 64, 65, 50, 69, 97, 51, 84, 85, 52,
- 91, 92, 53, 67, 68, 54, 81, 82, 55, 78,
- 79, 56, 57, 58, 59, 60, 61, 62
+ 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
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -61
+#define YYPACT_NINF -63
static const yytype_int8 yypact[] =
{
- -61, 6, 16, -61, -6, -2, -61, -61, -61, -61,
- -61, -61, -61, -61, -61, -8, -4, -61, -61, -1,
- 0, -61, 1, 4, 5, 7, 8, 10, 13, -3,
- 3, 9, -61, -61, -61, -61, 11, -61, -61, -61,
- -61, -61, -61, -61, -61, -61, -61, -61, -61, -61,
- -61, -61, -61, -61, -61, -61, -61, -61, -61, -61,
- -61, 12, -61, -61, 18, -61, -61, -61, 19, 17,
- -61, -61, -61, -61, -61, -61, -61, -61, -61, 21,
- -61, 22, -61, -61, 23, -61, 20, 24, 25, 26,
- -61, 28, -61, -61, -1, 0, -61, -61, -3, 3,
- 9, -61, -61, -61, -61, -61, -61, -61, -61, 11,
- -61, -61, -61, -61, -61, -61
+ -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
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int8 yypgoto[] =
{
- -61, -61, -61, -61, -61, -61, -61, -61, -61, -61,
- -61, -61, -61, -61, -61, -61, -61, -61, -61, -61,
- -61, -61, -61, -61, -61, -61, -61, -61, -61, -61,
- -61, -61, -47, -61, -61, -61, -61, -61, -52, -61,
- -61, -60, -61, -43, -61, -61, -61, -46, -61, -41,
- -61, -61, -61, -61, -61, -61, -61, 2
+ -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
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -683,21 +685,19 @@ 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, 83, 38,
- 90, 94, 95, 96, 98, 99, 100, 110, 114, 115,
- 101, 109, 111, 113, 103, 105, 107, 112, 0, 0,
- 0, 0, 0, 93
+ 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
};
-static const yytype_int8 yycheck[] =
+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,
- 29, 23, 23, 26, 23, 23, 23, 94, 100, 109,
- 30, 23, 95, 99, 30, 30, 30, 98, -1, -1,
- -1, -1, -1, 61
+ 23, 23, 92, 23, 23, 26, 108, 93, 97, 23,
+ 61, 96, 30, 30, 30, 30, 26
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -709,13 +709,13 @@ static const yytype_uint8 yystos[] =
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, 70, 73, 76, 79, 82, 83, 84, 85,
- 86, 87, 88, 29, 62, 63, 29, 74, 75, 65,
- 26, 26, 26, 26, 26, 26, 24, 28, 80, 81,
- 29, 77, 78, 29, 68, 69, 56, 47, 50, 53,
- 29, 71, 72, 88, 23, 23, 26, 66, 23, 23,
- 23, 30, 57, 30, 48, 30, 51, 30, 54, 23,
- 63, 74, 80, 78, 69, 72
+ 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
};
#define yyerrok (yyerrstatus = 0)
@@ -1530,49 +1530,49 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 64 "levcomp.ypp"
+#line 66 "levcomp.ypp"
{ }
break;
case 3:
-#line 67 "levcomp.ypp"
+#line 69 "levcomp.ypp"
{}
break;
case 4:
-#line 68 "levcomp.ypp"
+#line 70 "levcomp.ypp"
{}
break;
case 5:
-#line 71 "levcomp.ypp"
+#line 73 "levcomp.ypp"
{}
break;
case 6:
-#line 72 "levcomp.ypp"
+#line 74 "levcomp.ypp"
{}
break;
case 7:
-#line 76 "levcomp.ypp"
+#line 78 "levcomp.ypp"
{
yyerror("Unexpected character sequence.");
}
break;
case 8:
-#line 81 "levcomp.ypp"
+#line 83 "levcomp.ypp"
{}
break;
case 9:
-#line 82 "levcomp.ypp"
+#line 84 "levcomp.ypp"
{}
break;
case 10:
-#line 86 "levcomp.ypp"
+#line 88 "levcomp.ypp"
{
dgn_reset_default_depth();
std::string err = dgn_set_default_depth((yyvsp[(2) - (2)].text));
@@ -1583,7 +1583,7 @@ yyreduce:
break;
case 11:
-#line 96 "levcomp.ypp"
+#line 98 "levcomp.ypp"
{
lc_map.set_file(lc_desfile);
@@ -1606,27 +1606,27 @@ yyreduce:
break;
case 12:
-#line 117 "levcomp.ypp"
+#line 119 "levcomp.ypp"
{ }
break;
case 13:
-#line 118 "levcomp.ypp"
+#line 120 "levcomp.ypp"
{ }
break;
case 14:
-#line 121 "levcomp.ypp"
+#line 123 "levcomp.ypp"
{ }
break;
case 15:
-#line 122 "levcomp.ypp"
+#line 124 "levcomp.ypp"
{ }
break;
case 16:
-#line 126 "levcomp.ypp"
+#line 128 "levcomp.ypp"
{
lc_map.init();
lc_map.name = (yyvsp[(2) - (2)].text);
@@ -1651,127 +1651,127 @@ yyreduce:
break;
case 35:
-#line 167 "levcomp.ypp"
+#line 169 "levcomp.ypp"
{}
break;
case 36:
-#line 170 "levcomp.ypp"
+#line 172 "levcomp.ypp"
{ }
break;
case 37:
-#line 172 "levcomp.ypp"
+#line 174 "levcomp.ypp"
{ }
break;
case 38:
-#line 173 "levcomp.ypp"
+#line 175 "levcomp.ypp"
{ }
break;
case 39:
-#line 177 "levcomp.ypp"
+#line 179 "levcomp.ypp"
{
lc_global_prelude.add(yylineno, (yyvsp[(1) - (1)].text));
}
break;
case 40:
-#line 181 "levcomp.ypp"
+#line 183 "levcomp.ypp"
{ }
break;
case 41:
-#line 183 "levcomp.ypp"
+#line 185 "levcomp.ypp"
{ }
break;
case 42:
-#line 184 "levcomp.ypp"
+#line 186 "levcomp.ypp"
{ }
break;
case 43:
-#line 188 "levcomp.ypp"
+#line 190 "levcomp.ypp"
{
lc_map.main.add(yylineno, (yyvsp[(1) - (1)].text));
}
break;
case 44:
-#line 192 "levcomp.ypp"
+#line 194 "levcomp.ypp"
{ }
break;
case 45:
-#line 194 "levcomp.ypp"
+#line 196 "levcomp.ypp"
{ }
break;
case 46:
-#line 195 "levcomp.ypp"
+#line 197 "levcomp.ypp"
{ }
break;
case 47:
-#line 199 "levcomp.ypp"
+#line 201 "levcomp.ypp"
{
lc_map.validate.add(yylineno, (yyvsp[(1) - (1)].text));
}
break;
case 48:
-#line 203 "levcomp.ypp"
+#line 205 "levcomp.ypp"
{ }
break;
case 49:
-#line 205 "levcomp.ypp"
+#line 207 "levcomp.ypp"
{ }
break;
case 50:
-#line 206 "levcomp.ypp"
+#line 208 "levcomp.ypp"
{ }
break;
case 51:
-#line 210 "levcomp.ypp"
+#line 212 "levcomp.ypp"
{
lc_map.veto.add(yylineno, (yyvsp[(1) - (1)].text));
}
break;
case 52:
-#line 214 "levcomp.ypp"
+#line 216 "levcomp.ypp"
{ }
break;
case 53:
-#line 216 "levcomp.ypp"
+#line 218 "levcomp.ypp"
{ }
break;
case 54:
-#line 217 "levcomp.ypp"
+#line 219 "levcomp.ypp"
{ }
break;
case 55:
-#line 221 "levcomp.ypp"
+#line 223 "levcomp.ypp"
{
lc_map.prelude.add(yylineno, (yyvsp[(1) - (1)].text));
}
break;
case 56:
-#line 225 "levcomp.ypp"
+#line 227 "levcomp.ypp"
{ }
break;
case 57:
-#line 227 "levcomp.ypp"
+#line 229 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1781,12 +1781,12 @@ yyreduce:
break;
case 58:
-#line 234 "levcomp.ypp"
+#line 236 "levcomp.ypp"
{ }
break;
case 59:
-#line 236 "levcomp.ypp"
+#line 238 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1796,12 +1796,12 @@ yyreduce:
break;
case 60:
-#line 243 "levcomp.ypp"
+#line 245 "levcomp.ypp"
{ }
break;
case 61:
-#line 245 "levcomp.ypp"
+#line 247 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1811,12 +1811,12 @@ yyreduce:
break;
case 62:
-#line 252 "levcomp.ypp"
+#line 254 "levcomp.ypp"
{}
break;
case 65:
-#line 260 "levcomp.ypp"
+#line 262 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1826,12 +1826,12 @@ yyreduce:
break;
case 66:
-#line 267 "levcomp.ypp"
+#line 269 "levcomp.ypp"
{}
break;
case 69:
-#line 275 "levcomp.ypp"
+#line 277 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1841,37 +1841,40 @@ yyreduce:
break;
case 70:
-#line 283 "levcomp.ypp"
- { }
- break;
-
- case 71:
#line 286 "levcomp.ypp"
- { }
+ {
+ lc_map.main.add(yylineno, "marker(");
+ start_marker_segment = true;
+ }
break;
- case 72:
-#line 287 "levcomp.ypp"
- { }
+ case 71:
+#line 291 "levcomp.ypp"
+ {
+ lc_map.main.add(yylineno, ")");
+ }
break;
- case 73:
-#line 291 "levcomp.ypp"
+ case 75:
+#line 303 "levcomp.ypp"
{
lc_map.main.add(
- yylineno,
- make_stringf("marker(\"%s\")",
+ yylineno,
+ make_stringf(
+ "%s\"%s\"",
+ start_marker_segment? "" : " .. ",
quote_lua_string((yyvsp[(1) - (1)].text)).c_str()));
+ start_marker_segment = false;
}
break;
- case 74:
-#line 299 "levcomp.ypp"
+ case 76:
+#line 314 "levcomp.ypp"
{ }
break;
- case 77:
-#line 307 "levcomp.ypp"
+ case 79:
+#line 322 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1880,13 +1883,13 @@ yyreduce:
}
break;
- case 78:
-#line 315 "levcomp.ypp"
+ case 80:
+#line 330 "levcomp.ypp"
{ }
break;
- case 81:
-#line 323 "levcomp.ypp"
+ case 83:
+#line 338 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1895,18 +1898,18 @@ yyreduce:
}
break;
- case 82:
-#line 331 "levcomp.ypp"
+ case 84:
+#line 346 "levcomp.ypp"
{}
break;
- case 83:
-#line 332 "levcomp.ypp"
+ case 85:
+#line 347 "levcomp.ypp"
{}
break;
- case 86:
-#line 340 "levcomp.ypp"
+ case 88:
+#line 355 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1915,18 +1918,18 @@ yyreduce:
}
break;
- case 87:
-#line 347 "levcomp.ypp"
+ case 89:
+#line 362 "levcomp.ypp"
{}
break;
- case 88:
-#line 348 "levcomp.ypp"
+ case 90:
+#line 363 "levcomp.ypp"
{}
break;
- case 91:
-#line 356 "levcomp.ypp"
+ case 93:
+#line 371 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1935,8 +1938,8 @@ yyreduce:
}
break;
- case 92:
-#line 365 "levcomp.ypp"
+ case 94:
+#line 380 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1945,13 +1948,13 @@ yyreduce:
}
break;
- case 93:
-#line 373 "levcomp.ypp"
+ case 95:
+#line 388 "levcomp.ypp"
{}
break;
- case 94:
-#line 375 "levcomp.ypp"
+ case 96:
+#line 390 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1960,8 +1963,8 @@ yyreduce:
}
break;
- case 95:
-#line 384 "levcomp.ypp"
+ case 97:
+#line 399 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1969,13 +1972,13 @@ yyreduce:
}
break;
- case 96:
-#line 391 "levcomp.ypp"
+ case 98:
+#line 406 "levcomp.ypp"
{}
break;
- case 97:
-#line 393 "levcomp.ypp"
+ case 99:
+#line 408 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1984,8 +1987,8 @@ yyreduce:
}
break;
- case 101:
-#line 409 "levcomp.ypp"
+ case 103:
+#line 424 "levcomp.ypp"
{
lc_map.main.add(
yylineno,
@@ -1996,7 +1999,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 2000 "levcomp.tab.c"
+#line 2003 "levcomp.tab.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2210,6 +2213,6 @@ yyreturn:
}
-#line 417 "levcomp.ypp"
+#line 432 "levcomp.ypp"
diff --git a/crawl-ref/source/prebuilt/levcomp.tab.h b/crawl-ref/source/prebuilt/levcomp.tab.h
index c39475f183..c270bb0f82 100644
--- a/crawl-ref/source/prebuilt/levcomp.tab.h
+++ b/crawl-ref/source/prebuilt/levcomp.tab.h
@@ -104,7 +104,7 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 44 "levcomp.ypp"
+#line 46 "levcomp.ypp"
{
int i;
const char *text;