From fe1bc681ba2164f60d452999b0c7253c3e6e7c16 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Wed, 23 Mar 2011 18:51:57 -0400 Subject: [PATCH] Return an error for the empty string when a word is expected. Allow an ID for per-user or per-runas Defaults. --- plugins/sudoers/toke.c | 1321 ++++++++++++++++++++-------------------- plugins/sudoers/toke.l | 9 +- 2 files changed, 670 insertions(+), 660 deletions(-) diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c index 0816c5e0e..280ce84ef 100644 --- a/plugins/sudoers/toke.c +++ b/plugins/sudoers/toke.c @@ -291,7 +291,7 @@ static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); #define YY_NUM_RULES 55 #define YY_END_OF_BUFFER 56 -static yyconst short int yy_accept[593] = +static yyconst short int yy_accept[596] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 43, 51, 50, 49, 42, 54, 43, @@ -348,16 +348,16 @@ static yyconst short int yy_accept[593] = 36, 36, 36, 36, 36, 36, 36, 36, 36, 0, 30, 38, 38, 38, 0, 0, 0, 21, 20, 0, - 0, 0, 0, 20, 0, 43, 43, 43, 35, 35, - 0, 0, 0, 36, 36, 36, 36, 36, 36, 36, + 0, 0, 0, 0, 20, 0, 43, 43, 43, 35, + 35, 0, 0, 0, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 0, 28, 38, 38, 21, 0, 18, 0, 43, - 43, 43, 43, 43, 0, 0, 0, 0, 0, 36, - 36, 36, 36, 36, 36, 36, 36, 0, 31, 38, - 0, 43, 43, 43, 36, 36, 36, 36, 36, 36, - 0, 29, 0, 43, 43, 43, 43, 43, 36, 36, - 36, 36, 36, 0, 19, 34, 34, 34, 34, 34, - 34, 0 + 36, 36, 0, 28, 38, 38, 21, 0, 18, 0, + 0, 20, 43, 43, 43, 43, 43, 0, 0, 0, + 0, 0, 36, 36, 36, 36, 36, 36, 36, 36, + 0, 31, 38, 0, 43, 43, 43, 36, 36, 36, + 36, 36, 36, 0, 29, 0, 43, 43, 43, 43, + 43, 36, 36, 36, 36, 36, 0, 19, 34, 34, + 34, 34, 34, 34, 0 } ; @@ -395,165 +395,165 @@ static yyconst int yy_ec[256] = static yyconst int yy_meta[66] = { 0, - 1, 2, 3, 4, 5, 6, 1, 7, 7, 1, - 1, 6, 1, 8, 9, 10, 10, 10, 10, 10, - 10, 10, 10, 11, 12, 7, 1, 10, 10, 10, + 1, 2, 3, 4, 5, 2, 1, 6, 6, 1, + 1, 7, 1, 8, 9, 10, 10, 10, 10, 10, + 10, 10, 10, 11, 12, 6, 1, 10, 10, 10, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 15, 15, 15, 15, 15, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14 } ; -static yyconst short int yy_base[657] = +static yyconst short int yy_base[660] = { 0, 0, 64, 65, 66, 85, 100, 147, 211, 275, 322, - 71, 111, 2567, 2508, 2543, 3657, 2538, 3657, 368, 45, - 3657, 3657, 2462, 3657, 113, 378, 124, 146, 2483, 3657, - 3657, 433, 2459, 483, 2466, 2465, 2475, 2453, 537, 154, - 31, 150, 561, 2416, 2386, 2376, 2371, 2372, 80, 203, - 2429, 288, 35, 0, 3657, 2426, 3657, 0, 305, 616, - 82, 0, 2381, 3657, 82, 3657, 86, 3657, 124, 2370, - 84, 131, 3657, 152, 2367, 638, 2403, 2368, 2362, 3657, - 211, 219, 75, 2316, 336, 2315, 663, 410, 2299, 688, - 234, 699, 2308, 2311, 356, 500, 169, 2300, 145, 739, - - 0, 2291, 2280, 262, 2260, 2256, 134, 3657, 130, 524, - 2239, 2243, 2232, 2227, 2227, 98, 198, 76, 235, 241, - 195, 283, 2287, 569, 2286, 567, 2238, 793, 257, 0, - 2281, 190, 3657, 3657, 578, 242, 0, 2236, 344, 3657, - 3657, 2235, 310, 2232, 2272, 289, 312, 245, 2262, 2260, - 2259, 2212, 818, 545, 831, 866, 901, 936, 2245, 2234, - 976, 307, 1017, 1057, 2227, 2197, 2195, 2190, 2200, 2195, - 2184, 2193, 242, 2162, 2161, 2134, 2134, 2139, 303, 304, - 2142, 295, 270, 303, 600, 271, 2189, 2187, 635, 368, - 1099, 1134, 511, 315, 2108, 2107, 685, 350, 2106, 2105, - - 388, 716, 1169, 724, 404, 1210, 758, 2077, 381, 378, - 2054, 2046, 2036, 2034, 2015, 2022, 387, 2006, 2008, 1993, - 1989, 1976, 401, 389, 580, 379, 391, 1252, 1287, 1322, - 1992, 1989, 790, 1956, 1954, 1952, 1951, 529, 815, 593, + 71, 111, 2669, 2620, 2657, 3657, 2643, 3657, 368, 45, + 3657, 3657, 2590, 3657, 113, 378, 124, 146, 2592, 3657, + 3657, 433, 2561, 483, 2568, 2567, 2577, 2558, 537, 154, + 31, 150, 561, 2508, 2512, 2495, 2480, 2479, 80, 203, + 2508, 288, 35, 0, 3657, 2503, 3657, 0, 305, 616, + 82, 0, 2458, 3657, 82, 3657, 86, 3657, 124, 2457, + 84, 131, 3657, 152, 2456, 638, 2501, 2481, 2472, 3657, + 211, 219, 75, 2402, 336, 2392, 663, 410, 2389, 688, + 234, 699, 2412, 2421, 356, 500, 169, 2410, 145, 739, + + 0, 2401, 2396, 262, 2386, 2384, 134, 3657, 130, 524, + 2357, 2351, 2311, 2300, 2301, 98, 198, 76, 235, 241, + 195, 283, 2345, 569, 2322, 567, 2275, 793, 257, 0, + 2309, 190, 3657, 3657, 578, 242, 0, 2254, 344, 3657, + 3657, 2251, 310, 2250, 2292, 289, 312, 245, 2294, 2292, + 2288, 2242, 818, 545, 831, 866, 901, 936, 2275, 2264, + 976, 307, 1017, 1057, 2256, 2236, 2237, 2239, 2236, 2231, + 2220, 2227, 242, 2198, 2202, 2179, 2172, 2175, 303, 304, + 2178, 295, 270, 303, 600, 271, 2225, 2223, 635, 368, + 1099, 1134, 511, 315, 2198, 2196, 685, 350, 2192, 2173, + + 388, 716, 1169, 724, 404, 1210, 758, 2170, 381, 378, + 2161, 2159, 2149, 2147, 2086, 2093, 387, 2077, 2079, 2037, + 2036, 2017, 401, 389, 580, 379, 391, 1252, 1287, 1322, + 2054, 2053, 790, 2023, 2015, 2014, 1992, 529, 815, 593, 839, 596, 1357, 0, 849, 1368, 874, 660, 1409, 884, - 603, 3657, 1936, 1913, 1910, 1869, 1875, 1867, 1867, 1852, - 561, 1847, 1830, 1830, 153, 575, 306, 568, 912, 612, - 1451, 1486, 922, 1853, 1852, 1822, 1818, 1519, 598, 955, + 603, 3657, 1941, 1934, 1946, 1926, 1932, 1925, 1909, 1893, + 561, 1888, 1871, 1872, 153, 575, 306, 568, 912, 612, + 1451, 1486, 922, 1910, 1894, 1893, 1875, 1519, 598, 955, 995, 1036, 646, 671, 749, 1074, 772, 1561, 0, 1109, - 1572, 1082, 892, 1613, 1118, 1800, 1788, 724, 513, 1778, + 1572, 1082, 892, 1613, 1118, 1858, 1834, 724, 513, 1830, - 1785, 764, 780, 625, 1794, 1725, 507, 508, 460, 768, - 1654, 1688, 1722, 1743, 1709, 1690, 1142, 1757, 1150, 963, - 1797, 1188, 1158, 1626, 1229, 1262, 1272, 857, 901, 1243, + 1804, 764, 780, 625, 1812, 1773, 507, 508, 460, 768, + 1654, 1688, 1722, 1799, 1798, 1759, 1142, 1757, 1150, 963, + 1797, 1188, 1158, 1753, 1229, 1262, 1272, 857, 901, 1243, 1297, 1297, 1308, 1839, 0, 1310, 1850, 1330, 1003, 1891, - 1340, 1594, 1575, 875, 3657, 1528, 1520, 1532, 1517, 924, - 3657, 961, 3657, 736, 1488, 1468, 645, 889, 611, 897, - 1386, 676, 1932, 1966, 1395, 1472, 1471, 1428, 617, 1459, + 1340, 1689, 1674, 875, 3657, 1602, 1594, 1584, 1553, 924, + 3657, 961, 3657, 736, 1506, 1499, 645, 889, 611, 897, + 1386, 676, 1932, 1966, 1395, 1538, 1522, 1428, 617, 1459, 815, 2001, 0, 688, 2012, 1467, 1044, 2052, 1496, 1506, 1538, 1591, 986, 1027, 1442, 1477, 1630, 1664, 2094, 0, - 1666, 2105, 1638, 1196, 1675, 1410, 1398, 1326, 1321, 1001, + 1666, 2105, 1638, 1196, 1675, 1488, 1411, 1326, 1321, 1001, 1042, 1289, 1245, 1190, 1141, 675, 1708, 1155, 2147, 2182, 2217, 2252, 1171, 1699, 1732, 1743, 1125, 1230, 1263, 1707, 1341, 2287, 0, 818, 2298, 1774, 1278, 2338, 1816, 1782, 1128, 1869, 1910, 1942, 1506, 1529, 1901, 860, 1067, 2380, 0, 1061, 1194, 1088, 1070, 1066, 1235, 3657, 1393, 3657, - 993, 1541, 1962, 627, 899, 1450, 1614, 1950, 1319, 2390, + 993, 1541, 1962, 627, 899, 1614, 1891, 1950, 1319, 2390, 2425, 2460, 2495, 1827, 1974, 988, 1985, 2031, 2071, 927, - 920, 1744, 1758, 2077, 1870, 2530, 0, 1123, 2541, 2122, - 1918, 2581, 2157, 2131, 2166, 2191, 1582, 912, 1221, 1434, + 920, 1428, 1744, 2077, 1758, 2530, 0, 1123, 2541, 2122, + 1477, 2581, 2157, 2131, 2166, 2191, 1582, 912, 1221, 1434, 3657, 1509, 835, 802, 765, 818, 318, 767, 2007, 2213, - 2219, 2239, 2270, 2243, 2408, 2623, 2658, 2693, 2233, 1683, - 2317, 2357, 2405, 779, 761, 1986, 2013, 2433, 2032, 2728, - 0, 1233, 2739, 2441, 2325, 2470, 768, 2479, 2504, 2366, - 750, 1596, 3657, 1597, 655, 3657, 663, 3657, 1366, 2518, - 1387, 2781, 2816, 2560, 2449, 635, 2600, 2633, 2568, 549, - 543, 2148, 536, 495, 2643, 0, 1371, 1615, 3657, 1745, - 2217, 2851, 2886, 2921, 2666, 2674, 2682, 387, 0, 379, - 1782, 3657, 281, 2706, 1483, 2956, 2991, 2716, 3657, 2756, - 2764, 2512, 3657, 135, 3657, 2792, 2800, 2833, 72, 2866, - 2842, 3657, 3039, 3054, 3069, 3084, 3099, 3114, 3129, 3144, - - 3159, 3165, 3180, 3195, 1479, 3210, 3225, 3240, 3255, 3270, - 3285, 3300, 3306, 3313, 3328, 3343, 3349, 3356, 3362, 3368, - 3374, 3381, 3387, 3393, 3399, 3406, 3414, 3420, 3426, 3432, - 3439, 3447, 3453, 3459, 3466, 3474, 3480, 3488, 3495, 3503, - 3509, 3517, 3524, 3532, 3547, 3562, 3568, 3576, 3583, 3598, - 3604, 3612, 3618, 3626, 861, 3641 + 2219, 2239, 2233, 2268, 2277, 2406, 2623, 2658, 2693, 2315, + 1683, 2357, 2403, 2435, 779, 761, 1870, 1986, 2323, 2013, + 2728, 0, 1233, 2739, 2443, 2040, 2470, 768, 2479, 2504, + 2366, 750, 1597, 3657, 1615, 655, 3657, 663, 3657, 1366, + 2512, 2558, 2566, 1387, 2781, 2816, 2601, 2607, 635, 2634, + 2644, 2668, 549, 543, 2148, 536, 495, 2676, 0, 1371, + 1745, 3657, 1782, 2245, 2851, 2886, 2921, 2701, 2709, 2717, + 387, 0, 379, 1822, 3657, 281, 2757, 1518, 2956, 2991, + 2767, 3657, 2790, 2800, 2451, 3657, 135, 3657, 2827, 2835, + 2868, 72, 2901, 2520, 3657, 3039, 3054, 3069, 3084, 3099, + + 3114, 3129, 3144, 3159, 3165, 3180, 3195, 1439, 3210, 3225, + 3240, 3255, 3270, 3285, 3300, 3306, 3313, 3328, 3343, 3349, + 3356, 3362, 3368, 3374, 3381, 3387, 3393, 3399, 3406, 3414, + 3420, 3426, 3432, 3439, 3447, 3453, 3459, 3466, 3474, 3480, + 3488, 3495, 3503, 3509, 3517, 3524, 3532, 3547, 3562, 3568, + 3576, 3583, 3598, 3604, 3612, 3618, 3626, 861, 3641 } ; -static yyconst short int yy_def[657] = +static yyconst short int yy_def[660] = { 0, - 592, 1, 1, 1, 593, 593, 594, 594, 595, 595, - 596, 596, 592, 597, 592, 592, 592, 592, 598, 599, - 592, 592, 600, 592, 601, 597, 26, 26, 602, 592, - 592, 592, 32, 32, 34, 34, 34, 34, 597, 26, - 597, 592, 598, 32, 32, 34, 34, 34, 592, 592, - 592, 603, 597, 604, 592, 604, 592, 604, 592, 598, - 592, 605, 606, 592, 606, 592, 606, 592, 607, 608, - 608, 608, 592, 592, 597, 597, 592, 592, 609, 592, - 610, 592, 599, 611, 599, 600, 600, 601, 612, 597, - 597, 26, 602, 92, 92, 92, 92, 613, 614, 32, - - 34, 34, 34, 34, 34, 34, 597, 592, 597, 592, - 592, 592, 592, 592, 592, 609, 597, 92, 597, 597, - 597, 592, 592, 592, 592, 603, 615, 597, 597, 604, - 604, 592, 592, 592, 610, 592, 605, 606, 606, 592, - 592, 606, 606, 608, 592, 608, 608, 592, 592, 609, - 616, 611, 611, 592, 597, 597, 597, 92, 158, 617, - 592, 618, 592, 32, 34, 34, 34, 34, 34, 34, - 34, 34, 597, 592, 592, 592, 592, 592, 609, 597, - 158, 597, 597, 597, 592, 597, 592, 616, 597, 597, - 597, 597, 597, 597, 619, 620, 620, 197, 621, 620, - - 622, 163, 592, 203, 203, 592, 203, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 597, 592, 592, 592, - 592, 592, 609, 597, 597, 597, 597, 597, 597, 597, - 592, 623, 623, 233, 623, 624, 625, 626, 592, 627, - 206, 627, 627, 243, 627, 592, 246, 246, 592, 246, - 592, 592, 34, 34, 34, 34, 34, 34, 34, 34, - 597, 592, 592, 592, 609, 597, 597, 597, 597, 597, - 597, 597, 597, 628, 628, 629, 630, 592, 592, 592, - 592, 592, 631, 631, 632, 249, 632, 632, 288, 632, - 592, 291, 291, 592, 291, 34, 34, 34, 34, 34, - - 34, 34, 34, 597, 592, 592, 609, 597, 597, 597, - 597, 597, 597, 592, 633, 634, 278, 592, 318, 318, - 592, 318, 592, 592, 592, 592, 592, 592, 635, 635, - 636, 294, 636, 636, 334, 636, 592, 337, 337, 592, - 337, 34, 34, 592, 592, 34, 34, 34, 34, 592, - 592, 592, 592, 597, 592, 592, 609, 597, 597, 597, - 597, 597, 597, 597, 597, 592, 637, 592, 638, 321, - 638, 638, 372, 372, 592, 375, 375, 592, 375, 592, - 592, 592, 592, 639, 639, 640, 340, 640, 640, 389, - 640, 592, 392, 392, 392, 34, 34, 34, 34, 34, - - 34, 597, 592, 592, 609, 597, 597, 597, 597, 597, - 597, 597, 592, 592, 592, 592, 641, 641, 642, 378, - 642, 642, 422, 422, 592, 425, 425, 592, 425, 592, - 592, 592, 592, 592, 592, 643, 643, 644, 644, 644, - 440, 440, 34, 34, 34, 34, 592, 592, 592, 592, - 592, 592, 609, 609, 597, 645, 646, 597, 597, 597, - 597, 597, 597, 597, 592, 592, 592, 592, 592, 592, - 647, 647, 648, 428, 648, 648, 476, 476, 592, 479, - 479, 592, 479, 592, 592, 592, 592, 649, 649, 592, - 592, 34, 34, 34, 592, 650, 609, 597, 645, 645, - - 645, 645, 645, 646, 646, 597, 597, 597, 597, 597, - 592, 592, 592, 592, 651, 651, 652, 482, 652, 652, - 520, 520, 592, 523, 523, 523, 592, 592, 592, 592, - 592, 592, 592, 34, 34, 592, 650, 592, 609, 597, - 597, 597, 597, 597, 592, 592, 592, 592, 592, 592, - 653, 653, 654, 654, 654, 555, 555, 592, 592, 34, - 609, 597, 597, 597, 592, 592, 592, 592, 655, 655, - 592, 592, 656, 597, 597, 597, 597, 597, 592, 592, - 592, 592, 592, 656, 592, 597, 597, 597, 597, 597, - 597, 0, 592, 592, 592, 592, 592, 592, 592, 592, - - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592 + 595, 1, 1, 1, 596, 596, 597, 597, 598, 598, + 599, 599, 595, 600, 595, 595, 595, 595, 601, 602, + 595, 595, 603, 595, 604, 600, 26, 26, 605, 595, + 595, 595, 32, 32, 34, 34, 34, 34, 600, 26, + 600, 595, 601, 32, 32, 34, 34, 34, 595, 595, + 595, 606, 600, 607, 595, 607, 595, 607, 595, 601, + 595, 608, 609, 595, 609, 595, 609, 595, 610, 611, + 611, 611, 595, 595, 600, 600, 595, 595, 612, 595, + 613, 595, 602, 614, 602, 603, 603, 604, 615, 600, + 600, 26, 605, 92, 92, 92, 92, 616, 617, 32, + + 34, 34, 34, 34, 34, 34, 600, 595, 600, 595, + 595, 595, 595, 595, 595, 612, 600, 92, 600, 600, + 600, 595, 595, 595, 595, 606, 618, 600, 600, 607, + 607, 595, 595, 595, 613, 595, 608, 609, 609, 595, + 595, 609, 609, 611, 595, 611, 611, 595, 595, 612, + 619, 614, 614, 595, 600, 600, 600, 92, 158, 620, + 595, 621, 595, 32, 34, 34, 34, 34, 34, 34, + 34, 34, 600, 595, 595, 595, 595, 595, 612, 600, + 158, 600, 600, 600, 595, 600, 595, 619, 600, 600, + 600, 600, 600, 600, 622, 623, 623, 197, 624, 623, + + 625, 163, 595, 203, 203, 595, 203, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 600, 595, 595, 595, + 595, 595, 612, 600, 600, 600, 600, 600, 600, 600, + 595, 626, 626, 233, 626, 627, 628, 629, 595, 630, + 206, 630, 630, 243, 630, 595, 246, 246, 595, 246, + 595, 595, 34, 34, 34, 34, 34, 34, 34, 34, + 600, 595, 595, 595, 612, 600, 600, 600, 600, 600, + 600, 600, 600, 631, 631, 632, 633, 595, 595, 595, + 595, 595, 634, 634, 635, 249, 635, 635, 288, 635, + 595, 291, 291, 595, 291, 34, 34, 34, 34, 34, + + 34, 34, 34, 600, 595, 595, 612, 600, 600, 600, + 600, 600, 600, 595, 636, 637, 278, 595, 318, 318, + 595, 318, 595, 595, 595, 595, 595, 595, 638, 638, + 639, 294, 639, 639, 334, 639, 595, 337, 337, 595, + 337, 34, 34, 595, 595, 34, 34, 34, 34, 595, + 595, 595, 595, 600, 595, 595, 612, 600, 600, 600, + 600, 600, 600, 600, 600, 595, 640, 595, 641, 321, + 641, 641, 372, 372, 595, 375, 375, 595, 375, 595, + 595, 595, 595, 642, 642, 643, 340, 643, 643, 389, + 643, 595, 392, 392, 392, 34, 34, 34, 34, 34, + + 34, 600, 595, 595, 612, 600, 600, 600, 600, 600, + 600, 600, 595, 595, 595, 595, 644, 644, 645, 378, + 645, 645, 422, 422, 595, 425, 425, 595, 425, 595, + 595, 595, 595, 595, 595, 646, 646, 647, 647, 647, + 440, 440, 34, 34, 34, 34, 595, 595, 595, 595, + 595, 595, 612, 612, 600, 648, 649, 600, 600, 600, + 600, 600, 600, 600, 595, 595, 595, 595, 595, 595, + 650, 650, 651, 428, 651, 651, 476, 476, 595, 479, + 479, 595, 479, 595, 595, 595, 595, 652, 652, 595, + 595, 34, 34, 34, 595, 653, 612, 600, 648, 648, + + 648, 648, 595, 648, 649, 649, 600, 600, 600, 600, + 600, 595, 595, 595, 595, 654, 654, 655, 482, 655, + 655, 521, 521, 595, 524, 524, 524, 595, 595, 595, + 595, 595, 595, 595, 34, 34, 595, 653, 595, 612, + 595, 595, 600, 600, 600, 600, 600, 595, 595, 595, + 595, 595, 595, 656, 656, 657, 657, 657, 558, 558, + 595, 595, 34, 612, 600, 600, 600, 595, 595, 595, + 595, 658, 658, 595, 595, 659, 600, 600, 600, 600, + 600, 595, 595, 595, 595, 595, 659, 595, 600, 600, + 600, 600, 600, 600, 0, 595, 595, 595, 595, 595, + + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595 } ; static yyconst short int yy_nxt[3723] = @@ -567,12 +567,12 @@ static yyconst short int yy_nxt[3723] = 14, 14, 41, 14, 14, 42, 49, 49, 84, 43, 50, 50, 71, 16, 72, 73, 51, 51, 76, 52, 52, 122, 76, 136, 108, 146, 15, 55, 56, 75, - 57, 123, 85, 44, 45, 109, 57, 46, 592, 129, + 57, 123, 85, 44, 45, 109, 57, 46, 595, 129, 80, 15, 55, 56, 47, 57, 140, 48, 57, 58, 141, 57, 71, 16, 72, 73, 89, 89, 74, 76, 89, 89, 85, 57, 58, 143, 108, 53, 53, 139, - 181, 145, 59, 139, 147, 136, 108, 585, 89, 95, + 181, 145, 59, 139, 147, 136, 108, 588, 89, 95, 95, 95, 95, 95, 95, 95, 95, 59, 15, 16, 17, 110, 60, 148, 149, 80, 144, 179, 74, 161, 90, 96, 96, 96, 96, 96, 97, 75, 163, 94, @@ -588,7 +588,7 @@ static yyconst short int yy_nxt[3723] = 156, 157, 155, 155, 155, 155, 155, 180, 61, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 62, 15, 16, 17, 64, - 60, 76, 76, 585, 122, 65, 66, 67, 76, 76, + 60, 76, 76, 588, 122, 65, 66, 67, 76, 76, 146, 127, 127, 167, 123, 127, 127, 182, 168, 68, 183, 169, 217, 170, 76, 80, 132, 108, 133, 186, @@ -598,12 +598,12 @@ static yyconst short int yy_nxt[3723] = 83, 83, 76, 83, 83, 138, 68, 83, 138, 138, 76, 76, 134, 76, 223, 138, 224, 139, 224, 145, 83, 83, 76, 309, 224, 235, 235, 235, 138, 69, - 80, 159, 159, 159, 159, 159, 159, 159, 159, 539, + 80, 159, 159, 159, 159, 159, 159, 159, 159, 540, 81, 189, 251, 82, 82, 82, 82, 82, 82, 82, 82, 91, 368, 92, 92, 92, 92, 92, 92, 92, 92, 93, 161, 80, 252, 94, 94, 94, 94, 94, - 518, 202, 253, 89, 89, 76, 254, 89, 89, 244, + 519, 202, 253, 89, 89, 76, 254, 89, 89, 244, 244, 244, 244, 244, 245, 76, 76, 94, 94, 94, 94, 94, 94, 75, 76, 89, 76, 266, 76, 75, 261, 224, 75, 75, 268, 75, 75, 75, 100, 100, @@ -613,27 +613,27 @@ static yyconst short int yy_nxt[3723] = 76, 101, 94, 94, 94, 94, 94, 94, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 101, 101, - 101, 101, 101, 101, 101, 101, 592, 76, 592, 80, + 101, 101, 101, 101, 101, 101, 595, 76, 595, 80, 101, 101, 101, 101, 101, 159, 159, 159, 159, 159, 159, 159, 159, 359, 189, 110, 190, 190, 190, 190, 190, 190, 75, 75, 75, 75, 75, 75, 107, 108, 75, 75, 75, 161, 75, 75, 89, 346, 75, 368, 89, 347, 202, 111, 112, 76, 89, 113, 76, 357, - 75, 75, 75, 80, 114, 358, 518, 115, 89, 89, + 75, 75, 75, 80, 114, 358, 519, 115, 89, 89, 127, 127, 474, 81, 127, 127, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, - 82, 82, 127, 592, 592, 592, 592, 592, 592, 592, + 82, 82, 127, 595, 595, 595, 595, 595, 595, 595, - 592, 127, 308, 93, 251, 127, 239, 161, 76, 592, + 595, 127, 308, 93, 251, 127, 239, 161, 76, 595, 161, 127, 161, 304, 128, 76, 241, 116, 80, 241, 310, 202, 76, 127, 127, 269, 252, 76, 135, 80, - 368, 592, 592, 592, 592, 592, 592, 592, 592, 75, - 370, 75, 75, 75, 267, 75, 75, 80, 545, 75, + 368, 595, 595, 595, 595, 595, 595, 595, 595, 75, + 370, 75, 75, 75, 267, 75, 75, 80, 548, 75, 228, 229, 230, 228, 228, 228, 228, 228, 76, 76, - 161, 75, 75, 75, 86, 538, 86, 86, 86, 241, + 161, 75, 75, 75, 86, 539, 86, 86, 86, 241, 86, 86, 76, 407, 86, 289, 289, 289, 289, 289, 290, 354, 76, 497, 239, 161, 86, 86, 86, 88, - 361, 75, 75, 88, 241, 75, 75, 560, 405, 88, + 361, 75, 75, 88, 241, 75, 75, 563, 405, 88, 233, 233, 234, 235, 235, 235, 235, 235, 199, 417, 417, 88, 88, 75, 158, 158, 158, 158, 158, 158, @@ -642,20 +642,20 @@ static yyconst short int yy_nxt[3723] = 243, 243, 243, 243, 243, 243, 243, 345, 158, 158, 158, 158, 158, 158, 164, 164, 164, 164, 164, 164, 164, 164, 239, 161, 161, 350, 164, 164, 164, 164, - 164, 592, 286, 242, 242, 242, 242, 242, 242, 242, - 242, 352, 161, 76, 474, 592, 161, 351, 158, 158, + 164, 595, 286, 242, 242, 242, 242, 242, 242, 242, + 242, 352, 161, 76, 474, 595, 161, 351, 158, 158, 158, 158, 158, 158, 126, 286, 75, 75, 126, 402, 75, 75, 420, 353, 126, 275, 275, 275, 275, 275, 275, 275, 275, 199, 76, 76, 126, 126, 75, 152, - 538, 152, 152, 152, 360, 152, 152, 536, 592, 152, + 539, 152, 152, 152, 360, 152, 152, 537, 595, 152, 280, 281, 282, 280, 280, 280, 280, 280, 370, 471, - 471, 152, 152, 152, 189, 535, 190, 190, 190, 190, + 471, 152, 152, 152, 189, 536, 190, 190, 190, 190, 190, 190, 190, 190, 250, 250, 250, 250, 250, 250, 250, 250, 239, 161, 284, 284, 284, 284, 284, 284, - 583, 161, 241, 239, 161, 583, 344, 534, 76, 189, + 586, 161, 241, 239, 161, 586, 344, 535, 76, 189, 241, 191, 191, 191, 191, 191, 191, 191, 191, 288, - 288, 288, 288, 288, 288, 288, 288, 592, 345, 287, + 288, 288, 288, 288, 288, 288, 288, 595, 345, 287, 287, 287, 287, 287, 287, 287, 287, 335, 335, 335, 335, 335, 336, 76, 189, 161, 192, 192, 192, 192, @@ -676,26 +676,26 @@ static yyconst short int yy_nxt[3723] = 332, 326, 326, 326, 326, 326, 327, 324, 324, 423, 423, 423, 423, 423, 424, 450, 207, 207, 207, 207, 207, 207, 208, 208, 208, 208, 208, 208, 208, 208, - 592, 161, 488, 488, 208, 208, 208, 208, 208, 295, + 595, 161, 488, 488, 208, 208, 208, 208, 208, 295, 295, 295, 295, 295, 295, 295, 295, 334, 334, 334, 334, 334, 334, 334, 334, 494, 194, 194, 194, 194, 194, 194, 189, 493, 190, 190, 190, 190, 190, 190, 190, 190, 239, 161, 330, 330, 330, 330, 330, 330, - 492, 592, 286, 333, 333, 333, 333, 333, 333, 333, - 333, 430, 453, 80, 515, 515, 76, 189, 370, 190, + 492, 595, 286, 333, 333, 333, 333, 333, 333, 333, + 333, 430, 453, 80, 516, 516, 76, 189, 370, 190, 190, 190, 190, 190, 190, 190, 190, 322, 322, 322, 322, 322, 322, 322, 322, 372, 372, 372, 372, 372, 372, 372, 372, 380, 381, 382, 380, 380, 380, 380, 380, 76, 239, 161, 240, 240, 240, 240, 240, 240, 240, 240, 241, 454, 317, 490, 242, 242, 242, 242, - 242, 592, 76, 371, 371, 371, 371, 371, 371, 371, + 242, 595, 76, 371, 371, 371, 371, 371, 371, 371, 371, 441, 441, 441, 441, 441, 442, 491, 242, 242, 242, 242, 242, 242, 161, 246, 247, 248, 246, 246, 246, 246, 246, 249, 239, 161, 447, 250, 250, 250, 250, 250, 323, 368, 324, 324, 324, 324, 324, 324, - 324, 324, 452, 370, 551, 551, 239, 161, 448, 250, + 324, 324, 452, 370, 554, 554, 239, 161, 448, 250, 250, 250, 250, 250, 250, 269, 286, 270, 270, 270, 270, 270, 270, 270, 270, 323, 368, 324, 324, 324, 324, 324, 324, 324, 324, 323, 420, 324, 324, 324, @@ -703,195 +703,195 @@ static yyconst short int yy_nxt[3723] = 269, 451, 271, 271, 271, 271, 271, 271, 271, 271, 239, 161, 341, 341, 341, 341, 341, 341, 341, 341, - 332, 592, 161, 239, 161, 385, 385, 385, 385, 385, + 332, 595, 161, 239, 161, 385, 385, 385, 385, 385, 385, 332, 458, 332, 76, 269, 76, 272, 272, 272, 272, 272, 273, 270, 270, 389, 389, 389, 389, 389, - 389, 389, 389, 592, 592, 388, 388, 388, 388, 388, - 388, 388, 388, 446, 420, 445, 76, 561, 80, 76, + 389, 389, 389, 595, 595, 388, 388, 388, 388, 388, + 388, 388, 388, 446, 420, 445, 76, 564, 80, 76, 239, 161, 284, 284, 284, 284, 284, 284, 284, 284, 241, 239, 161, 285, 285, 285, 285, 285, 285, 285, - 285, 286, 569, 569, 449, 287, 287, 287, 287, 287, + 285, 286, 572, 572, 449, 287, 287, 287, 287, 287, - 540, 409, 410, 411, 412, 409, 409, 409, 409, 361, + 543, 409, 410, 411, 412, 409, 409, 409, 409, 361, 362, 362, 362, 362, 362, 362, 450, 287, 287, 287, 287, 287, 287, 161, 291, 292, 293, 291, 291, 291, 291, 291, 294, 76, 76, 490, 295, 295, 295, 295, - 295, 444, 76, 414, 415, 416, 414, 414, 414, 414, - 414, 500, 443, 501, 502, 239, 161, 491, 295, 295, + 295, 368, 76, 414, 415, 416, 414, 414, 414, 414, + 414, 420, 137, 137, 444, 239, 161, 491, 295, 295, 295, 295, 295, 295, 269, 332, 270, 270, 270, 270, 270, 270, 270, 270, 379, 379, 379, 379, 379, 379, 379, 379, 422, 422, 422, 422, 422, 422, 422, 422, - 239, 161, 137, 137, 317, 237, 574, 503, 76, 269, + 239, 161, 522, 522, 522, 522, 522, 523, 76, 269, - 387, 270, 270, 270, 270, 270, 270, 270, 270, 592, - 532, 421, 421, 421, 421, 421, 421, 421, 421, 430, + 387, 270, 270, 270, 270, 270, 270, 270, 270, 595, + 533, 421, 421, 421, 421, 421, 421, 421, 421, 430, 161, 431, 431, 431, 431, 431, 431, 431, 431, 332, - 76, 404, 533, 76, 318, 319, 320, 318, 318, 318, - 318, 318, 321, 161, 456, 403, 322, 322, 322, 322, + 443, 577, 534, 76, 318, 319, 320, 318, 318, 318, + 318, 318, 321, 161, 456, 317, 322, 322, 322, 322, 322, 430, 387, 432, 432, 432, 432, 432, 432, 432, - 432, 401, 400, 399, 456, 398, 456, 456, 322, 322, + 432, 237, 404, 403, 456, 76, 456, 456, 322, 322, 322, 322, 322, 322, 239, 161, 330, 330, 330, 330, 330, 330, 330, 330, 286, 239, 161, 331, 331, 331, - 331, 331, 331, 331, 331, 332, 161, 532, 558, 333, + 331, 331, 331, 331, 331, 332, 161, 401, 533, 333, 333, 333, 333, 333, 430, 387, 433, 433, 433, 433, - 433, 434, 431, 431, 397, 500, 558, 501, 502, 533, - 559, 333, 333, 333, 333, 333, 333, 161, 337, 338, - 339, 337, 337, 337, 337, 337, 340, 396, 559, 323, + 433, 434, 431, 431, 400, 500, 561, 501, 502, 503, + 534, 333, 333, 333, 333, 333, 333, 161, 337, 338, + 339, 337, 337, 337, 337, 337, 340, 399, 562, 398, 341, 341, 341, 341, 341, 395, 395, 395, 395, 395, 395, 395, 395, 440, 440, 440, 440, 440, 440, 440, - 440, 505, 341, 341, 341, 341, 341, 341, 361, 362, - 362, 362, 362, 362, 362, 362, 362, 592, 161, 239, - 161, 437, 437, 437, 437, 437, 437, 387, 592, 387, - 439, 439, 439, 439, 439, 439, 439, 439, 510, 510, + 440, 504, 341, 341, 341, 341, 341, 341, 361, 362, + 362, 362, 362, 362, 362, 362, 362, 595, 161, 239, + 161, 437, 437, 437, 437, 437, 437, 387, 595, 387, + 439, 439, 439, 439, 439, 439, 439, 439, 511, 511, - 510, 76, 361, 363, 363, 363, 363, 363, 363, 363, - 363, 456, 465, 317, 466, 466, 466, 466, 466, 466, + 511, 76, 361, 363, 363, 363, 363, 363, 363, 363, + 363, 456, 465, 397, 466, 466, 466, 466, 466, 466, 466, 466, 429, 429, 429, 429, 429, 429, 429, 429, - 76, 456, 237, 456, 457, 76, 361, 364, 364, 364, - 364, 364, 365, 362, 362, 465, 571, 467, 467, 467, + 76, 456, 396, 456, 457, 76, 361, 364, 364, 364, + 364, 364, 365, 362, 362, 465, 561, 467, 467, 467, 467, 467, 467, 467, 467, 76, 465, 368, 468, 468, - 468, 468, 468, 469, 466, 466, 199, 420, 572, 76, - 368, 368, 369, 369, 369, 369, 369, 369, 369, 369, - 370, 474, 356, 571, 371, 371, 371, 371, 371, 476, + 468, 468, 468, 469, 466, 466, 323, 474, 562, 76, + 368, 595, 369, 369, 369, 369, 369, 369, 369, 369, + 370, 474, 317, 574, 371, 371, 371, 371, 371, 476, 476, 476, 476, 476, 476, 476, 476, 484, 485, 486, - 484, 484, 484, 484, 484, 572, 371, 371, 371, 371, + 484, 484, 484, 484, 484, 575, 371, 371, 371, 371, 371, 371, 375, 376, 377, 375, 375, 375, 375, 375, - 378, 355, 349, 348, 379, 379, 379, 379, 379, 592, - 343, 475, 475, 475, 475, 475, 475, 475, 475, 342, - 458, 317, 510, 510, 510, 237, 379, 379, 379, 379, + 378, 237, 199, 574, 379, 379, 379, 379, 379, 595, + 356, 475, 475, 475, 475, 475, 475, 475, 475, 355, + 458, 349, 511, 511, 511, 575, 379, 379, 379, 379, 379, 379, 239, 161, 385, 385, 385, 385, 385, 385, 385, 385, 332, 239, 161, 386, 386, 386, 386, 386, - 386, 386, 386, 387, 76, 199, 199, 388, 388, 388, - 388, 388, 430, 592, 431, 431, 431, 431, 431, 431, - 431, 431, 262, 474, 306, 305, 303, 302, 301, 388, + 386, 386, 386, 387, 76, 348, 343, 388, 388, 388, + 388, 388, 430, 368, 431, 431, 431, 431, 431, 431, + 431, 431, 500, 474, 501, 502, 503, 342, 317, 388, 388, 388, 388, 388, 388, 161, 392, 393, 394, 392, - 392, 392, 392, 392, 239, 161, 300, 299, 395, 395, + 392, 392, 392, 392, 239, 161, 237, 199, 395, 395, 395, 395, 395, 430, 387, 431, 431, 431, 431, 431, - 431, 431, 431, 521, 521, 521, 521, 521, 522, 298, + 431, 431, 431, 199, 262, 306, 305, 303, 506, 302, 395, 395, 395, 395, 395, 395, 361, 362, 362, 362, - 362, 362, 362, 362, 362, 430, 297, 431, 431, 431, - 431, 431, 431, 453, 80, 506, 507, 508, 506, 506, - 506, 506, 506, 296, 278, 237, 496, 199, 274, 76, - 361, 362, 362, 362, 362, 362, 362, 362, 362, 511, - 512, 513, 511, 511, 511, 511, 511, 76, 465, 368, - - 466, 466, 466, 466, 466, 466, 466, 466, 592, 474, - 592, 592, 199, 76, 368, 99, 418, 418, 418, 418, - 418, 418, 418, 418, 370, 368, 368, 419, 419, 419, - 419, 419, 419, 419, 419, 420, 518, 262, 264, 421, - 421, 421, 421, 421, 465, 592, 466, 466, 466, 466, - 466, 466, 466, 466, 503, 518, 262, 263, 262, 260, - 259, 421, 421, 421, 421, 421, 421, 425, 426, 427, - 425, 425, 425, 425, 425, 428, 258, 257, 256, 429, - 429, 429, 429, 429, 465, 255, 466, 466, 466, 466, + 362, 362, 362, 362, 362, 430, 301, 431, 431, 431, + 431, 431, 431, 453, 80, 507, 508, 509, 507, 507, + 507, 507, 507, 300, 299, 298, 496, 297, 296, 76, + 361, 362, 362, 362, 362, 362, 362, 362, 362, 512, + 513, 514, 512, 512, 512, 512, 512, 76, 465, 368, + + 466, 466, 466, 466, 466, 466, 466, 466, 595, 519, + 595, 595, 595, 76, 368, 278, 418, 418, 418, 418, + 418, 418, 418, 418, 370, 368, 595, 419, 419, 419, + 419, 419, 419, 419, 419, 420, 519, 237, 199, 421, + 421, 421, 421, 421, 465, 274, 466, 466, 466, 466, + 466, 466, 466, 466, 504, 559, 559, 559, 559, 559, + 560, 421, 421, 421, 421, 421, 421, 425, 426, 427, + 425, 425, 425, 425, 425, 428, 199, 99, 262, 429, + 429, 429, 429, 429, 465, 264, 466, 466, 466, 466, 466, 466, 483, 483, 483, 483, 483, 483, 483, 483, - 93, 429, 429, 429, 429, 429, 429, 239, 161, 437, + 262, 429, 429, 429, 429, 429, 429, 239, 161, 437, 437, 437, 437, 437, 437, 437, 437, 387, 239, 161, - 438, 438, 438, 438, 438, 438, 438, 438, 199, 237, - 199, 99, 439, 439, 439, 439, 439, 520, 520, 520, - 520, 520, 520, 520, 520, 161, 527, 527, 527, 527, - 527, 527, 527, 527, 439, 439, 439, 439, 439, 439, + 438, 438, 438, 438, 438, 438, 438, 438, 263, 262, + 260, 259, 439, 439, 439, 439, 439, 521, 521, 521, + 521, 521, 521, 521, 521, 161, 528, 528, 528, 528, + 528, 528, 528, 528, 439, 439, 439, 439, 439, 439, 458, 368, 459, 459, 459, 459, 459, 459, 459, 459, - 592, 518, 519, 519, 519, 519, 519, 519, 519, 519, - 161, 528, 528, 528, 528, 528, 528, 528, 528, 80, - 187, 225, 222, 221, 76, 458, 220, 460, 460, 460, - - 460, 460, 460, 460, 460, 161, 529, 529, 529, 529, - 529, 530, 527, 527, 500, 219, 501, 502, 561, 80, - 592, 218, 501, 502, 216, 215, 214, 213, 212, 76, - 458, 573, 461, 461, 461, 461, 461, 462, 463, 463, - 592, 211, 592, 592, 592, 210, 592, 592, 509, 509, - 509, 509, 509, 509, 509, 509, 209, 99, 91, 153, - 503, 80, 80, 187, 76, 458, 503, 464, 464, 464, - 459, 459, 459, 459, 459, 499, 144, 499, 499, 145, - 76, 499, 139, 139, 131, 185, 503, 125, 125, 178, - 505, 177, 176, 499, 499, 499, 175, 174, 172, 76, - - 368, 171, 472, 472, 472, 472, 472, 472, 472, 472, - 420, 368, 166, 473, 473, 473, 473, 473, 473, 473, - 473, 474, 165, 99, 75, 475, 475, 475, 475, 475, - 545, 99, 546, 546, 546, 546, 546, 546, 546, 546, - 556, 556, 556, 556, 556, 557, 154, 475, 475, 475, + 595, 519, 520, 520, 520, 520, 520, 520, 520, 520, + 161, 529, 529, 529, 529, 529, 529, 529, 529, 258, + 257, 256, 255, 93, 76, 458, 199, 460, 460, 460, + + 460, 460, 460, 460, 460, 161, 530, 530, 530, 530, + 530, 531, 528, 528, 500, 237, 501, 502, 503, 199, + 595, 99, 501, 502, 503, 80, 187, 225, 222, 76, + 458, 221, 461, 461, 461, 461, 461, 462, 463, 463, + 595, 220, 595, 595, 503, 541, 564, 80, 542, 542, + 542, 542, 542, 542, 542, 542, 219, 218, 216, 576, + 504, 215, 214, 213, 76, 458, 504, 464, 464, 464, + 459, 459, 459, 459, 459, 499, 499, 212, 595, 499, + 595, 595, 595, 211, 210, 209, 504, 99, 91, 153, + 80, 499, 499, 499, 80, 187, 144, 145, 139, 76, + + 368, 139, 472, 472, 472, 472, 472, 472, 472, 472, + 420, 368, 131, 473, 473, 473, 473, 473, 473, 473, + 473, 474, 185, 125, 506, 475, 475, 475, 475, 475, + 510, 510, 510, 510, 510, 510, 510, 510, 527, 527, + 527, 527, 527, 527, 527, 527, 125, 475, 475, 475, 475, 475, 475, 479, 480, 481, 479, 479, 479, 479, - 479, 482, 87, 153, 80, 483, 483, 483, 483, 483, - 545, 78, 547, 547, 547, 547, 547, 547, 547, 547, - 161, 527, 527, 527, 527, 527, 527, 483, 483, 483, + 479, 482, 76, 178, 177, 483, 483, 483, 483, 483, + 548, 176, 549, 549, 549, 549, 549, 549, 549, 549, + 161, 528, 528, 528, 528, 528, 528, 483, 483, 483, 483, 483, 483, 239, 161, 489, 489, 489, 489, 489, - 489, 489, 489, 458, 77, 463, 463, 463, 463, 463, - 463, 463, 463, 504, 76, 504, 504, 145, 545, 504, - 548, 548, 548, 548, 548, 549, 546, 546, 139, 131, - 125, 504, 504, 504, 121, 120, 119, 76, 458, 118, - 463, 463, 463, 463, 463, 463, 463, 463, 526, 526, - 526, 526, 526, 526, 526, 526, 555, 555, 555, 555, - 555, 555, 555, 555, 565, 566, 567, 565, 565, 565, - 565, 565, 76, 458, 117, 463, 463, 463, 463, 463, - 463, 509, 509, 592, 106, 554, 554, 554, 554, 554, - 554, 554, 554, 161, 527, 527, 527, 527, 527, 527, - - 527, 527, 105, 104, 103, 102, 99, 76, 458, 87, - 509, 509, 509, 509, 509, 509, 509, 509, 161, 527, - 527, 527, 527, 527, 527, 527, 527, 579, 579, 579, - 579, 579, 579, 562, 563, 564, 562, 562, 562, 562, - 562, 78, 76, 368, 77, 516, 516, 516, 516, 516, - 516, 516, 516, 474, 368, 76, 517, 517, 517, 517, - 517, 517, 517, 517, 518, 76, 592, 592, 519, 519, - 519, 519, 519, 540, 592, 541, 541, 541, 541, 541, - 541, 545, 592, 546, 546, 546, 546, 546, 546, 592, - 519, 519, 519, 519, 519, 519, 523, 524, 525, 523, - - 523, 523, 523, 523, 592, 592, 592, 76, 526, 526, - 526, 526, 526, 545, 592, 546, 546, 546, 546, 546, - 546, 546, 546, 592, 592, 592, 592, 592, 592, 592, - 526, 526, 526, 526, 526, 526, 540, 592, 541, 541, - 541, 541, 541, 541, 541, 541, 545, 592, 546, 546, - 546, 546, 546, 546, 546, 546, 368, 592, 570, 570, - 570, 570, 570, 570, 570, 570, 592, 592, 592, 592, - 76, 540, 592, 542, 542, 542, 542, 542, 542, 542, - 542, 579, 579, 579, 579, 579, 579, 579, 579, 580, - 580, 580, 580, 580, 580, 580, 580, 581, 581, 581, - - 581, 581, 582, 579, 579, 76, 540, 592, 543, 543, - 543, 543, 543, 544, 541, 541, 592, 592, 592, 592, - 592, 586, 587, 588, 586, 586, 586, 586, 586, 574, - 592, 575, 575, 575, 575, 575, 575, 592, 592, 592, - 76, 368, 592, 552, 552, 552, 552, 552, 552, 552, - 552, 518, 368, 76, 553, 553, 553, 553, 553, 553, - 553, 553, 592, 76, 592, 592, 554, 554, 554, 554, - 554, 579, 579, 579, 579, 579, 579, 579, 579, 579, - 579, 579, 579, 579, 579, 579, 579, 592, 554, 554, - 554, 554, 554, 554, 540, 592, 541, 541, 541, 541, - - 541, 541, 541, 541, 592, 592, 592, 589, 589, 589, - 589, 589, 589, 589, 589, 586, 586, 586, 586, 586, - 586, 586, 586, 592, 592, 592, 592, 592, 76, 540, - 592, 541, 541, 541, 541, 541, 541, 541, 541, 76, - 592, 592, 592, 592, 592, 592, 592, 76, 590, 590, - 590, 590, 590, 591, 589, 589, 592, 589, 589, 589, - 589, 589, 589, 76, 574, 592, 575, 575, 575, 575, - 575, 575, 575, 575, 592, 592, 592, 592, 592, 592, - 76, 589, 589, 589, 589, 589, 589, 589, 589, 76, - 592, 592, 592, 592, 592, 592, 592, 592, 76, 574, - - 592, 576, 576, 576, 576, 576, 576, 576, 576, 592, - 592, 592, 592, 76, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 76, 574, 592, 577, 577, 577, 577, - 577, 578, 575, 575, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 76, 574, - 592, 575, 575, 575, 575, 575, 575, 575, 575, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - - 592, 592, 592, 76, 574, 592, 575, 575, 575, 575, - 575, 575, 575, 575, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 76, 54, + 489, 489, 489, 458, 175, 463, 463, 463, 463, 463, + 463, 463, 463, 505, 505, 174, 548, 505, 550, 550, + 550, 550, 550, 550, 550, 550, 172, 171, 166, 505, + 505, 505, 165, 99, 75, 99, 154, 76, 458, 87, + 463, 463, 463, 463, 463, 463, 463, 463, 548, 153, + 551, 551, 551, 551, 551, 552, 549, 549, 558, 558, + 558, 558, 558, 558, 558, 558, 582, 582, 582, 582, + 582, 582, 76, 458, 80, 463, 463, 463, 463, 463, + 463, 510, 510, 595, 78, 557, 557, 557, 557, 557, + 557, 557, 557, 161, 528, 528, 528, 528, 528, 528, + + 528, 528, 77, 76, 145, 139, 131, 76, 458, 125, + 510, 510, 510, 510, 510, 510, 510, 510, 161, 528, + 528, 528, 528, 528, 528, 528, 528, 542, 542, 542, + 542, 542, 542, 542, 542, 592, 592, 592, 592, 592, + 592, 121, 76, 368, 120, 517, 517, 517, 517, 517, + 517, 517, 517, 474, 368, 119, 518, 518, 518, 518, + 518, 518, 518, 518, 519, 118, 117, 76, 520, 520, + 520, 520, 520, 542, 542, 542, 542, 542, 542, 542, + 542, 565, 566, 567, 565, 565, 565, 565, 565, 106, + 520, 520, 520, 520, 520, 520, 524, 525, 526, 524, + + 524, 524, 524, 524, 105, 104, 103, 102, 527, 527, + 527, 527, 527, 76, 543, 99, 544, 544, 544, 544, + 544, 544, 568, 569, 570, 568, 568, 568, 568, 568, + 527, 527, 527, 527, 527, 527, 543, 87, 544, 544, + 544, 544, 544, 544, 544, 544, 78, 548, 76, 549, + 549, 549, 549, 549, 549, 549, 549, 548, 77, 549, + 549, 549, 549, 549, 549, 549, 549, 76, 595, 595, + 76, 543, 595, 545, 545, 545, 545, 545, 545, 545, + 545, 548, 595, 549, 549, 549, 549, 549, 549, 368, + 595, 573, 573, 573, 573, 573, 573, 573, 573, 595, + + 595, 595, 595, 595, 595, 76, 543, 595, 546, 546, + 546, 546, 546, 547, 544, 544, 582, 582, 582, 582, + 582, 582, 582, 582, 583, 583, 583, 583, 583, 583, + 583, 583, 584, 584, 584, 584, 584, 585, 582, 582, + 76, 368, 595, 555, 555, 555, 555, 555, 555, 555, + 555, 519, 368, 595, 556, 556, 556, 556, 556, 556, + 556, 556, 595, 595, 595, 595, 557, 557, 557, 557, + 557, 595, 589, 590, 591, 589, 589, 589, 589, 589, + 577, 595, 578, 578, 578, 578, 578, 578, 557, 557, + 557, 557, 557, 557, 543, 595, 544, 544, 544, 544, + + 544, 544, 544, 544, 76, 582, 582, 582, 582, 582, + 582, 582, 582, 595, 76, 582, 582, 582, 582, 582, + 582, 582, 582, 595, 595, 595, 595, 595, 76, 543, + 595, 544, 544, 544, 544, 544, 544, 544, 544, 595, + 595, 595, 592, 592, 592, 592, 592, 592, 592, 592, + 589, 589, 589, 589, 589, 589, 589, 589, 595, 595, + 595, 595, 595, 76, 577, 595, 578, 578, 578, 578, + 578, 578, 578, 578, 76, 595, 595, 595, 595, 595, + 595, 595, 76, 593, 593, 593, 593, 593, 594, 592, + 592, 595, 595, 595, 595, 595, 595, 595, 76, 577, + + 595, 579, 579, 579, 579, 579, 579, 579, 579, 595, + 595, 595, 595, 595, 595, 76, 592, 592, 592, 592, + 592, 592, 592, 592, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 76, 577, 595, 580, 580, 580, 580, + 580, 581, 578, 578, 595, 595, 595, 595, 76, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 76, 577, + 595, 578, 578, 578, 578, 578, 578, 578, 578, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + + 595, 595, 595, 76, 577, 595, 578, 578, 578, 578, + 578, 578, 578, 578, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 76, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 63, @@ -899,75 +899,75 @@ static yyconst short int yy_nxt[3723] = 63, 63, 63, 63, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 75, - 592, 592, 592, 592, 592, 592, 75, 75, 75, 592, - 592, 75, 75, 75, 79, 79, 79, 79, 79, 79, + 595, 595, 595, 595, 595, 595, 75, 75, 75, 595, + 595, 75, 75, 75, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 83, - 592, 592, 592, 592, 592, 592, 83, 83, 83, 83, - 592, 83, 83, 83, 86, 592, 592, 592, 592, 592, - 592, 86, 86, 86, 592, 592, 86, 86, 86, 88, - 592, 592, 88, 88, 592, 88, 88, 88, 88, 592, - 592, 88, 88, 88, 98, 98, 592, 592, 592, 98, - 126, 592, 592, 126, 126, 592, 126, 126, 126, 126, - 592, 592, 126, 126, 126, 130, 592, 592, 130, 130, - - 592, 130, 130, 130, 130, 592, 130, 592, 130, 130, - 138, 592, 592, 138, 592, 592, 138, 138, 138, 138, - 138, 592, 138, 138, 138, 142, 142, 142, 142, 142, + 595, 595, 595, 595, 595, 595, 83, 83, 83, 83, + 595, 83, 83, 83, 86, 595, 595, 595, 595, 595, + 595, 86, 86, 86, 595, 595, 86, 86, 86, 88, + 595, 595, 88, 88, 88, 595, 88, 88, 88, 595, + 595, 88, 88, 88, 98, 98, 595, 595, 595, 98, + 126, 595, 595, 126, 126, 126, 595, 126, 126, 126, + 595, 595, 126, 126, 126, 130, 595, 595, 130, 130, + + 130, 595, 130, 130, 130, 595, 130, 595, 130, 130, + 138, 595, 595, 138, 595, 138, 595, 138, 138, 138, + 138, 595, 138, 138, 138, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, 142, - 144, 144, 592, 144, 592, 144, 144, 144, 144, 144, + 144, 144, 595, 144, 595, 144, 144, 144, 144, 144, 144, 144, 144, 144, 144, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, 150, - 151, 151, 592, 151, 151, 151, 151, 151, 151, 151, - 151, 151, 151, 151, 151, 152, 592, 592, 592, 592, - 592, 592, 152, 152, 152, 592, 592, 152, 152, 152, - - 89, 592, 592, 89, 89, 592, 89, 89, 89, 89, - 592, 592, 89, 89, 89, 160, 160, 592, 592, 592, - 160, 162, 162, 162, 592, 592, 592, 162, 127, 592, - 592, 127, 127, 592, 127, 127, 127, 127, 592, 592, + 151, 151, 595, 151, 151, 151, 151, 151, 151, 151, + 151, 151, 151, 151, 151, 152, 595, 595, 595, 595, + 595, 595, 152, 152, 152, 595, 595, 152, 152, 152, + + 89, 595, 595, 89, 89, 89, 595, 89, 89, 89, + 595, 595, 89, 89, 89, 160, 160, 595, 595, 595, + 160, 162, 162, 162, 595, 595, 595, 162, 127, 595, + 595, 127, 127, 127, 595, 127, 127, 127, 595, 595, 127, 127, 127, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 188, 195, 195, - 592, 592, 592, 195, 201, 201, 201, 592, 592, 592, - 201, 231, 231, 592, 592, 592, 231, 232, 232, 592, - 592, 592, 232, 236, 236, 592, 592, 592, 236, 238, - 238, 238, 592, 592, 592, 238, 274, 274, 592, 592, - - 592, 274, 276, 276, 592, 592, 592, 276, 277, 277, - 592, 592, 592, 277, 279, 279, 279, 592, 592, 592, - 279, 283, 283, 283, 283, 592, 592, 592, 283, 314, - 314, 592, 592, 592, 314, 315, 315, 592, 592, 592, - 315, 316, 316, 592, 592, 592, 316, 328, 328, 328, - 592, 592, 592, 328, 329, 329, 329, 329, 592, 592, - 592, 329, 366, 366, 592, 592, 592, 366, 367, 367, - 592, 592, 592, 367, 383, 383, 383, 592, 592, 592, - 383, 384, 384, 384, 384, 592, 592, 592, 384, 413, - 413, 592, 592, 592, 413, 417, 592, 417, 417, 592, - - 592, 592, 417, 435, 435, 435, 592, 592, 592, 435, - 436, 436, 436, 436, 592, 592, 592, 436, 470, 470, - 592, 592, 592, 470, 471, 592, 471, 471, 592, 592, - 592, 471, 487, 487, 487, 592, 592, 592, 487, 488, - 488, 488, 592, 592, 592, 592, 488, 499, 499, 592, - 499, 499, 592, 592, 499, 499, 499, 592, 592, 499, - 499, 499, 504, 504, 592, 504, 504, 592, 592, 504, - 504, 504, 592, 592, 504, 504, 504, 514, 514, 592, - 592, 592, 514, 515, 592, 515, 515, 592, 592, 592, - 515, 531, 531, 592, 592, 592, 592, 531, 537, 537, - - 537, 537, 537, 537, 537, 537, 537, 537, 537, 537, - 537, 537, 537, 550, 550, 592, 592, 592, 550, 551, - 592, 551, 551, 592, 592, 592, 551, 568, 568, 592, - 592, 592, 568, 569, 592, 569, 592, 592, 592, 592, - 569, 584, 584, 584, 584, 584, 584, 584, 584, 584, - 584, 584, 584, 584, 584, 584, 13, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592 + 595, 595, 595, 195, 201, 201, 201, 595, 595, 595, + 201, 231, 231, 595, 595, 595, 231, 232, 232, 595, + 595, 595, 232, 236, 236, 595, 595, 595, 236, 238, + 238, 238, 595, 595, 595, 238, 274, 274, 595, 595, + + 595, 274, 276, 276, 595, 595, 595, 276, 277, 277, + 595, 595, 595, 277, 279, 279, 279, 595, 595, 595, + 279, 283, 283, 283, 283, 595, 595, 595, 283, 314, + 314, 595, 595, 595, 314, 315, 315, 595, 595, 595, + 315, 316, 316, 595, 595, 595, 316, 328, 328, 328, + 595, 595, 595, 328, 329, 329, 329, 329, 595, 595, + 595, 329, 366, 366, 595, 595, 595, 366, 367, 367, + 595, 595, 595, 367, 383, 383, 383, 595, 595, 595, + 383, 384, 384, 384, 384, 595, 595, 595, 384, 413, + 413, 595, 595, 595, 413, 417, 595, 417, 417, 595, + + 595, 595, 417, 435, 435, 435, 595, 595, 595, 435, + 436, 436, 436, 436, 595, 595, 595, 436, 470, 470, + 595, 595, 595, 470, 471, 595, 471, 471, 595, 595, + 595, 471, 487, 487, 487, 595, 595, 595, 487, 488, + 488, 488, 595, 595, 595, 595, 488, 499, 499, 595, + 499, 499, 595, 595, 499, 499, 499, 595, 595, 499, + 499, 499, 505, 505, 595, 505, 505, 595, 595, 505, + 505, 505, 595, 595, 505, 505, 505, 515, 515, 595, + 595, 595, 515, 516, 595, 516, 516, 595, 595, 595, + 516, 532, 532, 595, 595, 595, 595, 532, 538, 538, + + 538, 538, 538, 538, 538, 538, 538, 538, 538, 538, + 538, 538, 538, 553, 553, 595, 595, 595, 553, 554, + 595, 554, 554, 595, 595, 595, 554, 571, 571, 595, + 595, 595, 571, 572, 595, 572, 595, 595, 595, 595, + 572, 587, 587, 587, 587, 587, 587, 587, 587, 587, + 587, 587, 587, 587, 587, 587, 13, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595 } ; static yyconst short int yy_chk[3723] = @@ -984,9 +984,9 @@ static yyconst short int yy_chk[3723] = 5, 49, 20, 2, 2, 41, 5, 2, 83, 53, 116, 6, 6, 6, 2, 6, 65, 2, 5, 5, - 67, 6, 12, 12, 12, 12, 25, 25, 11, 589, + 67, 6, 12, 12, 12, 12, 25, 25, 11, 592, 25, 25, 83, 6, 6, 69, 69, 3, 4, 65, - 118, 71, 5, 67, 72, 107, 107, 584, 25, 27, + 118, 71, 5, 67, 72, 107, 107, 587, 25, 27, 27, 27, 27, 27, 27, 27, 27, 6, 7, 7, 7, 42, 7, 74, 74, 265, 74, 116, 12, 99, 25, 28, 28, 28, 28, 28, 28, 40, 99, 40, @@ -1002,7 +1002,7 @@ static yyconst short int yy_chk[3723] = 91, 91, 91, 91, 91, 91, 91, 117, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, - 9, 91, 119, 573, 122, 9, 9, 9, 120, 173, + 9, 91, 119, 576, 122, 9, 9, 9, 120, 173, 146, 52, 52, 104, 122, 52, 52, 119, 104, 9, 120, 104, 173, 104, 129, 179, 59, 59, 59, 129, @@ -1014,10 +1014,10 @@ static yyconst short int yy_chk[3723] = 85, 85, 194, 267, 184, 198, 198, 198, 139, 10, 19, 95, 95, 95, 95, 95, 95, 95, 95, 497, 19, 190, 209, 19, 19, 19, 19, 19, 19, 19, - 19, 26, 570, 26, 26, 26, 26, 26, 26, 26, + 19, 26, 573, 26, 26, 26, 26, 26, 26, 26, 26, 26, 201, 223, 209, 26, 26, 26, 26, 26, - 568, 201, 210, 88, 88, 190, 210, 88, 88, 205, + 571, 201, 210, 88, 88, 190, 210, 88, 88, 205, 205, 205, 205, 205, 205, 26, 226, 26, 26, 26, 26, 26, 26, 32, 217, 88, 224, 224, 227, 32, 217, 226, 32, 32, 227, 32, 32, 32, 32, 32, @@ -1027,14 +1027,14 @@ static yyconst short int yy_chk[3723] = 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 309, 554, 307, + 34, 34, 34, 34, 34, 34, 34, 309, 557, 307, 34, 34, 34, 34, 34, 96, 96, 96, 96, 96, 96, 96, 96, 309, 193, 110, 193, 193, 193, 193, 193, 193, 34, 34, 34, 34, 34, 34, 39, 39, - 39, 39, 39, 238, 39, 39, 154, 299, 39, 553, + 39, 39, 39, 238, 39, 39, 154, 299, 39, 556, 154, 299, 238, 110, 110, 308, 154, 110, 193, 307, - 39, 39, 39, 43, 110, 308, 551, 110, 154, 154, - 126, 126, 550, 43, 126, 126, 43, 43, 43, 43, + 39, 39, 39, 43, 110, 308, 554, 110, 154, 154, + 126, 126, 553, 43, 126, 126, 43, 43, 43, 43, 43, 43, 43, 43, 124, 124, 124, 124, 124, 124, 124, 124, 126, 135, 135, 135, 135, 135, 135, 135, @@ -1042,12 +1042,12 @@ static yyconst short int yy_chk[3723] = 242, 185, 279, 261, 126, 268, 240, 43, 60, 242, 268, 279, 266, 185, 185, 270, 251, 225, 60, 454, 369, 60, 60, 60, 60, 60, 60, 60, 60, 76, - 369, 76, 76, 76, 225, 76, 76, 357, 546, 76, + 369, 76, 76, 76, 225, 76, 76, 357, 549, 76, 189, 189, 189, 189, 189, 189, 189, 189, 359, 270, - 283, 76, 76, 76, 87, 537, 87, 87, 87, 283, + 283, 76, 76, 76, 87, 538, 87, 87, 87, 283, 87, 87, 304, 359, 87, 248, 248, 248, 248, 248, 248, 304, 189, 454, 284, 284, 87, 87, 87, 90, - 362, 90, 90, 90, 284, 90, 90, 535, 357, 90, + 362, 90, 90, 90, 284, 90, 90, 536, 357, 90, 197, 197, 197, 197, 197, 197, 197, 197, 197, 374, 374, 90, 90, 90, 92, 92, 92, 92, 92, 92, @@ -1055,19 +1055,19 @@ static yyconst short int yy_chk[3723] = 92, 202, 202, 202, 202, 202, 202, 202, 202, 204, 204, 204, 204, 204, 204, 204, 204, 298, 92, 92, 92, 92, 92, 92, 100, 100, 100, 100, 100, 100, - 100, 100, 285, 285, 531, 302, 100, 100, 100, 100, + 100, 100, 285, 285, 532, 302, 100, 100, 100, 100, 100, 207, 285, 207, 207, 207, 207, 207, 207, 207, - 207, 303, 527, 354, 515, 287, 287, 302, 100, 100, + 207, 303, 528, 354, 516, 287, 287, 302, 100, 100, 100, 100, 100, 100, 128, 287, 128, 128, 128, 354, - 128, 128, 514, 303, 128, 233, 233, 233, 233, 233, + 128, 128, 515, 303, 128, 233, 233, 233, 233, 233, 233, 233, 233, 233, 498, 310, 128, 128, 128, 153, 496, 153, 153, 153, 310, 153, 153, 495, 371, 153, 239, 239, 239, 239, 239, 239, 239, 239, 371, 424, 424, 153, 153, 153, 155, 494, 155, 155, 155, 155, 155, 155, 155, 155, 241, 241, 241, 241, 241, 241, 241, 241, 245, 245, 245, 245, 245, 245, 245, 245, - 655, 328, 245, 438, 438, 655, 344, 493, 155, 156, + 658, 328, 245, 438, 438, 658, 344, 493, 155, 156, 328, 156, 156, 156, 156, 156, 156, 156, 156, 247, 247, 247, 247, 247, 247, 247, 247, 250, 344, 250, @@ -1109,7 +1109,7 @@ static yyconst short int yy_chk[3723] = 203, 203, 203, 203, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 489, 489, 447, 206, 206, 206, 206, 206, 325, 418, 325, 325, 325, 325, 325, 325, - 325, 325, 404, 418, 522, 522, 330, 330, 447, 206, + 325, 325, 404, 418, 523, 523, 330, 330, 447, 206, 206, 206, 206, 206, 206, 228, 330, 228, 228, 228, 228, 228, 228, 228, 228, 326, 419, 326, 326, 326, 326, 326, 326, 326, 326, 327, 419, 327, 327, 327, @@ -1121,267 +1121,267 @@ static yyconst short int yy_chk[3723] = 336, 333, 459, 336, 229, 230, 402, 230, 230, 230, 230, 230, 230, 230, 230, 338, 338, 338, 338, 338, 338, 338, 338, 341, 421, 341, 341, 341, 341, 341, - 341, 341, 341, 399, 421, 398, 459, 539, 539, 230, + 341, 341, 341, 399, 421, 398, 459, 540, 540, 230, 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, 246, 246, 246, 246, 246, 246, 246, 246, 246, - 246, 246, 557, 557, 449, 246, 246, 246, 246, 246, + 246, 246, 560, 560, 449, 246, 246, 246, 246, 246, - 541, 361, 361, 361, 361, 361, 361, 361, 361, 365, + 544, 361, 361, 361, 361, 361, 361, 361, 361, 365, 365, 365, 365, 365, 365, 365, 449, 246, 246, 246, 246, 246, 246, 249, 249, 249, 249, 249, 249, 249, - 249, 249, 249, 361, 541, 490, 249, 249, 249, 249, - 249, 397, 365, 368, 368, 368, 368, 368, 368, 368, - 368, 456, 396, 456, 456, 385, 385, 490, 249, 249, + 249, 249, 249, 361, 544, 490, 249, 249, 249, 249, + 249, 472, 365, 368, 368, 368, 368, 368, 368, 368, + 368, 472, 608, 608, 397, 385, 385, 490, 249, 249, 249, 249, 249, 249, 271, 385, 271, 271, 271, 271, 271, 271, 271, 271, 370, 370, 370, 370, 370, 370, 370, 370, 376, 376, 376, 376, 376, 376, 376, 376, - 386, 386, 605, 605, 367, 366, 575, 456, 271, 272, + 386, 386, 481, 481, 481, 481, 481, 481, 271, 272, 386, 272, 272, 272, 272, 272, 272, 272, 272, 379, 492, 379, 379, 379, 379, 379, 379, 379, 379, 380, 435, 380, 380, 380, 380, 380, 380, 380, 380, 435, - 575, 356, 492, 272, 278, 278, 278, 278, 278, 278, - 278, 278, 278, 436, 452, 355, 278, 278, 278, 278, + 396, 578, 492, 272, 278, 278, 278, 278, 278, 278, + 278, 278, 278, 436, 452, 367, 278, 278, 278, 278, 278, 381, 436, 381, 381, 381, 381, 381, 381, 381, - 381, 349, 348, 347, 452, 346, 452, 452, 278, 278, + 381, 366, 356, 355, 452, 578, 452, 452, 278, 278, 278, 278, 278, 278, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 288, 291, 291, 291, 291, 291, - 291, 291, 291, 291, 291, 291, 487, 532, 534, 291, + 291, 291, 291, 291, 291, 291, 487, 349, 533, 291, 291, 291, 291, 291, 382, 487, 382, 382, 382, 382, - 382, 382, 382, 382, 343, 457, 558, 457, 457, 532, - 534, 291, 291, 291, 291, 291, 291, 294, 294, 294, - 294, 294, 294, 294, 294, 294, 294, 342, 558, 324, + 382, 382, 382, 382, 348, 456, 535, 456, 456, 456, + 533, 291, 291, 291, 291, 291, 291, 294, 294, 294, + 294, 294, 294, 294, 294, 294, 294, 347, 535, 346, 294, 294, 294, 294, 294, 387, 387, 387, 387, 387, 387, 387, 387, 393, 393, 393, 393, 393, 393, 393, - 393, 457, 294, 294, 294, 294, 294, 294, 311, 311, + 393, 456, 294, 294, 294, 294, 294, 294, 311, 311, 311, 311, 311, 311, 311, 311, 311, 388, 388, 391, 391, 391, 391, 391, 391, 391, 391, 388, 395, 391, - 395, 395, 395, 395, 395, 395, 395, 395, 510, 510, + 395, 395, 395, 395, 395, 395, 395, 395, 511, 511, - 510, 311, 312, 312, 312, 312, 312, 312, 312, 312, - 312, 407, 414, 316, 414, 414, 414, 414, 414, 414, + 511, 311, 312, 312, 312, 312, 312, 312, 312, 312, + 312, 407, 414, 343, 414, 414, 414, 414, 414, 414, 414, 414, 420, 420, 420, 420, 420, 420, 420, 420, - 510, 407, 315, 407, 407, 312, 313, 313, 313, 313, - 313, 313, 313, 313, 313, 415, 560, 415, 415, 415, - 415, 415, 415, 415, 415, 407, 416, 472, 416, 416, - 416, 416, 416, 416, 416, 416, 314, 472, 560, 313, - 318, 473, 318, 318, 318, 318, 318, 318, 318, 318, - 318, 473, 306, 571, 318, 318, 318, 318, 318, 426, + 511, 407, 342, 407, 407, 312, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 415, 561, 415, 415, 415, + 415, 415, 415, 415, 415, 407, 416, 473, 416, 416, + 416, 416, 416, 416, 416, 416, 324, 473, 561, 313, + 318, 475, 318, 318, 318, 318, 318, 318, 318, 318, + 318, 475, 316, 563, 318, 318, 318, 318, 318, 426, 426, 426, 426, 426, 426, 426, 426, 430, 430, 430, - 430, 430, 430, 430, 430, 571, 318, 318, 318, 318, + 430, 430, 430, 430, 430, 563, 318, 318, 318, 318, 318, 318, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 305, 301, 300, 321, 321, 321, 321, 321, 429, - 297, 429, 429, 429, 429, 429, 429, 429, 429, 296, - 464, 277, 464, 464, 464, 276, 321, 321, 321, 321, + 321, 315, 314, 574, 321, 321, 321, 321, 321, 429, + 306, 429, 429, 429, 429, 429, 429, 429, 429, 305, + 464, 301, 464, 464, 464, 574, 321, 321, 321, 321, 321, 321, 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, 337, 337, 337, 337, 337, 337, 337, - 337, 337, 337, 337, 464, 275, 274, 337, 337, 337, - 337, 337, 432, 475, 432, 432, 432, 432, 432, 432, - 432, 432, 264, 475, 263, 262, 260, 259, 258, 337, + 337, 337, 337, 337, 464, 300, 297, 337, 337, 337, + 337, 337, 432, 517, 432, 432, 432, 432, 432, 432, + 432, 432, 457, 517, 457, 457, 457, 296, 277, 337, 337, 337, 337, 337, 337, 340, 340, 340, 340, 340, - 340, 340, 340, 340, 437, 437, 257, 256, 340, 340, + 340, 340, 340, 340, 437, 437, 276, 275, 340, 340, 340, 340, 340, 433, 437, 433, 433, 433, 433, 433, - 433, 433, 433, 481, 481, 481, 481, 481, 481, 255, + 433, 433, 433, 274, 264, 263, 262, 260, 457, 259, 340, 340, 340, 340, 340, 340, 363, 363, 363, 363, - 363, 363, 363, 363, 363, 434, 254, 434, 434, 434, + 363, 363, 363, 363, 363, 434, 258, 434, 434, 434, 434, 434, 434, 453, 453, 458, 458, 458, 458, 458, - 458, 458, 458, 253, 237, 236, 453, 235, 234, 363, + 458, 458, 458, 257, 256, 255, 453, 254, 253, 363, 364, 364, 364, 364, 364, 364, 364, 364, 364, 465, - 465, 465, 465, 465, 465, 465, 465, 458, 467, 516, - - 467, 467, 467, 467, 467, 467, 467, 467, 499, 516, - 499, 499, 232, 364, 372, 231, 372, 372, 372, 372, - 372, 372, 372, 372, 372, 375, 517, 375, 375, 375, - 375, 375, 375, 375, 375, 375, 517, 222, 221, 375, - 375, 375, 375, 375, 468, 519, 468, 468, 468, 468, - 468, 468, 468, 468, 499, 519, 220, 219, 218, 216, - 215, 375, 375, 375, 375, 375, 375, 378, 378, 378, - 378, 378, 378, 378, 378, 378, 214, 213, 212, 378, - 378, 378, 378, 378, 469, 211, 469, 469, 469, 469, + 465, 465, 465, 465, 465, 465, 465, 458, 467, 518, + + 467, 467, 467, 467, 467, 467, 467, 467, 499, 518, + 499, 499, 499, 364, 372, 237, 372, 372, 372, 372, + 372, 372, 372, 372, 372, 375, 520, 375, 375, 375, + 375, 375, 375, 375, 375, 375, 520, 236, 235, 375, + 375, 375, 375, 375, 468, 234, 468, 468, 468, 468, + 468, 468, 468, 468, 499, 526, 526, 526, 526, 526, + 526, 375, 375, 375, 375, 375, 375, 378, 378, 378, + 378, 378, 378, 378, 378, 378, 232, 231, 222, 378, + 378, 378, 378, 378, 469, 221, 469, 469, 469, 469, 469, 469, 474, 474, 474, 474, 474, 474, 474, 474, - 208, 378, 378, 378, 378, 378, 378, 389, 389, 389, + 220, 378, 378, 378, 378, 378, 378, 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, 392, 392, - 392, 392, 392, 392, 392, 392, 392, 392, 200, 199, - 196, 195, 392, 392, 392, 392, 392, 480, 480, 480, + 392, 392, 392, 392, 392, 392, 392, 392, 219, 218, + 216, 215, 392, 392, 392, 392, 392, 480, 480, 480, 480, 480, 480, 480, 480, 484, 484, 484, 484, 484, 484, 484, 484, 484, 392, 392, 392, 392, 392, 392, - 409, 552, 409, 409, 409, 409, 409, 409, 409, 409, - 483, 552, 483, 483, 483, 483, 483, 483, 483, 483, - 485, 485, 485, 485, 485, 485, 485, 485, 485, 188, - 187, 181, 178, 177, 409, 410, 176, 410, 410, 410, + 409, 555, 409, 409, 409, 409, 409, 409, 409, 409, + 483, 555, 483, 483, 483, 483, 483, 483, 483, 483, + 485, 485, 485, 485, 485, 485, 485, 485, 485, 214, + 213, 212, 211, 208, 409, 410, 200, 410, 410, 410, 410, 410, 410, 410, 410, 486, 486, 486, 486, 486, - 486, 486, 486, 486, 500, 175, 500, 500, 561, 561, - 501, 174, 501, 501, 172, 171, 170, 169, 168, 410, - 411, 561, 411, 411, 411, 411, 411, 411, 411, 411, - 502, 167, 502, 502, 504, 166, 504, 504, 509, 509, - 509, 509, 509, 509, 509, 509, 165, 160, 159, 152, - 500, 151, 150, 149, 411, 412, 501, 412, 412, 412, - 412, 412, 412, 412, 412, 503, 145, 503, 503, 144, - 509, 503, 142, 138, 131, 127, 502, 125, 123, 115, - 504, 114, 113, 503, 503, 503, 112, 111, 106, 412, - - 422, 105, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 425, 103, 425, 425, 425, 425, 425, 425, 425, - 425, 425, 102, 98, 94, 425, 425, 425, 425, 425, - 511, 93, 511, 511, 511, 511, 511, 511, 511, 511, - 525, 525, 525, 525, 525, 525, 89, 425, 425, 425, + 486, 486, 486, 486, 500, 199, 500, 500, 500, 196, + 501, 195, 501, 501, 501, 188, 187, 181, 178, 410, + 411, 177, 411, 411, 411, 411, 411, 411, 411, 411, + 502, 176, 502, 502, 502, 503, 564, 564, 503, 503, + 503, 503, 503, 503, 503, 503, 175, 174, 172, 564, + 500, 171, 170, 169, 411, 412, 501, 412, 412, 412, + 412, 412, 412, 412, 412, 504, 504, 168, 505, 504, + 505, 505, 505, 167, 166, 165, 502, 160, 159, 152, + 151, 504, 504, 504, 150, 149, 145, 144, 142, 412, + + 422, 138, 422, 422, 422, 422, 422, 422, 422, 422, + 422, 425, 131, 425, 425, 425, 425, 425, 425, 425, + 425, 425, 127, 125, 505, 425, 425, 425, 425, 425, + 510, 510, 510, 510, 510, 510, 510, 510, 519, 519, + 519, 519, 519, 519, 519, 519, 123, 425, 425, 425, 425, 425, 425, 428, 428, 428, 428, 428, 428, 428, - 428, 428, 86, 84, 79, 428, 428, 428, 428, 428, - 512, 78, 512, 512, 512, 512, 512, 512, 512, 512, - 530, 530, 530, 530, 530, 530, 530, 428, 428, 428, + 428, 428, 510, 115, 114, 428, 428, 428, 428, 428, + 512, 113, 512, 512, 512, 512, 512, 512, 512, 512, + 531, 531, 531, 531, 531, 531, 531, 428, 428, 428, 428, 428, 428, 440, 440, 440, 440, 440, 440, 440, - 440, 440, 440, 460, 77, 460, 460, 460, 460, 460, - 460, 460, 460, 505, 75, 505, 505, 70, 513, 505, - 513, 513, 513, 513, 513, 513, 513, 513, 63, 56, - 51, 505, 505, 505, 48, 47, 46, 460, 461, 45, - 461, 461, 461, 461, 461, 461, 461, 461, 518, 518, - 518, 518, 518, 518, 518, 518, 524, 524, 524, 524, - 524, 524, 524, 524, 545, 545, 545, 545, 545, 545, - 545, 545, 461, 462, 44, 462, 462, 462, 462, 462, - 462, 462, 462, 526, 38, 526, 526, 526, 526, 526, - 526, 526, 526, 528, 528, 528, 528, 528, 528, 528, - - 528, 528, 37, 36, 35, 33, 29, 462, 463, 23, - 463, 463, 463, 463, 463, 463, 463, 463, 529, 529, - 529, 529, 529, 529, 529, 529, 529, 582, 582, 582, - 582, 582, 582, 540, 540, 540, 540, 540, 540, 540, - 540, 17, 463, 476, 15, 476, 476, 476, 476, 476, - 476, 476, 476, 476, 479, 14, 479, 479, 479, 479, - 479, 479, 479, 479, 479, 540, 13, 0, 479, 479, - 479, 479, 479, 544, 0, 544, 544, 544, 544, 544, - 544, 549, 0, 549, 549, 549, 549, 549, 549, 0, + 440, 440, 440, 460, 112, 460, 460, 460, 460, 460, + 460, 460, 460, 506, 506, 111, 513, 506, 513, 513, + 513, 513, 513, 513, 513, 513, 106, 105, 103, 506, + 506, 506, 102, 98, 94, 93, 89, 460, 461, 86, + 461, 461, 461, 461, 461, 461, 461, 461, 514, 84, + 514, 514, 514, 514, 514, 514, 514, 514, 525, 525, + 525, 525, 525, 525, 525, 525, 585, 585, 585, 585, + 585, 585, 461, 462, 79, 462, 462, 462, 462, 462, + 462, 462, 462, 527, 78, 527, 527, 527, 527, 527, + 527, 527, 527, 529, 529, 529, 529, 529, 529, 529, + + 529, 529, 77, 75, 70, 63, 56, 462, 463, 51, + 463, 463, 463, 463, 463, 463, 463, 463, 530, 530, + 530, 530, 530, 530, 530, 530, 530, 541, 541, 541, + 541, 541, 541, 541, 541, 594, 594, 594, 594, 594, + 594, 48, 463, 476, 47, 476, 476, 476, 476, 476, + 476, 476, 476, 476, 479, 46, 479, 479, 479, 479, + 479, 479, 479, 479, 479, 45, 44, 594, 479, 479, + 479, 479, 479, 542, 542, 542, 542, 542, 542, 542, + 542, 543, 543, 543, 543, 543, 543, 543, 543, 38, 479, 479, 479, 479, 479, 479, 482, 482, 482, 482, - 482, 482, 482, 482, 0, 0, 0, 544, 482, 482, - 482, 482, 482, 547, 0, 547, 547, 547, 547, 547, - 547, 547, 547, 0, 0, 0, 0, 0, 0, 0, - 482, 482, 482, 482, 482, 482, 506, 0, 506, 506, - 506, 506, 506, 506, 506, 506, 548, 0, 548, 548, - 548, 548, 548, 548, 548, 548, 555, 0, 555, 555, - 555, 555, 555, 555, 555, 555, 0, 0, 0, 0, - 506, 507, 0, 507, 507, 507, 507, 507, 507, 507, - 507, 565, 565, 565, 565, 565, 565, 565, 565, 566, - 566, 566, 566, 566, 566, 566, 566, 567, 567, 567, - - 567, 567, 567, 567, 567, 507, 508, 0, 508, 508, - 508, 508, 508, 508, 508, 508, 0, 0, 0, 0, - 0, 574, 574, 574, 574, 574, 574, 574, 574, 578, - 0, 578, 578, 578, 578, 578, 578, 0, 0, 0, - 508, 520, 0, 520, 520, 520, 520, 520, 520, 520, - 520, 520, 523, 574, 523, 523, 523, 523, 523, 523, - 523, 523, 0, 578, 0, 0, 523, 523, 523, 523, - 523, 580, 580, 580, 580, 580, 580, 580, 580, 581, - 581, 581, 581, 581, 581, 581, 581, 0, 523, 523, - 523, 523, 523, 523, 542, 0, 542, 542, 542, 542, - - 542, 542, 542, 542, 0, 0, 0, 586, 586, 586, - 586, 586, 586, 586, 586, 587, 587, 587, 587, 587, - 587, 587, 587, 0, 0, 0, 0, 0, 542, 543, - 0, 543, 543, 543, 543, 543, 543, 543, 543, 586, - 0, 0, 0, 0, 0, 0, 0, 587, 588, 588, - 588, 588, 588, 588, 588, 588, 0, 591, 591, 591, - 591, 591, 591, 543, 562, 0, 562, 562, 562, 562, - 562, 562, 562, 562, 0, 0, 0, 0, 0, 0, - 588, 590, 590, 590, 590, 590, 590, 590, 590, 591, - 0, 0, 0, 0, 0, 0, 0, 0, 562, 563, - - 0, 563, 563, 563, 563, 563, 563, 563, 563, 0, - 0, 0, 0, 590, 0, 0, 0, 0, 0, 0, + 482, 482, 482, 482, 37, 36, 35, 33, 482, 482, + 482, 482, 482, 543, 547, 29, 547, 547, 547, 547, + 547, 547, 548, 548, 548, 548, 548, 548, 548, 548, + 482, 482, 482, 482, 482, 482, 507, 23, 507, 507, + 507, 507, 507, 507, 507, 507, 17, 550, 547, 550, + 550, 550, 550, 550, 550, 550, 550, 551, 15, 551, + 551, 551, 551, 551, 551, 551, 551, 14, 13, 0, + 507, 508, 0, 508, 508, 508, 508, 508, 508, 508, + 508, 552, 0, 552, 552, 552, 552, 552, 552, 558, + 0, 558, 558, 558, 558, 558, 558, 558, 558, 0, + + 0, 0, 0, 0, 0, 508, 509, 0, 509, 509, + 509, 509, 509, 509, 509, 509, 568, 568, 568, 568, + 568, 568, 568, 568, 569, 569, 569, 569, 569, 569, + 569, 569, 570, 570, 570, 570, 570, 570, 570, 570, + 509, 521, 0, 521, 521, 521, 521, 521, 521, 521, + 521, 521, 524, 0, 524, 524, 524, 524, 524, 524, + 524, 524, 0, 0, 0, 0, 524, 524, 524, 524, + 524, 0, 577, 577, 577, 577, 577, 577, 577, 577, + 581, 0, 581, 581, 581, 581, 581, 581, 524, 524, + 524, 524, 524, 524, 545, 0, 545, 545, 545, 545, + + 545, 545, 545, 545, 577, 583, 583, 583, 583, 583, + 583, 583, 583, 0, 581, 584, 584, 584, 584, 584, + 584, 584, 584, 0, 0, 0, 0, 0, 545, 546, + 0, 546, 546, 546, 546, 546, 546, 546, 546, 0, + 0, 0, 589, 589, 589, 589, 589, 589, 589, 589, + 590, 590, 590, 590, 590, 590, 590, 590, 0, 0, + 0, 0, 0, 546, 565, 0, 565, 565, 565, 565, + 565, 565, 565, 565, 589, 0, 0, 0, 0, 0, + 0, 0, 590, 591, 591, 591, 591, 591, 591, 591, + 591, 0, 0, 0, 0, 0, 0, 0, 565, 566, + + 0, 566, 566, 566, 566, 566, 566, 566, 566, 0, + 0, 0, 0, 0, 0, 591, 593, 593, 593, 593, + 593, 593, 593, 593, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 566, 567, 0, 567, 567, 567, 567, + 567, 567, 567, 567, 0, 0, 0, 0, 593, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 563, 564, 0, 564, 564, 564, 564, - 564, 564, 564, 564, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 564, 576, - 0, 576, 576, 576, 576, 576, 576, 576, 576, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 567, 579, + 0, 579, 579, 579, 579, 579, 579, 579, 579, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 576, 577, 0, 577, 577, 577, 577, - 577, 577, 577, 577, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 579, 580, 0, 580, 580, 580, 580, + 580, 580, 580, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 577, 593, - 593, 593, 593, 593, 593, 593, 593, 593, 593, 593, - 593, 593, 593, 593, 594, 594, 594, 594, 594, 594, - 594, 594, 594, 594, 594, 594, 594, 594, 594, 595, + 0, 0, 0, 0, 0, 0, 0, 0, 580, 596, + 596, 596, 596, 596, 596, 596, 596, 596, 596, 596, + 596, 596, 596, 596, 597, 597, 597, 597, 597, 597, + 597, 597, 597, 597, 597, 597, 597, 597, 597, 598, + 598, 598, 598, 598, 598, 598, 598, 598, 598, 598, + 598, 598, 598, 598, 599, 599, 599, 599, 599, 599, + 599, 599, 599, 599, 599, 599, 599, 599, 599, 600, + + 0, 0, 0, 0, 0, 0, 600, 600, 600, 0, + 0, 600, 600, 600, 601, 601, 601, 601, 601, 601, + 601, 601, 601, 601, 601, 601, 601, 601, 601, 602, + 0, 0, 0, 0, 0, 0, 602, 602, 602, 602, + 0, 602, 602, 602, 603, 0, 0, 0, 0, 0, + 0, 603, 603, 603, 0, 0, 603, 603, 603, 604, + 0, 0, 604, 604, 604, 0, 604, 604, 604, 0, + 0, 604, 604, 604, 605, 605, 0, 0, 0, 605, + 606, 0, 0, 606, 606, 606, 0, 606, 606, 606, + 0, 0, 606, 606, 606, 607, 0, 0, 607, 607, + + 607, 0, 607, 607, 607, 0, 607, 0, 607, 607, + 609, 0, 0, 609, 0, 609, 0, 609, 609, 609, + 609, 0, 609, 609, 609, 610, 610, 610, 610, 610, + 610, 610, 610, 610, 610, 610, 610, 610, 610, 610, + 611, 611, 0, 611, 0, 611, 611, 611, 611, 611, + 611, 611, 611, 611, 611, 612, 612, 612, 612, 612, + 612, 612, 612, 612, 612, 612, 612, 612, 612, 612, + 613, 613, 0, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 614, 0, 0, 0, 0, + 0, 0, 614, 614, 614, 0, 0, 614, 614, 614, + + 615, 0, 0, 615, 615, 615, 0, 615, 615, 615, + 0, 0, 615, 615, 615, 616, 616, 0, 0, 0, + 616, 617, 617, 617, 0, 0, 0, 617, 618, 0, + 0, 618, 618, 618, 0, 618, 618, 618, 0, 0, + 618, 618, 618, 619, 619, 619, 619, 619, 619, 619, + 619, 619, 619, 619, 619, 619, 619, 619, 620, 620, + 0, 0, 0, 620, 621, 621, 621, 0, 0, 0, + 621, 622, 622, 0, 0, 0, 622, 623, 623, 0, + 0, 0, 623, 624, 624, 0, 0, 0, 624, 625, + 625, 625, 0, 0, 0, 625, 626, 626, 0, 0, + + 0, 626, 627, 627, 0, 0, 0, 627, 628, 628, + 0, 0, 0, 628, 629, 629, 629, 0, 0, 0, + 629, 630, 630, 630, 630, 0, 0, 0, 630, 631, + 631, 0, 0, 0, 631, 632, 632, 0, 0, 0, + 632, 633, 633, 0, 0, 0, 633, 634, 634, 634, + 0, 0, 0, 634, 635, 635, 635, 635, 0, 0, + 0, 635, 636, 636, 0, 0, 0, 636, 637, 637, + 0, 0, 0, 637, 638, 638, 638, 0, 0, 0, + 638, 639, 639, 639, 639, 0, 0, 0, 639, 640, + 640, 0, 0, 0, 640, 641, 0, 641, 641, 0, + + 0, 0, 641, 642, 642, 642, 0, 0, 0, 642, + 643, 643, 643, 643, 0, 0, 0, 643, 644, 644, + 0, 0, 0, 644, 645, 0, 645, 645, 0, 0, + 0, 645, 646, 646, 646, 0, 0, 0, 646, 647, + 647, 647, 0, 0, 0, 0, 647, 648, 648, 0, + 648, 648, 0, 0, 648, 648, 648, 0, 0, 648, + 648, 648, 649, 649, 0, 649, 649, 0, 0, 649, + 649, 649, 0, 0, 649, 649, 649, 650, 650, 0, + 0, 0, 650, 651, 0, 651, 651, 0, 0, 0, + 651, 652, 652, 0, 0, 0, 0, 652, 653, 653, + + 653, 653, 653, 653, 653, 653, 653, 653, 653, 653, + 653, 653, 653, 654, 654, 0, 0, 0, 654, 655, + 0, 655, 655, 0, 0, 0, 655, 656, 656, 0, + 0, 0, 656, 657, 0, 657, 0, 0, 0, 0, + 657, 659, 659, 659, 659, 659, 659, 659, 659, 659, + 659, 659, 659, 659, 659, 659, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, - 595, 595, 595, 595, 596, 596, 596, 596, 596, 596, - 596, 596, 596, 596, 596, 596, 596, 596, 596, 597, - - 0, 0, 0, 0, 0, 0, 597, 597, 597, 0, - 0, 597, 597, 597, 598, 598, 598, 598, 598, 598, - 598, 598, 598, 598, 598, 598, 598, 598, 598, 599, - 0, 0, 0, 0, 0, 0, 599, 599, 599, 599, - 0, 599, 599, 599, 600, 0, 0, 0, 0, 0, - 0, 600, 600, 600, 0, 0, 600, 600, 600, 601, - 0, 0, 601, 601, 0, 601, 601, 601, 601, 0, - 0, 601, 601, 601, 602, 602, 0, 0, 0, 602, - 603, 0, 0, 603, 603, 0, 603, 603, 603, 603, - 0, 0, 603, 603, 603, 604, 0, 0, 604, 604, - - 0, 604, 604, 604, 604, 0, 604, 0, 604, 604, - 606, 0, 0, 606, 0, 0, 606, 606, 606, 606, - 606, 0, 606, 606, 606, 607, 607, 607, 607, 607, - 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, - 608, 608, 0, 608, 0, 608, 608, 608, 608, 608, - 608, 608, 608, 608, 608, 609, 609, 609, 609, 609, - 609, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 610, 610, 0, 610, 610, 610, 610, 610, 610, 610, - 610, 610, 610, 610, 610, 611, 0, 0, 0, 0, - 0, 0, 611, 611, 611, 0, 0, 611, 611, 611, - - 612, 0, 0, 612, 612, 0, 612, 612, 612, 612, - 0, 0, 612, 612, 612, 613, 613, 0, 0, 0, - 613, 614, 614, 614, 0, 0, 0, 614, 615, 0, - 0, 615, 615, 0, 615, 615, 615, 615, 0, 0, - 615, 615, 615, 616, 616, 616, 616, 616, 616, 616, - 616, 616, 616, 616, 616, 616, 616, 616, 617, 617, - 0, 0, 0, 617, 618, 618, 618, 0, 0, 0, - 618, 619, 619, 0, 0, 0, 619, 620, 620, 0, - 0, 0, 620, 621, 621, 0, 0, 0, 621, 622, - 622, 622, 0, 0, 0, 622, 623, 623, 0, 0, - - 0, 623, 624, 624, 0, 0, 0, 624, 625, 625, - 0, 0, 0, 625, 626, 626, 626, 0, 0, 0, - 626, 627, 627, 627, 627, 0, 0, 0, 627, 628, - 628, 0, 0, 0, 628, 629, 629, 0, 0, 0, - 629, 630, 630, 0, 0, 0, 630, 631, 631, 631, - 0, 0, 0, 631, 632, 632, 632, 632, 0, 0, - 0, 632, 633, 633, 0, 0, 0, 633, 634, 634, - 0, 0, 0, 634, 635, 635, 635, 0, 0, 0, - 635, 636, 636, 636, 636, 0, 0, 0, 636, 637, - 637, 0, 0, 0, 637, 638, 0, 638, 638, 0, - - 0, 0, 638, 639, 639, 639, 0, 0, 0, 639, - 640, 640, 640, 640, 0, 0, 0, 640, 641, 641, - 0, 0, 0, 641, 642, 0, 642, 642, 0, 0, - 0, 642, 643, 643, 643, 0, 0, 0, 643, 644, - 644, 644, 0, 0, 0, 0, 644, 645, 645, 0, - 645, 645, 0, 0, 645, 645, 645, 0, 0, 645, - 645, 645, 646, 646, 0, 646, 646, 0, 0, 646, - 646, 646, 0, 0, 646, 646, 646, 647, 647, 0, - 0, 0, 647, 648, 0, 648, 648, 0, 0, 0, - 648, 649, 649, 0, 0, 0, 0, 649, 650, 650, - - 650, 650, 650, 650, 650, 650, 650, 650, 650, 650, - 650, 650, 650, 651, 651, 0, 0, 0, 651, 652, - 0, 652, 652, 0, 0, 0, 652, 653, 653, 0, - 0, 0, 653, 654, 0, 654, 0, 0, 0, 0, - 654, 656, 656, 656, 656, 656, 656, 656, 656, 656, - 656, 656, 656, 656, 656, 656, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592, 592, 592, 592, 592, 592, 592, 592, 592, - 592, 592 + + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595, 595, 595, 595, 595, 595, 595, 595, 595, + 595, 595 } ; static yy_state_type yy_last_accepting_state; @@ -1712,7 +1712,7 @@ 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 >= 593 ) + if ( yy_current_state >= 596 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1839,6 +1839,11 @@ YY_RULE_SETUP { LEXTRACE("ENDSTR "); BEGIN prev_state; + + if (yylval.string == NULL) { + LEXTRACE("ERROR "); /* empty string */ + return ERROR; + } if (prev_state == INITIAL) { switch (yylval.string[0]) { case '%': @@ -1855,7 +1860,7 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP -#line 197 "toke.l" +#line 202 "toke.l" { LEXTRACE("BACKSLASH "); if (!append(yytext, yyleng)) @@ -1864,7 +1869,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 203 "toke.l" +#line 208 "toke.l" { LEXTRACE("STRBODY "); if (!append(yytext, yyleng)) @@ -1875,7 +1880,7 @@ YY_RULE_SETUP case 14: YY_RULE_SETUP -#line 211 "toke.l" +#line 216 "toke.l" { /* quoted fnmatch glob char, pass verbatim */ LEXTRACE("QUOTEDCHAR "); @@ -1886,7 +1891,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 219 "toke.l" +#line 224 "toke.l" { /* quoted sudoers special char, strip backslash */ LEXTRACE("QUOTEDCHAR "); @@ -1897,7 +1902,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 227 "toke.l" +#line 232 "toke.l" { BEGIN INITIAL; yyless(0); @@ -1906,7 +1911,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 233 "toke.l" +#line 238 "toke.l" { LEXTRACE("ARG "); if (!fill_args(yytext, yyleng, sawspace)) @@ -1917,7 +1922,7 @@ YY_RULE_SETUP case 18: YY_RULE_SETUP -#line 241 "toke.l" +#line 246 "toke.l" { char *path; @@ -1938,7 +1943,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 259 "toke.l" +#line 264 "toke.l" { char *path; @@ -1962,7 +1967,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 280 "toke.l" +#line 285 "toke.l" { char deftype; int n; @@ -2005,7 +2010,7 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 320 "toke.l" +#line 325 "toke.l" { int n; @@ -2034,7 +2039,7 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 346 "toke.l" +#line 351 "toke.l" { /* cmnd does not require passwd for this user */ LEXTRACE("NOPASSWD "); @@ -2043,7 +2048,7 @@ YY_RULE_SETUP YY_BREAK case 23: YY_RULE_SETUP -#line 352 "toke.l" +#line 357 "toke.l" { /* cmnd requires passwd for this user */ LEXTRACE("PASSWD "); @@ -2052,7 +2057,7 @@ YY_RULE_SETUP YY_BREAK case 24: YY_RULE_SETUP -#line 358 "toke.l" +#line 363 "toke.l" { LEXTRACE("NOEXEC "); return NOEXEC; @@ -2060,7 +2065,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 363 "toke.l" +#line 368 "toke.l" { LEXTRACE("EXEC "); return EXEC; @@ -2068,7 +2073,7 @@ YY_RULE_SETUP YY_BREAK case 26: YY_RULE_SETUP -#line 368 "toke.l" +#line 373 "toke.l" { LEXTRACE("SETENV "); return SETENV; @@ -2076,7 +2081,7 @@ YY_RULE_SETUP YY_BREAK case 27: YY_RULE_SETUP -#line 373 "toke.l" +#line 378 "toke.l" { LEXTRACE("NOSETENV "); return NOSETENV; @@ -2084,7 +2089,7 @@ YY_RULE_SETUP YY_BREAK case 28: YY_RULE_SETUP -#line 378 "toke.l" +#line 383 "toke.l" { LEXTRACE("LOG_OUTPUT "); return LOG_OUTPUT; @@ -2092,7 +2097,7 @@ YY_RULE_SETUP YY_BREAK case 29: YY_RULE_SETUP -#line 383 "toke.l" +#line 388 "toke.l" { LEXTRACE("NOLOG_OUTPUT "); return NOLOG_OUTPUT; @@ -2100,7 +2105,7 @@ YY_RULE_SETUP YY_BREAK case 30: YY_RULE_SETUP -#line 388 "toke.l" +#line 393 "toke.l" { LEXTRACE("LOG_INPUT "); return LOG_INPUT; @@ -2108,7 +2113,7 @@ YY_RULE_SETUP YY_BREAK case 31: YY_RULE_SETUP -#line 393 "toke.l" +#line 398 "toke.l" { LEXTRACE("NOLOG_INPUT "); return NOLOG_INPUT; @@ -2116,7 +2121,7 @@ YY_RULE_SETUP YY_BREAK case 32: YY_RULE_SETUP -#line 398 "toke.l" +#line 403 "toke.l" { /* netgroup */ if (!fill(yytext, yyleng)) @@ -2127,9 +2132,9 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 406 "toke.l" +#line 411 "toke.l" { - /* UN*X group */ + /* group */ if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("USERGROUP "); @@ -2138,7 +2143,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 414 "toke.l" +#line 419 "toke.l" { if (!fill(yytext, yyleng)) yyterminate(); @@ -2148,7 +2153,7 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 421 "toke.l" +#line 426 "toke.l" { if (!fill(yytext, yyleng)) yyterminate(); @@ -2158,7 +2163,7 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 428 "toke.l" +#line 433 "toke.l" { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); @@ -2172,7 +2177,7 @@ YY_RULE_SETUP YY_BREAK case 37: YY_RULE_SETUP -#line 439 "toke.l" +#line 444 "toke.l" { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); @@ -2186,7 +2191,7 @@ YY_RULE_SETUP YY_BREAK case 38: YY_RULE_SETUP -#line 450 "toke.l" +#line 455 "toke.l" { if (strcmp(yytext, "ALL") == 0) { LEXTRACE("ALL "); @@ -2211,7 +2216,7 @@ YY_RULE_SETUP YY_BREAK case 39: YY_RULE_SETUP -#line 472 "toke.l" +#line 477 "toke.l" { /* no command args allowed for Defaults!/path */ if (!fill_cmnd(yytext, yyleng)) @@ -2222,7 +2227,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 480 "toke.l" +#line 485 "toke.l" { BEGIN GOTCMND; LEXTRACE("COMMAND "); @@ -2232,7 +2237,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 487 "toke.l" +#line 492 "toke.l" { /* directories can't have args... */ if (yytext[yyleng - 1] == '/') { @@ -2250,7 +2255,7 @@ YY_RULE_SETUP YY_BREAK case 42: YY_RULE_SETUP -#line 502 "toke.l" +#line 507 "toke.l" { LEXTRACE("BEGINSTR "); yylval.string = NULL; @@ -2260,7 +2265,7 @@ YY_RULE_SETUP YY_BREAK case 43: YY_RULE_SETUP -#line 509 "toke.l" +#line 514 "toke.l" { /* a word */ if (!fill(yytext, yyleng)) @@ -2271,7 +2276,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 517 "toke.l" +#line 522 "toke.l" { LEXTRACE("( "); return '('; @@ -2279,7 +2284,7 @@ YY_RULE_SETUP YY_BREAK case 45: YY_RULE_SETUP -#line 522 "toke.l" +#line 527 "toke.l" { LEXTRACE(") "); return ')'; @@ -2287,7 +2292,7 @@ YY_RULE_SETUP YY_BREAK case 46: YY_RULE_SETUP -#line 527 "toke.l" +#line 532 "toke.l" { LEXTRACE(", "); return ','; @@ -2295,7 +2300,7 @@ YY_RULE_SETUP YY_BREAK case 47: YY_RULE_SETUP -#line 532 "toke.l" +#line 537 "toke.l" { LEXTRACE("= "); return '='; @@ -2303,7 +2308,7 @@ YY_RULE_SETUP YY_BREAK case 48: YY_RULE_SETUP -#line 537 "toke.l" +#line 542 "toke.l" { LEXTRACE(": "); return ':'; @@ -2311,7 +2316,7 @@ YY_RULE_SETUP YY_BREAK case 49: YY_RULE_SETUP -#line 542 "toke.l" +#line 547 "toke.l" { if (yyleng % 2 == 1) return '!'; /* return '!' */ @@ -2319,7 +2324,7 @@ YY_RULE_SETUP YY_BREAK case 50: YY_RULE_SETUP -#line 547 "toke.l" +#line 552 "toke.l" { BEGIN INITIAL; ++sudolineno; @@ -2330,14 +2335,14 @@ YY_RULE_SETUP YY_BREAK case 51: YY_RULE_SETUP -#line 555 "toke.l" +#line 560 "toke.l" { /* throw away space/tabs */ sawspace = TRUE; /* but remember for fill_args */ } YY_BREAK case 52: YY_RULE_SETUP -#line 559 "toke.l" +#line 564 "toke.l" { sawspace = TRUE; /* remember for fill_args */ ++sudolineno; @@ -2346,7 +2351,7 @@ YY_RULE_SETUP YY_BREAK case 53: YY_RULE_SETUP -#line 565 "toke.l" +#line 570 "toke.l" { BEGIN INITIAL; ++sudolineno; @@ -2357,7 +2362,7 @@ YY_RULE_SETUP YY_BREAK case 54: YY_RULE_SETUP -#line 573 "toke.l" +#line 578 "toke.l" { LEXTRACE("ERROR "); return ERROR; @@ -2369,7 +2374,7 @@ case YY_STATE_EOF(GOTCMND): case YY_STATE_EOF(STARTDEFS): case YY_STATE_EOF(INDEFS): case YY_STATE_EOF(INSTR): -#line 578 "toke.l" +#line 583 "toke.l" { if (YY_START != INITIAL) { BEGIN INITIAL; @@ -2382,10 +2387,10 @@ case YY_STATE_EOF(INSTR): YY_BREAK case 55: YY_RULE_SETUP -#line 588 "toke.l" +#line 593 "toke.l" ECHO; YY_BREAK -#line 2388 "lex.yy.c" +#line 2393 "lex.yy.c" case YY_END_OF_BUFFER: { @@ -2676,7 +2681,7 @@ static yy_state_type yy_get_previous_state() 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 >= 593 ) + if ( yy_current_state >= 596 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2711,11 +2716,11 @@ yy_state_type yy_current_state; 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 >= 593 ) + if ( yy_current_state >= 596 ) 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 == 592); + yy_is_jam = (yy_current_state == 595); return yy_is_jam ? 0 : yy_current_state; } @@ -3276,7 +3281,7 @@ int main() return 0; } #endif -#line 588 "toke.l" +#line 593 "toke.l" struct path_list { char *path; diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l index 8abfa76dc..16b6f95e4 100644 --- a/plugins/sudoers/toke.l +++ b/plugins/sudoers/toke.l @@ -180,6 +180,11 @@ DEFVAR [a-z_]+ \" { LEXTRACE("ENDSTR "); BEGIN prev_state; + + if (yylval.string == NULL) { + LEXTRACE("ERROR "); /* empty string */ + return ERROR; + } if (prev_state == INITIAL) { switch (yylval.string[0]) { case '%': @@ -277,7 +282,7 @@ DEFVAR [a-z_]+ yyterminate(); } -^[[:blank:]]*Defaults([:@>\!][[:blank:]]*\!*\"?{WORD})? { +^[[:blank:]]*Defaults([:@>\!][[:blank:]]*\!*\"?({ID}|{WORD}))? { char deftype; int n; @@ -404,7 +409,7 @@ NOLOG_INPUT[[:blank:]]*: { } \%:?{WORD} { - /* UN*X group */ + /* group */ if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("USERGROUP "); -- 2.40.0