From: Todd C. Miller Date: Fri, 19 Nov 2004 18:12:59 +0000 (+0000) Subject: More robust parsing if #include; could be much better still. X-Git-Tag: SUDO_1_7_0~798 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=faa9a89722ce1f5bfac8b431cd10b5df275931be;p=sudo More robust parsing if #include; could be much better still. --- diff --git a/toke.c b/toke.c index 170c926a7..99458375f 100644 --- a/toke.c +++ b/toke.c @@ -328,8 +328,8 @@ static yyconst short int yy_accept[385] = 0, 16, 0, 32, 0, 32, 28, 25, 25, 25, 27, 32, 32, 25, 25, 25, 25, 25, 0, 20, - 0, 0, 13, 15, 14, 0, 14, 0, 28, 28, - 25, 25, 25, 25, 25, 32, 32, 32, 25, 25, + 0, 15, 14, 0, 14, 0, 28, 28, 25, 25, + 25, 25, 25, 32, 32, 32, 25, 25, 0, 13, 28, 28, 28, 25, 25, 32, 32, 32, 32, 32, 28, 28, 28, 28, 28, 32, 32, 32, 28, 28, 28, 32, 32, 32, 32, 32, 28, 28, 28, 28, @@ -382,50 +382,50 @@ static yyconst int yy_meta[61] = static yyconst short int yy_base[407] = { 0, 0, 55, 96, 0, 60, 61, 155, 160, 203, 262, - 321, 364, 1480, 1435, 1476, 2057, 1473, 1473, 1431, 2057, - 2057, 1421, 2057, 166, 176, 197, 253, 2057, 2057, 408, - 1421, 1427, 1426, 1434, 467, 20, 170, 1397, 1400, 1393, - 1388, 1389, 1392, 57, 1391, 2057, 1390, 177, 330, 339, - 373, 492, 1389, 1386, 1385, 1390, 551, 21, 1402, 0, - 2057, 1391, 0, 2057, 567, 69, 0, 1345, 580, 136, - 2057, 144, 2057, 80, 1344, 221, 1377, 1374, 1372, 2057, - 1329, 275, 1322, 492, 376, 1321, 591, 319, 157, 609, - 618, 627, 0, 1328, 1323, 55, 1318, 232, 2057, 46, - - 173, 145, 180, 168, 188, 44, 1311, 652, 272, 1310, - 661, 1305, 685, 670, 694, 704, 194, 713, 722, 733, - 0, 1316, 1304, 205, 1272, 299, 133, 1308, 0, 1288, - 293, 2057, 2057, 301, 0, 1238, 556, 756, 337, 359, - 2057, 2057, 1237, 327, 582, 753, 765, 774, 1224, 1219, - 1181, 1187, 1186, 1155, 342, 234, 329, 234, 338, 356, - 355, 785, 794, 803, 1155, 1142, 1122, 1128, 1118, 1097, - 360, 1091, 2057, 367, 825, 830, 839, 552, 859, 868, - 877, 408, 1094, 1075, 1070, 1065, 1034, 428, 429, 361, - 143, 430, 888, 558, 897, 906, 917, 585, 1035, 1043, - - 1038, 1006, 994, 433, 573, 926, 935, 946, 587, 2057, - 999, 969, 906, 891, 872, 436, 553, 352, 442, 955, - 964, 975, 865, 863, 801, 787, 768, 440, 984, 598, - 993, 1004, 1013, 751, 596, 725, 714, 599, 605, 237, - 565, 607, 1022, 606, 1033, 1042, 1051, 677, 657, 665, - 646, 681, 638, 1063, 1072, 1081, 690, 705, 2057, 636, - 625, 714, 2057, 701, 618, 711, 523, 1093, 1102, 1111, - 839, 597, 577, 804, 1122, 637, 1132, 1141, 1152, 841, - 2057, 523, 842, 443, 562, 655, 827, 1161, 824, 1171, - 1182, 1191, 443, 843, 389, 1200, 1211, 1220, 1229, 844, - - 849, 2057, 709, 720, 370, 363, 1240, 1249, 1258, 1269, - 1172, 1278, 732, 1287, 1298, 1307, 1316, 1327, 1338, 2057, - 351, 897, 2057, 287, 284, 1344, 261, 1368, 1365, 826, - 1380, 1394, 1409, 1423, 1389, 1438, 1452, 1467, 1481, 1346, - 1496, 1510, 1525, 1539, 1402, 1546, 915, 1556, 1575, 1585, - 1591, 944, 1604, 1620, 1633, 1641, 1651, 1662, 1672, 1682, - 1691, 1701, 973, 1711, 1720, 1730, 1740, 1002, 1749, 1759, - 1769, 1778, 1788, 1798, 1807, 1817, 1827, 125, 1836, 1846, - 121, 1856, 1865, 2057, 1909, 1916, 1923, 1930, 1937, 1944, - 1951, 1958, 1965, 1972, 1979, 1986, 1993, 84, 2000, 2007, - - 2014, 2021, 2028, 2035, 2042, 2049 + 321, 364, 1453, 1394, 1435, 2039, 1425, 1417, 1367, 2039, + 2039, 1362, 2039, 166, 176, 197, 253, 2039, 2039, 408, + 1362, 1368, 1367, 1375, 467, 20, 170, 1346, 1349, 1342, + 1337, 1337, 1350, 57, 1347, 2039, 1345, 177, 330, 339, + 373, 492, 1344, 1346, 1345, 1343, 551, 21, 1365, 0, + 2039, 1361, 0, 2039, 567, 69, 0, 1319, 580, 136, + 2039, 144, 2039, 80, 1315, 221, 1356, 1353, 1353, 2039, + 1311, 275, 1295, 492, 376, 1267, 591, 319, 157, 609, + 618, 627, 0, 1279, 1266, 55, 1254, 232, 2039, 46, + + 173, 145, 180, 168, 188, 44, 1238, 652, 272, 1237, + 661, 1227, 685, 670, 694, 704, 194, 713, 722, 733, + 0, 1239, 1234, 205, 1229, 299, 133, 1265, 0, 1262, + 293, 2039, 2039, 301, 0, 1219, 556, 756, 337, 359, + 2039, 2039, 1180, 327, 582, 753, 765, 774, 1194, 1180, + 1151, 1148, 1148, 1126, 342, 234, 329, 234, 338, 356, + 355, 785, 794, 803, 1135, 1112, 1093, 1099, 1107, 1067, + 360, 1061, 2039, 367, 825, 830, 839, 552, 859, 868, + 877, 408, 1064, 1045, 1040, 1035, 1031, 428, 429, 361, + 143, 430, 888, 558, 897, 906, 917, 585, 1006, 1014, + + 1001, 996, 974, 433, 573, 926, 935, 946, 587, 2039, + 962, 930, 906, 863, 871, 436, 553, 352, 442, 955, + 964, 975, 856, 805, 793, 759, 759, 440, 984, 598, + 993, 1004, 1013, 727, 596, 716, 673, 599, 605, 237, + 565, 607, 1022, 606, 1033, 1042, 1051, 674, 657, 671, + 663, 681, 638, 1063, 1072, 1081, 690, 705, 2039, 652, + 642, 714, 2039, 701, 618, 711, 523, 1093, 1102, 1111, + 839, 619, 603, 804, 1122, 637, 1132, 1141, 1152, 841, + 2039, 569, 842, 517, 562, 655, 827, 1161, 824, 1171, + 1182, 1191, 449, 843, 437, 1200, 1211, 1220, 1229, 844, + + 849, 2039, 1250, 720, 389, 370, 1240, 1258, 1269, 1278, + 1172, 1287, 732, 1298, 1307, 1316, 1327, 1336, 1338, 2039, + 404, 310, 287, 1360, 284, 1384, 1357, 826, 1396, 1405, + 1414, 1425, 1434, 1443, 1454, 1463, 1472, 1479, 302, 2039, + 1492, 1508, 1521, 1528, 1487, 1537, 885, 1557, 1566, 1575, + 1586, 886, 1595, 1604, 1615, 1624, 1633, 1644, 1653, 1662, + 1673, 1682, 944, 1691, 1702, 1711, 1720, 973, 1731, 1740, + 1749, 1760, 1769, 1778, 1789, 1798, 1807, 125, 1818, 1827, + 121, 1836, 1847, 2039, 1891, 1898, 1905, 1912, 1919, 1926, + 1933, 1940, 1947, 1954, 1961, 1968, 1975, 84, 1982, 1989, + + 1996, 2003, 2010, 2017, 2024, 2031 } ; static yyconst short int yy_def[407] = @@ -463,10 +463,10 @@ static yyconst short int yy_def[407] = 384, 30, 30, 388, 389, 388, 388, 393, 393, 393, 393, 393, 52, 52, 393, 388, 388, 388, 388, 30, - 384, 384, 404, 388, 405, 406, 393, 393, 393, 393, + 384, 384, 389, 388, 404, 405, 393, 393, 393, 393, 52, 388, 388, 388, 388, 388, 388, 388, 384, 384, - 404, 404, 384, 388, 405, 405, 406, 406, 393, 393, - 393, 393, 393, 393, 393, 388, 388, 388, 388, 388, + 406, 388, 404, 404, 405, 405, 393, 393, 393, 393, + 393, 393, 393, 388, 388, 388, 388, 388, 406, 384, 393, 393, 393, 393, 393, 388, 388, 388, 388, 388, 393, 393, 393, 393, 393, 388, 388, 388, 393, 393, 393, 388, 388, 388, 388, 388, 393, 393, 393, 393, @@ -477,7 +477,7 @@ static yyconst short int yy_def[407] = 384, 384, 384, 384, 384, 384 } ; -static yyconst short int yy_nxt[2118] = +static yyconst short int yy_nxt[2100] = { 0, 14, 15, 16, 17, 14, 18, 19, 20, 21, 14, 22, 23, 14, 14, 24, 25, 26, 27, 25, 25, @@ -512,26 +512,26 @@ static yyconst short int yy_nxt[2118] = 81, 189, 81, 81, 109, 265, 81, 109, 109, 109, 109, 109, 109, 109, 134, 99, 76, 81, 81, 81, - 134, 99, 134, 99, 328, 66, 67, 67, 67, 67, + 134, 99, 134, 99, 340, 66, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 15, 16, 17, 69, 18, 326, 134, 99, - 76, 70, 71, 72, 146, 147, 148, 146, 146, 146, + 324, 70, 71, 72, 146, 147, 148, 146, 146, 146, 146, 173, 108, 116, 73, 117, 117, 117, 117, 117, - 117, 117, 116, 323, 118, 118, 118, 118, 118, 118, + 117, 117, 116, 76, 118, 118, 118, 118, 118, 118, 118, 139, 76, 175, 74, 15, 16, 17, 69, 18, 137, 205, 76, 108, 70, 71, 72, 190, 241, 86, 174, 76, 108, 86, 86, 76, 116, 73, 119, 119, 119, 119, 119, 120, 117, 76, 190, 188, 76, 76, - 86, 192, 176, 108, 76, 218, 328, 74, 75, 209, + 86, 192, 176, 108, 76, 218, 340, 74, 75, 209, 174, 190, 75, 326, 75, 204, 108, 75, 75, 87, 75, 75, 75, 93, 93, 93, 93, 93, 93, 93, - 210, 80, 108, 75, 93, 93, 93, 93, 93, 93, + 210, 80, 324, 75, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 93, 76, 93, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 75, 98, 99, 75, 76, 75, 76, 75, 75, 108, 216, 75, 76, - 311, 217, 228, 108, 239, 76, 76, 190, 253, 75, + 108, 217, 228, 108, 239, 76, 311, 190, 253, 75, 75, 75, 107, 83, 242, 83, 107, 83, 107, 83, 83, 107, 107, 83, 107, 107, 107, 121, 121, 121, @@ -540,181 +540,179 @@ static yyconst short int yy_nxt[2118] = 121, 121, 121, 121, 121, 108, 121, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, 126, 99, 107, 80, 107, 136, 107, 107, - 300, 136, 107, 303, 80, 177, 76, 136, 131, 99, + 76, 136, 107, 303, 80, 177, 76, 136, 131, 99, 132, 193, 133, 107, 107, 107, 132, 173, 133, 136, 287, 139, 139, 86, 136, 139, 209, 86, 209, 133, 133, 139, 85, 86, 75, 76, 85, 258, 75, 75, - 262, 108, 85, 139, 86, 86, 294, 210, 76, 210, + 262, 108, 85, 139, 86, 86, 300, 210, 76, 210, 133, 229, 240, 85, 85, 75, 174, 266, 259, 243, 80, 263, 88, 140, 89, 89, 89, 89, 89, 89, - 89, 88, 293, 89, 89, 89, 89, 89, 89, 89, + 89, 88, 294, 89, 89, 89, 89, 89, 89, 89, 88, 76, 89, 89, 89, 89, 89, 89, 76, 108, - 76, 275, 76, 107, 283, 107, 264, 107, 258, 107, + 76, 275, 76, 107, 293, 107, 264, 107, 258, 107, 107, 76, 110, 107, 110, 267, 110, 285, 110, 110, - 76, 282, 110, 86, 107, 107, 107, 86, 86, 259, - 76, 108, 262, 110, 110, 110, 112, 273, 112, 274, + 76, 283, 110, 86, 107, 107, 107, 86, 86, 259, + 76, 108, 262, 110, 110, 110, 112, 282, 112, 274, 112, 280, 112, 112, 86, 114, 112, 107, 76, 114, - 304, 107, 107, 263, 272, 114, 258, 112, 112, 112, - 322, 323, 281, 115, 271, 262, 114, 114, 107, 162, + 304, 107, 107, 263, 273, 114, 258, 112, 112, 112, + 272, 271, 281, 115, 261, 262, 114, 114, 107, 162, 163, 164, 162, 162, 162, 162, 116, 259, 117, 117, 117, 117, 117, 117, 117, 116, 263, 117, 117, 117, 117, 117, 117, 117, 76, 312, 116, 108, 117, 117, - 117, 117, 117, 117, 76, 261, 108, 139, 139, 284, - 172, 139, 286, 76, 260, 108, 177, 139, 178, 178, - 178, 178, 178, 178, 178, 76, 108, 324, 177, 139, - 179, 179, 179, 179, 179, 179, 179, 177, 257, 180, - 180, 180, 180, 180, 181, 178, 76, 252, 193, 140, + 117, 117, 117, 117, 76, 260, 108, 139, 139, 284, + 172, 139, 286, 76, 257, 108, 177, 139, 178, 178, + 178, 178, 178, 178, 178, 76, 108, 322, 177, 139, + 179, 179, 179, 179, 179, 179, 179, 177, 252, 180, + 180, 180, 180, 180, 181, 178, 76, 251, 193, 140, 194, 194, 194, 194, 194, 194, 194, 193, 76, 195, 195, 195, 195, 195, 195, 195, 193, 76, 196, 196, - 196, 196, 196, 197, 194, 251, 139, 139, 108, 172, - 139, 139, 139, 250, 175, 139, 139, 108, 288, 329, + 196, 196, 196, 197, 194, 250, 139, 139, 108, 172, + 139, 139, 139, 249, 175, 139, 139, 108, 288, 327, 280, 139, 280, 301, 301, 319, 108, 108, 139, 305, 301, 305, 306, 139, 206, 207, 208, 206, 206, 206, 206, 281, 295, 281, 302, 302, 320, 108, 140, 108, 76, 302, 177, 140, 178, 178, 178, 178, 178, 178, 178, 177, 76, 178, 178, 178, 178, 178, 178, 178, - 177, 249, 178, 178, 178, 178, 178, 178, 322, 323, + 177, 248, 178, 178, 178, 178, 178, 178, 346, 351, - 248, 238, 76, 220, 221, 222, 220, 220, 220, 220, + 238, 237, 76, 220, 221, 222, 220, 220, 220, 220, 193, 76, 194, 194, 194, 194, 194, 194, 194, 193, - 76, 194, 194, 194, 194, 194, 194, 194, 346, 237, + 76, 194, 194, 194, 194, 194, 194, 194, 76, 108, 193, 108, 194, 194, 194, 194, 194, 194, 236, 229, 108, 230, 230, 230, 230, 230, 230, 230, 229, 108, - 231, 231, 231, 231, 231, 231, 231, 351, 76, 229, + 231, 231, 231, 231, 231, 231, 231, 362, 235, 229, 108, 232, 232, 232, 232, 232, 233, 230, 243, 76, 244, 244, 244, 244, 244, 244, 244, 243, 76, 245, - 245, 245, 245, 245, 245, 245, 362, 108, 243, 76, - 246, 246, 246, 246, 246, 247, 244, 235, 108, 254, + 245, 245, 245, 245, 245, 245, 367, 76, 243, 76, + 246, 246, 246, 246, 246, 247, 244, 234, 108, 254, 255, 256, 254, 254, 254, 254, 229, 108, 230, 230, - 230, 230, 230, 230, 230, 367, 76, 229, 108, 230, + 230, 230, 230, 230, 230, 227, 108, 229, 108, 230, 230, 230, 230, 230, 230, 230, 229, 76, 230, 230, - 230, 230, 230, 230, 234, 227, 76, 268, 269, 270, - 268, 268, 268, 268, 226, 108, 243, 76, 244, 244, + 230, 230, 230, 230, 226, 225, 76, 268, 269, 270, + 268, 268, 268, 268, 224, 223, 243, 76, 244, 244, 244, 244, 244, 244, 244, 243, 76, 244, 244, 244, 244, 244, 244, 244, 243, 108, 244, 244, 244, 244, - 244, 244, 225, 224, 223, 215, 108, 275, 276, 276, + 244, 244, 215, 214, 213, 212, 108, 275, 276, 276, 276, 276, 276, 276, 276, 108, 275, 277, 277, 277, 277, 277, 277, 277, 108, 275, 278, 278, 278, 278, - 278, 279, 276, 214, 213, 212, 76, 288, 289, 289, + 278, 279, 276, 211, 137, 203, 76, 288, 289, 289, 289, 289, 289, 289, 289, 76, 288, 290, 290, 290, 290, 290, 290, 290, 76, 288, 291, 291, 291, 291, - 291, 292, 289, 211, 137, 203, 108, 296, 297, 298, - 299, 296, 296, 296, 202, 108, 275, 276, 276, 276, + 291, 292, 289, 202, 201, 200, 108, 296, 297, 298, + 299, 296, 296, 296, 199, 108, 275, 276, 276, 276, 276, 276, 276, 276, 108, 275, 276, 276, 276, 276, - 276, 276, 276, 201, 200, 76, 275, 276, 276, 276, - 276, 276, 276, 319, 199, 76, 307, 308, 309, 310, - 307, 307, 307, 198, 76, 288, 289, 289, 289, 289, - 289, 289, 289, 187, 320, 76, 288, 289, 289, 289, + 276, 276, 276, 198, 187, 76, 275, 276, 276, 276, + 276, 276, 276, 319, 186, 76, 307, 308, 309, 310, + 307, 307, 307, 185, 76, 288, 289, 289, 289, 289, + 289, 289, 289, 184, 320, 76, 288, 289, 289, 289, 289, 289, 289, 289, 108, 288, 289, 289, 289, 289, - 289, 289, 186, 312, 108, 313, 313, 313, 313, 313, - 313, 313, 185, 184, 312, 108, 314, 314, 314, 314, + 289, 289, 183, 312, 108, 313, 313, 313, 313, 313, + 313, 313, 182, 137, 312, 108, 314, 314, 314, 314, 314, 314, 314, 312, 108, 315, 315, 315, 315, 315, 316, 317, 312, 76, 318, 318, 318, 313, 313, 313, - 313, 183, 182, 329, 76, 330, 330, 330, 330, 330, - 330, 330, 329, 76, 331, 331, 331, 331, 331, 331, - 331, 329, 76, 332, 332, 332, 332, 332, 333, 334, - 137, 137, 329, 108, 335, 335, 335, 330, 330, 330, - 330, 130, 108, 336, 337, 338, 336, 336, 336, 336, - - 312, 108, 317, 317, 317, 317, 317, 317, 317, 128, - 170, 312, 108, 317, 317, 317, 317, 317, 317, 317, - 312, 76, 317, 317, 317, 317, 317, 317, 339, 312, - 76, 339, 339, 339, 339, 339, 339, 339, 166, 319, - 312, 76, 340, 340, 340, 325, 165, 325, 113, 325, - 76, 325, 325, 111, 108, 325, 154, 150, 149, 76, - 320, 340, 340, 340, 145, 84, 325, 325, 325, 327, - 76, 327, 82, 327, 80, 327, 327, 78, 77, 327, - 341, 342, 343, 341, 341, 341, 341, 76, 137, 76, - 327, 327, 327, 329, 130, 334, 334, 334, 334, 334, - - 334, 334, 329, 128, 345, 345, 345, 329, 108, 334, - 334, 334, 334, 334, 334, 334, 125, 345, 345, 345, - 124, 123, 329, 108, 334, 334, 334, 334, 334, 334, - 344, 122, 108, 113, 111, 108, 329, 108, 344, 344, - 344, 344, 344, 344, 344, 108, 106, 105, 104, 103, - 102, 346, 108, 347, 347, 347, 347, 347, 347, 347, - 97, 96, 95, 94, 84, 346, 108, 348, 348, 348, - 348, 348, 348, 348, 82, 80, 78, 77, 76, 384, - 346, 76, 349, 349, 349, 349, 349, 350, 347, 384, - 384, 384, 384, 384, 384, 76, 339, 339, 339, 339, - - 339, 339, 339, 384, 384, 384, 384, 384, 384, 351, - 76, 352, 352, 352, 352, 352, 352, 352, 384, 384, - 384, 384, 384, 351, 76, 353, 353, 353, 353, 353, - 353, 353, 384, 384, 384, 384, 384, 384, 351, 108, - 354, 354, 354, 354, 354, 355, 352, 384, 384, 384, - 384, 384, 384, 108, 344, 344, 344, 344, 344, 344, - 344, 356, 357, 358, 356, 356, 356, 356, 108, 346, - 384, 347, 347, 347, 347, 347, 347, 347, 384, 384, - 384, 384, 108, 384, 384, 384, 384, 384, 346, 76, - 347, 347, 347, 347, 347, 347, 347, 384, 346, 76, - - 347, 347, 347, 347, 347, 347, 359, 360, 361, 359, - 359, 359, 359, 384, 384, 384, 384, 351, 76, 352, - 352, 352, 352, 352, 352, 352, 384, 384, 76, 384, - 384, 384, 384, 351, 108, 352, 352, 352, 352, 352, - 352, 352, 384, 384, 384, 384, 351, 108, 352, 352, - 352, 352, 352, 352, 362, 384, 363, 363, 363, 363, - 363, 363, 363, 108, 362, 384, 364, 364, 364, 364, - 364, 364, 364, 384, 384, 362, 108, 365, 365, 365, - 365, 365, 366, 363, 76, 367, 384, 368, 368, 368, - 368, 368, 368, 368, 76, 367, 384, 369, 369, 369, - - 369, 369, 369, 369, 367, 76, 370, 370, 370, 370, - 370, 371, 368, 384, 384, 108, 372, 373, 374, 372, - 372, 372, 372, 384, 362, 108, 363, 363, 363, 363, - 363, 363, 363, 362, 108, 363, 363, 363, 363, 363, - 363, 363, 384, 362, 76, 363, 363, 363, 363, 363, - 363, 384, 384, 384, 76, 375, 376, 377, 375, 375, - 375, 375, 367, 76, 368, 368, 368, 368, 368, 368, - 368, 384, 367, 76, 368, 368, 368, 368, 368, 368, - 368, 384, 367, 108, 368, 368, 368, 368, 368, 368, - 384, 384, 108, 378, 378, 378, 378, 378, 378, 378, - - 384, 384, 108, 372, 372, 372, 372, 372, 372, 372, - 384, 384, 108, 379, 379, 379, 379, 379, 380, 378, - 384, 76, 381, 381, 381, 381, 381, 381, 381, 384, - 384, 76, 375, 375, 375, 375, 375, 375, 375, 384, + 313, 303, 80, 327, 76, 328, 328, 328, 328, 328, + 328, 328, 137, 76, 321, 130, 128, 170, 166, 165, + 113, 327, 76, 329, 329, 329, 329, 329, 329, 329, + 111, 108, 327, 108, 330, 330, 330, 330, 330, 331, + 332, 327, 154, 333, 333, 333, 328, 328, 328, 328, + + 150, 108, 334, 335, 336, 334, 334, 334, 334, 149, + 145, 312, 108, 317, 317, 317, 317, 317, 317, 317, + 312, 108, 317, 317, 317, 317, 317, 317, 317, 312, + 76, 317, 317, 317, 317, 317, 317, 337, 84, 319, + 312, 76, 337, 337, 337, 337, 337, 337, 337, 312, + 76, 338, 338, 338, 82, 80, 78, 77, 76, 76, + 320, 323, 137, 323, 130, 323, 128, 323, 323, 125, + 76, 323, 341, 342, 343, 341, 341, 341, 341, 76, + 124, 123, 323, 323, 323, 325, 122, 325, 113, 325, + 111, 325, 325, 108, 106, 325, 105, 104, 103, 102, + + 108, 97, 96, 95, 94, 84, 325, 325, 325, 327, + 82, 332, 332, 332, 332, 332, 332, 332, 327, 80, + 332, 332, 332, 332, 332, 332, 332, 327, 78, 332, + 332, 332, 332, 332, 332, 344, 77, 76, 327, 108, + 344, 344, 344, 344, 344, 344, 344, 327, 108, 345, + 345, 345, 384, 384, 384, 384, 346, 108, 347, 347, + 347, 347, 347, 347, 347, 384, 384, 346, 108, 348, + 348, 348, 348, 348, 348, 348, 346, 108, 349, 349, + 349, 349, 349, 350, 347, 384, 76, 337, 337, 337, + 337, 337, 337, 337, 338, 338, 338, 76, 384, 384, + + 384, 384, 345, 345, 345, 351, 76, 352, 352, 352, + 352, 352, 352, 352, 384, 76, 384, 384, 384, 384, + 384, 351, 76, 353, 353, 353, 353, 353, 353, 353, + 108, 384, 384, 384, 351, 108, 354, 354, 354, 354, + 354, 355, 352, 344, 344, 344, 344, 344, 344, 344, + 384, 108, 356, 357, 358, 356, 356, 356, 356, 384, + 384, 384, 384, 384, 108, 384, 384, 384, 384, 384, + 346, 108, 347, 347, 347, 347, 347, 347, 347, 346, + 76, 347, 347, 347, 347, 347, 347, 347, 346, 384, + 347, 347, 347, 347, 347, 347, 384, 384, 384, 384, + + 76, 359, 360, 361, 359, 359, 359, 359, 351, 76, + 352, 352, 352, 352, 352, 352, 352, 351, 76, 352, + 352, 352, 352, 352, 352, 352, 384, 384, 351, 108, + 352, 352, 352, 352, 352, 352, 384, 362, 108, 363, + 363, 363, 363, 363, 363, 363, 362, 108, 364, 364, + 364, 364, 364, 364, 364, 384, 384, 362, 108, 365, + 365, 365, 365, 365, 366, 363, 367, 76, 368, 368, + 368, 368, 368, 368, 368, 367, 76, 369, 369, 369, + 369, 369, 369, 369, 384, 384, 367, 76, 370, 370, + 370, 370, 370, 371, 368, 384, 108, 372, 373, 374, + + 372, 372, 372, 372, 362, 108, 363, 363, 363, 363, + 363, 363, 363, 384, 384, 362, 108, 363, 363, 363, + 363, 363, 363, 363, 362, 76, 363, 363, 363, 363, + 363, 363, 384, 384, 76, 375, 376, 377, 375, 375, + 375, 375, 384, 384, 367, 76, 368, 368, 368, 368, + 368, 368, 368, 367, 76, 368, 368, 368, 368, 368, + 368, 368, 367, 108, 368, 368, 368, 368, 368, 368, + 384, 384, 384, 384, 108, 378, 378, 378, 378, 378, + 378, 378, 384, 108, 372, 372, 372, 372, 372, 372, + 372, 384, 108, 379, 379, 379, 379, 379, 380, 378, + + 384, 384, 384, 76, 381, 381, 381, 381, 381, 381, + 381, 384, 76, 375, 375, 375, 375, 375, 375, 375, 384, 76, 382, 382, 382, 382, 382, 383, 381, 384, - 108, 378, 378, 378, 378, 378, 378, 378, 384, 384, - 108, 378, 378, 378, 378, 378, 378, 384, 384, 384, - 108, 381, 381, 381, 381, 381, 381, 381, 384, 76, - 381, 381, 381, 381, 381, 381, 384, 384, 384, 76, - 384, 384, 384, 384, 384, 384, 384, 384, 384, 108, - - 384, 384, 384, 384, 384, 384, 384, 384, 108, 60, - 60, 60, 60, 60, 60, 60, 21, 21, 21, 21, - 21, 21, 21, 68, 68, 68, 68, 68, 68, 68, - 75, 384, 384, 384, 384, 75, 75, 79, 79, 79, - 79, 79, 79, 79, 81, 384, 384, 384, 384, 81, - 81, 83, 384, 384, 384, 384, 83, 83, 85, 384, - 85, 384, 384, 85, 85, 107, 384, 384, 384, 384, - 107, 107, 110, 384, 384, 384, 384, 110, 110, 112, - 384, 384, 384, 384, 112, 112, 114, 384, 114, 384, - 384, 114, 114, 129, 384, 129, 129, 384, 384, 129, - - 136, 384, 136, 384, 136, 136, 136, 138, 138, 138, - 138, 138, 138, 138, 143, 143, 143, 143, 143, 143, - 143, 86, 384, 86, 384, 384, 86, 86, 139, 139, - 139, 139, 139, 139, 139, 321, 321, 321, 321, 321, - 321, 321, 325, 384, 384, 384, 384, 325, 325, 327, - 384, 384, 384, 384, 327, 327, 13, 384, 384, 384, + 384, 384, 108, 378, 378, 378, 378, 378, 378, 378, + 384, 108, 378, 378, 378, 378, 378, 378, 384, 384, + 108, 381, 381, 381, 381, 381, 381, 381, 384, 384, + 384, 76, 381, 381, 381, 381, 381, 381, 384, 384, + 76, 384, 384, 384, 384, 384, 384, 384, 384, 108, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, + 108, 60, 60, 60, 60, 60, 60, 60, 21, 21, + + 21, 21, 21, 21, 21, 68, 68, 68, 68, 68, + 68, 68, 75, 384, 384, 384, 384, 75, 75, 79, + 79, 79, 79, 79, 79, 79, 81, 384, 384, 384, + 384, 81, 81, 83, 384, 384, 384, 384, 83, 83, + 85, 384, 85, 384, 384, 85, 85, 107, 384, 384, + 384, 384, 107, 107, 110, 384, 384, 384, 384, 110, + 110, 112, 384, 384, 384, 384, 112, 112, 114, 384, + 114, 384, 384, 114, 114, 129, 384, 129, 129, 384, + 384, 129, 136, 384, 136, 384, 136, 136, 136, 138, + 138, 138, 138, 138, 138, 138, 143, 143, 143, 143, + + 143, 143, 143, 86, 384, 86, 384, 384, 86, 86, + 139, 139, 139, 139, 139, 139, 139, 323, 384, 384, + 384, 384, 323, 323, 325, 384, 384, 384, 384, 325, + 325, 339, 339, 339, 339, 339, 339, 339, 13, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, - 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, - 384, 384, 384, 384, 384, 384, 384 + 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, + 384, 384, 384, 384, 384, 384, 384, 384, 384 + } ; -static yyconst short int yy_chk[2118] = +static yyconst short int yy_chk[2100] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -749,26 +747,26 @@ static yyconst short int yy_chk[2118] = 82, 156, 82, 82, 109, 240, 82, 109, 109, 109, 109, 109, 109, 109, 131, 131, 27, 82, 82, 82, - 126, 126, 134, 134, 327, 10, 10, 10, 10, 10, + 126, 126, 134, 134, 339, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 325, 144, 144, - 324, 11, 11, 11, 88, 88, 88, 88, 88, 88, + 323, 11, 11, 11, 88, 88, 88, 88, 88, 88, 88, 139, 126, 49, 11, 49, 49, 49, 49, 49, - 49, 49, 50, 321, 50, 50, 50, 50, 50, 50, + 49, 49, 50, 322, 50, 50, 50, 50, 50, 50, 50, 140, 88, 140, 11, 12, 12, 12, 12, 12, 144, 174, 157, 49, 12, 12, 12, 157, 218, 85, 139, 159, 50, 85, 85, 155, 51, 12, 51, 51, 51, 51, 51, 51, 51, 218, 159, 155, 161, 160, - 85, 160, 140, 171, 190, 190, 306, 12, 30, 182, - 174, 161, 30, 305, 30, 171, 51, 30, 30, 85, + 85, 160, 140, 171, 190, 190, 321, 12, 30, 182, + 174, 161, 30, 306, 30, 171, 51, 30, 30, 85, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, - 182, 189, 295, 30, 30, 30, 30, 30, 30, 30, + 182, 189, 305, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 35, 35, 35, 188, 35, 192, 35, 35, 204, 188, 35, 216, - 293, 189, 204, 228, 216, 219, 284, 192, 228, 35, + 295, 189, 204, 228, 216, 219, 293, 192, 228, 35, 35, 35, 52, 84, 219, 84, 52, 84, 52, 84, 84, 52, 52, 84, 52, 52, 52, 52, 52, 52, @@ -777,178 +775,176 @@ static yyconst short int yy_chk[2118] = 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, 57, 57, 57, 217, 57, 137, 57, 57, - 282, 137, 57, 285, 285, 178, 267, 137, 65, 65, + 284, 137, 57, 285, 285, 178, 267, 137, 65, 65, 65, 194, 65, 57, 57, 57, 65, 205, 65, 137, 267, 69, 69, 145, 69, 69, 198, 145, 209, 65, 65, 69, 87, 145, 87, 178, 87, 235, 87, 87, - 238, 194, 87, 69, 145, 145, 273, 198, 241, 209, + 238, 194, 87, 69, 145, 145, 282, 198, 241, 209, 65, 230, 217, 87, 87, 87, 205, 241, 235, 244, 265, 238, 90, 69, 90, 90, 90, 90, 90, 90, - 90, 91, 272, 91, 91, 91, 91, 91, 91, 91, + 90, 91, 273, 91, 91, 91, 91, 91, 91, 91, 92, 230, 92, 92, 92, 92, 92, 92, 239, 244, - 242, 276, 90, 108, 261, 108, 239, 108, 249, 108, + 242, 276, 90, 108, 272, 108, 239, 108, 249, 108, 108, 91, 111, 108, 111, 242, 111, 265, 111, 111, - 92, 260, 111, 114, 108, 108, 108, 114, 114, 249, - 276, 253, 252, 111, 111, 111, 113, 251, 113, 253, + 92, 261, 111, 114, 108, 108, 108, 114, 114, 249, + 276, 253, 252, 111, 111, 111, 113, 260, 113, 253, 113, 257, 113, 113, 114, 115, 113, 115, 286, 115, - 286, 115, 115, 252, 250, 115, 258, 113, 113, 113, - 303, 303, 257, 114, 248, 262, 115, 115, 115, 116, + 286, 115, 115, 252, 251, 115, 258, 113, 113, 113, + 250, 248, 257, 114, 237, 262, 115, 115, 115, 116, 116, 116, 116, 116, 116, 116, 118, 258, 118, 118, 118, 118, 118, 118, 118, 119, 262, 119, 119, 119, 119, 119, 119, 119, 264, 313, 120, 116, 120, 120, - 120, 120, 120, 120, 266, 237, 118, 138, 138, 264, - 138, 138, 266, 304, 236, 119, 146, 138, 146, 146, + 120, 120, 120, 120, 266, 236, 118, 138, 138, 264, + 138, 138, 266, 304, 234, 119, 146, 138, 146, 146, 146, 146, 146, 146, 146, 313, 120, 304, 147, 138, - 147, 147, 147, 147, 147, 147, 147, 148, 234, 148, - 148, 148, 148, 148, 148, 148, 146, 227, 162, 138, + 147, 147, 147, 147, 147, 147, 147, 148, 227, 148, + 148, 148, 148, 148, 148, 148, 146, 226, 162, 138, 162, 162, 162, 162, 162, 162, 162, 163, 147, 163, 163, 163, 163, 163, 163, 163, 164, 148, 164, 164, - 164, 164, 164, 164, 164, 226, 175, 175, 162, 175, - 175, 176, 176, 225, 176, 176, 175, 163, 289, 330, + 164, 164, 164, 164, 164, 225, 175, 175, 162, 175, + 175, 176, 176, 224, 176, 176, 175, 163, 289, 328, 271, 176, 280, 283, 294, 300, 164, 274, 175, 287, 301, 287, 287, 176, 177, 177, 177, 177, 177, 177, - 177, 271, 274, 280, 283, 294, 300, 289, 175, 330, + 177, 271, 274, 280, 283, 294, 300, 289, 175, 328, 287, 301, 179, 176, 179, 179, 179, 179, 179, 179, 179, 180, 177, 180, 180, 180, 180, 180, 180, 180, - 181, 224, 181, 181, 181, 181, 181, 181, 322, 322, + 181, 223, 181, 181, 181, 181, 181, 181, 347, 352, - 223, 215, 179, 193, 193, 193, 193, 193, 193, 193, + 215, 214, 179, 193, 193, 193, 193, 193, 193, 193, 195, 180, 195, 195, 195, 195, 195, 195, 195, 196, - 181, 196, 196, 196, 196, 196, 196, 196, 347, 214, + 181, 196, 196, 196, 196, 196, 196, 196, 347, 352, 197, 193, 197, 197, 197, 197, 197, 197, 213, 206, 195, 206, 206, 206, 206, 206, 206, 206, 207, 196, - 207, 207, 207, 207, 207, 207, 207, 352, 347, 208, + 207, 207, 207, 207, 207, 207, 207, 363, 212, 208, 197, 208, 208, 208, 208, 208, 208, 208, 220, 206, 220, 220, 220, 220, 220, 220, 220, 221, 207, 221, - 221, 221, 221, 221, 221, 221, 363, 352, 222, 208, - 222, 222, 222, 222, 222, 222, 222, 212, 220, 229, + 221, 221, 221, 221, 221, 221, 368, 363, 222, 208, + 222, 222, 222, 222, 222, 222, 222, 211, 220, 229, 229, 229, 229, 229, 229, 229, 231, 221, 231, 231, - 231, 231, 231, 231, 231, 368, 363, 232, 222, 232, + 231, 231, 231, 231, 231, 203, 368, 232, 222, 232, 232, 232, 232, 232, 232, 232, 233, 229, 233, 233, - 233, 233, 233, 233, 211, 203, 231, 243, 243, 243, - 243, 243, 243, 243, 202, 368, 245, 232, 245, 245, + 233, 233, 233, 233, 202, 201, 231, 243, 243, 243, + 243, 243, 243, 243, 200, 199, 245, 232, 245, 245, 245, 245, 245, 245, 245, 246, 233, 246, 246, 246, 246, 246, 246, 246, 247, 243, 247, 247, 247, 247, - 247, 247, 201, 200, 199, 187, 245, 254, 254, 254, + 247, 247, 187, 186, 185, 184, 245, 254, 254, 254, 254, 254, 254, 254, 254, 246, 255, 255, 255, 255, 255, 255, 255, 255, 247, 256, 256, 256, 256, 256, - 256, 256, 256, 186, 185, 184, 254, 268, 268, 268, + 256, 256, 256, 183, 172, 170, 254, 268, 268, 268, 268, 268, 268, 268, 268, 255, 269, 269, 269, 269, 269, 269, 269, 269, 256, 270, 270, 270, 270, 270, - 270, 270, 270, 183, 172, 170, 268, 275, 275, 275, - 275, 275, 275, 275, 169, 269, 277, 277, 277, 277, + 270, 270, 270, 169, 168, 167, 268, 275, 275, 275, + 275, 275, 275, 275, 166, 269, 277, 277, 277, 277, 277, 277, 277, 277, 270, 278, 278, 278, 278, 278, - 278, 278, 278, 168, 167, 275, 279, 279, 279, 279, - 279, 279, 279, 311, 166, 277, 288, 288, 288, 288, - 288, 288, 288, 165, 278, 290, 290, 290, 290, 290, - 290, 290, 290, 154, 311, 279, 291, 291, 291, 291, + 278, 278, 278, 165, 154, 275, 279, 279, 279, 279, + 279, 279, 279, 311, 153, 277, 288, 288, 288, 288, + 288, 288, 288, 152, 278, 290, 290, 290, 290, 290, + 290, 290, 290, 151, 311, 279, 291, 291, 291, 291, 291, 291, 291, 291, 288, 292, 292, 292, 292, 292, - 292, 292, 153, 296, 290, 296, 296, 296, 296, 296, - 296, 296, 152, 151, 297, 291, 297, 297, 297, 297, + 292, 292, 150, 296, 290, 296, 296, 296, 296, 296, + 296, 296, 149, 143, 297, 291, 297, 297, 297, 297, 297, 297, 297, 298, 292, 298, 298, 298, 298, 298, 298, 298, 299, 296, 299, 299, 299, 299, 299, 299, - 299, 150, 149, 307, 297, 307, 307, 307, 307, 307, - 307, 307, 308, 298, 308, 308, 308, 308, 308, 308, - 308, 309, 299, 309, 309, 309, 309, 309, 309, 309, - 143, 136, 310, 307, 310, 310, 310, 310, 310, 310, - 310, 130, 308, 312, 312, 312, 312, 312, 312, 312, - - 314, 309, 314, 314, 314, 314, 314, 314, 314, 128, - 125, 315, 310, 315, 315, 315, 315, 315, 315, 315, - 316, 312, 316, 316, 316, 316, 316, 316, 316, 317, - 314, 317, 317, 317, 317, 317, 317, 317, 123, 319, - 318, 315, 318, 318, 318, 326, 122, 326, 112, 326, - 316, 326, 326, 110, 107, 326, 97, 95, 94, 317, - 319, 340, 340, 340, 86, 83, 326, 326, 326, 328, - 318, 328, 81, 328, 79, 328, 328, 78, 77, 328, - 329, 329, 329, 329, 329, 329, 329, 75, 68, 340, - 328, 328, 328, 331, 62, 331, 331, 331, 331, 331, - - 331, 331, 335, 59, 335, 335, 335, 332, 329, 332, - 332, 332, 332, 332, 332, 332, 56, 345, 345, 345, - 55, 54, 333, 331, 333, 333, 333, 333, 333, 333, - 333, 53, 335, 47, 45, 43, 334, 332, 334, 334, - 334, 334, 334, 334, 334, 345, 42, 41, 40, 39, - 38, 336, 333, 336, 336, 336, 336, 336, 336, 336, - 34, 33, 32, 31, 22, 337, 334, 337, 337, 337, - 337, 337, 337, 337, 19, 18, 17, 15, 14, 13, - 338, 336, 338, 338, 338, 338, 338, 338, 338, 0, - 0, 0, 0, 0, 0, 337, 339, 339, 339, 339, - - 339, 339, 339, 0, 0, 0, 0, 0, 0, 341, - 338, 341, 341, 341, 341, 341, 341, 341, 0, 0, - 0, 0, 0, 342, 339, 342, 342, 342, 342, 342, - 342, 342, 0, 0, 0, 0, 0, 0, 343, 341, - 343, 343, 343, 343, 343, 343, 343, 0, 0, 0, - 0, 0, 0, 342, 344, 344, 344, 344, 344, 344, - 344, 346, 346, 346, 346, 346, 346, 346, 343, 348, - 0, 348, 348, 348, 348, 348, 348, 348, 0, 0, - 0, 0, 344, 0, 0, 0, 0, 0, 349, 346, - 349, 349, 349, 349, 349, 349, 349, 0, 350, 348, - - 350, 350, 350, 350, 350, 350, 351, 351, 351, 351, - 351, 351, 351, 0, 0, 0, 0, 353, 349, 353, - 353, 353, 353, 353, 353, 353, 0, 0, 350, 0, - 0, 0, 0, 354, 351, 354, 354, 354, 354, 354, - 354, 354, 0, 0, 0, 0, 355, 353, 355, 355, - 355, 355, 355, 355, 356, 0, 356, 356, 356, 356, - 356, 356, 356, 354, 357, 0, 357, 357, 357, 357, - 357, 357, 357, 0, 0, 358, 355, 358, 358, 358, - 358, 358, 358, 358, 356, 359, 0, 359, 359, 359, - 359, 359, 359, 359, 357, 360, 0, 360, 360, 360, - - 360, 360, 360, 360, 361, 358, 361, 361, 361, 361, - 361, 361, 361, 0, 0, 359, 362, 362, 362, 362, - 362, 362, 362, 0, 364, 360, 364, 364, 364, 364, - 364, 364, 364, 365, 361, 365, 365, 365, 365, 365, - 365, 365, 0, 366, 362, 366, 366, 366, 366, 366, - 366, 0, 0, 0, 364, 367, 367, 367, 367, 367, - 367, 367, 369, 365, 369, 369, 369, 369, 369, 369, - 369, 0, 370, 366, 370, 370, 370, 370, 370, 370, - 370, 0, 371, 367, 371, 371, 371, 371, 371, 371, - 0, 0, 369, 372, 372, 372, 372, 372, 372, 372, - - 0, 0, 370, 373, 373, 373, 373, 373, 373, 373, - 0, 0, 371, 374, 374, 374, 374, 374, 374, 374, - 0, 372, 375, 375, 375, 375, 375, 375, 375, 0, - 0, 373, 376, 376, 376, 376, 376, 376, 376, 0, + 299, 303, 303, 307, 297, 307, 307, 307, 307, 307, + 307, 307, 136, 298, 303, 130, 128, 125, 123, 122, + 112, 308, 299, 308, 308, 308, 308, 308, 308, 308, + 110, 107, 309, 307, 309, 309, 309, 309, 309, 309, + 309, 310, 97, 310, 310, 310, 310, 310, 310, 310, + + 95, 308, 312, 312, 312, 312, 312, 312, 312, 94, + 86, 314, 309, 314, 314, 314, 314, 314, 314, 314, + 315, 310, 315, 315, 315, 315, 315, 315, 315, 316, + 312, 316, 316, 316, 316, 316, 316, 316, 83, 319, + 317, 314, 317, 317, 317, 317, 317, 317, 317, 318, + 315, 318, 318, 318, 81, 79, 78, 77, 75, 316, + 319, 324, 68, 324, 62, 324, 59, 324, 324, 56, + 317, 324, 327, 327, 327, 327, 327, 327, 327, 318, + 55, 54, 324, 324, 324, 326, 53, 326, 47, 326, + 45, 326, 326, 43, 42, 326, 41, 40, 39, 38, + + 327, 34, 33, 32, 31, 22, 326, 326, 326, 329, + 19, 329, 329, 329, 329, 329, 329, 329, 330, 18, + 330, 330, 330, 330, 330, 330, 330, 331, 17, 331, + 331, 331, 331, 331, 331, 331, 15, 14, 332, 329, + 332, 332, 332, 332, 332, 332, 332, 333, 330, 333, + 333, 333, 13, 0, 0, 0, 334, 331, 334, 334, + 334, 334, 334, 334, 334, 0, 0, 335, 332, 335, + 335, 335, 335, 335, 335, 335, 336, 333, 336, 336, + 336, 336, 336, 336, 336, 0, 334, 337, 337, 337, + 337, 337, 337, 337, 338, 338, 338, 335, 0, 0, + + 0, 0, 345, 345, 345, 341, 336, 341, 341, 341, + 341, 341, 341, 341, 0, 337, 0, 0, 0, 0, + 0, 342, 338, 342, 342, 342, 342, 342, 342, 342, + 345, 0, 0, 0, 343, 341, 343, 343, 343, 343, + 343, 343, 343, 344, 344, 344, 344, 344, 344, 344, + 0, 342, 346, 346, 346, 346, 346, 346, 346, 0, + 0, 0, 0, 0, 343, 0, 0, 0, 0, 0, + 348, 344, 348, 348, 348, 348, 348, 348, 348, 349, + 346, 349, 349, 349, 349, 349, 349, 349, 350, 0, + 350, 350, 350, 350, 350, 350, 0, 0, 0, 0, + + 348, 351, 351, 351, 351, 351, 351, 351, 353, 349, + 353, 353, 353, 353, 353, 353, 353, 354, 350, 354, + 354, 354, 354, 354, 354, 354, 0, 0, 355, 351, + 355, 355, 355, 355, 355, 355, 0, 356, 353, 356, + 356, 356, 356, 356, 356, 356, 357, 354, 357, 357, + 357, 357, 357, 357, 357, 0, 0, 358, 355, 358, + 358, 358, 358, 358, 358, 358, 359, 356, 359, 359, + 359, 359, 359, 359, 359, 360, 357, 360, 360, 360, + 360, 360, 360, 360, 0, 0, 361, 358, 361, 361, + 361, 361, 361, 361, 361, 0, 359, 362, 362, 362, + + 362, 362, 362, 362, 364, 360, 364, 364, 364, 364, + 364, 364, 364, 0, 0, 365, 361, 365, 365, 365, + 365, 365, 365, 365, 366, 362, 366, 366, 366, 366, + 366, 366, 0, 0, 364, 367, 367, 367, 367, 367, + 367, 367, 0, 0, 369, 365, 369, 369, 369, 369, + 369, 369, 369, 370, 366, 370, 370, 370, 370, 370, + 370, 370, 371, 367, 371, 371, 371, 371, 371, 371, + 0, 0, 0, 0, 369, 372, 372, 372, 372, 372, + 372, 372, 0, 370, 373, 373, 373, 373, 373, 373, + 373, 0, 371, 374, 374, 374, 374, 374, 374, 374, + + 0, 0, 0, 372, 375, 375, 375, 375, 375, 375, + 375, 0, 373, 376, 376, 376, 376, 376, 376, 376, 0, 374, 377, 377, 377, 377, 377, 377, 377, 0, - 375, 379, 379, 379, 379, 379, 379, 379, 0, 0, - 376, 380, 380, 380, 380, 380, 380, 0, 0, 0, - 377, 382, 382, 382, 382, 382, 382, 382, 0, 379, - 383, 383, 383, 383, 383, 383, 0, 0, 0, 380, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 382, - - 0, 0, 0, 0, 0, 0, 0, 0, 383, 385, - 385, 385, 385, 385, 385, 385, 386, 386, 386, 386, - 386, 386, 386, 387, 387, 387, 387, 387, 387, 387, - 388, 0, 0, 0, 0, 388, 388, 389, 389, 389, - 389, 389, 389, 389, 390, 0, 0, 0, 0, 390, - 390, 391, 0, 0, 0, 0, 391, 391, 392, 0, - 392, 0, 0, 392, 392, 393, 0, 0, 0, 0, - 393, 393, 394, 0, 0, 0, 0, 394, 394, 395, - 0, 0, 0, 0, 395, 395, 396, 0, 396, 0, - 0, 396, 396, 397, 0, 397, 397, 0, 0, 397, - - 399, 0, 399, 0, 399, 399, 399, 400, 400, 400, - 400, 400, 400, 400, 401, 401, 401, 401, 401, 401, - 401, 402, 0, 402, 0, 0, 402, 402, 403, 403, - 403, 403, 403, 403, 403, 404, 404, 404, 404, 404, - 404, 404, 405, 0, 0, 0, 0, 405, 405, 406, - 0, 0, 0, 0, 406, 406, 384, 384, 384, 384, + 0, 0, 375, 379, 379, 379, 379, 379, 379, 379, + 0, 376, 380, 380, 380, 380, 380, 380, 0, 0, + 377, 382, 382, 382, 382, 382, 382, 382, 0, 0, + 0, 379, 383, 383, 383, 383, 383, 383, 0, 0, + 380, 0, 0, 0, 0, 0, 0, 0, 0, 382, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 383, 385, 385, 385, 385, 385, 385, 385, 386, 386, + + 386, 386, 386, 386, 386, 387, 387, 387, 387, 387, + 387, 387, 388, 0, 0, 0, 0, 388, 388, 389, + 389, 389, 389, 389, 389, 389, 390, 0, 0, 0, + 0, 390, 390, 391, 0, 0, 0, 0, 391, 391, + 392, 0, 392, 0, 0, 392, 392, 393, 0, 0, + 0, 0, 393, 393, 394, 0, 0, 0, 0, 394, + 394, 395, 0, 0, 0, 0, 395, 395, 396, 0, + 396, 0, 0, 396, 396, 397, 0, 397, 397, 0, + 0, 397, 399, 0, 399, 0, 399, 399, 399, 400, + 400, 400, 400, 400, 400, 400, 401, 401, 401, 401, + + 401, 401, 401, 402, 0, 402, 0, 0, 402, 402, + 403, 403, 403, 403, 403, 403, 403, 404, 0, 0, + 0, 0, 404, 404, 405, 0, 0, 0, 0, 405, + 405, 406, 406, 406, 406, 406, 406, 406, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, - 384, 384, 384, 384, 384, 384, 384, 384, 384, 384, - 384, 384, 384, 384, 384, 384, 384 + 384, 384, 384, 384, 384, 384, 384, 384, 384 + } ; static yy_state_type yy_last_accepting_state; @@ -1059,7 +1055,7 @@ extern void yyerror __P((const char *)); #define INDEFS 5 -#line 1063 "toke.c" +#line 1059 "toke.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1215,7 +1211,7 @@ YY_DECL #line 103 "toke.l" -#line 1219 "toke.c" +#line 1215 "toke.c" if ( yy_init ) { @@ -1273,7 +1269,7 @@ yy_match: yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 2057 ); + while ( yy_base[yy_current_state] != 2039 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1420,7 +1416,7 @@ YY_RULE_SETUP char *cp, *ep; ++sudolineno; /* pull out path from #include line */ - for (cp = yytext + 9; isspace(*cp); cp++) + for (cp = yytext + 9; isblank(*cp); cp++) continue; for (ep = cp; *ep != '\0' && !isspace(*ep); ep++) continue; @@ -1750,7 +1746,7 @@ YY_RULE_SETUP #line 420 "toke.l" ECHO; YY_BREAK -#line 1754 "toke.c" +#line 1750 "toke.c" case YY_END_OF_BUFFER: { diff --git a/toke.l b/toke.l index a434f0f8f..ea0f2b7f8 100644 --- a/toke.l +++ b/toke.l @@ -179,11 +179,11 @@ DEFVAR [a-z_]+ } /* a command line arg */ } -^#include[ \t]+.*\n { +^#include[[:blank:]]+\/.*\n { char *cp, *ep; ++sudolineno; /* pull out path from #include line */ - for (cp = yytext + 9; isspace(*cp); cp++) + for (cp = yytext + 9; isblank(*cp); cp++) continue; for (ep = cp; *ep != '\0' && !isspace(*ep); ep++) continue;