diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2010-10-17 21:56:26 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2010-10-17 21:56:26 +0000 |
| commit | ecb78adf803de7c4a6396b2a6ecbb0f09a9f0513 (patch) | |
| tree | 9986f3fbca15451542d650673942825ac03b39a7 /binutils/rcparse.c | |
| parent | 15954e27eb2be1146d00338e3eaed9e557be5b7f (diff) | |
Notes
Diffstat (limited to 'binutils/rcparse.c')
| -rw-r--r-- | binutils/rcparse.c | 1586 |
1 files changed, 820 insertions, 766 deletions
diff --git a/binutils/rcparse.c b/binutils/rcparse.c index 9add78f384b8..3c5d23433690 100644 --- a/binutils/rcparse.c +++ b/binutils/rcparse.c @@ -89,7 +89,7 @@ #line 1 "rcparse.y" /* rcparse.y -- parser for Windows rc files - Copyright 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support. This file is part of GNU Binutils. @@ -142,9 +142,14 @@ static unsigned long style; static unsigned long base_style; static unsigned long default_style; static unsigned long class; +static struct res_id res_text_field; +/* This is used for COMBOBOX, LISTBOX and EDITTEXT which + do not allow resource 'text' field in control definition. */ +static const struct res_id res_null_text = { 1, {{0, L""}}}; -#line 58 "rcparse.y" + +#line 63 "rcparse.y" #ifndef YYSTYPE typedef union { @@ -194,7 +199,7 @@ typedef union -#define YYFINAL 483 +#define YYFINAL 499 #define YYFLAG -32768 #define YYNTBASE 99 @@ -249,25 +254,25 @@ static const short yyprhs[] = 84, 86, 88, 90, 95, 100, 101, 115, 116, 130, 131, 146, 147, 151, 152, 156, 160, 164, 168, 172, 178, 185, 193, 202, 206, 210, 215, 219, 220, 223, - 224, 228, 229, 233, 234, 238, 239, 243, 244, 248, - 249, 253, 265, 278, 291, 305, 306, 310, 311, 315, - 316, 320, 321, 325, 326, 330, 337, 346, 357, 369, - 370, 374, 375, 379, 380, 384, 385, 389, 390, 394, - 395, 399, 400, 404, 405, 409, 410, 414, 415, 432, - 440, 450, 461, 462, 464, 467, 468, 472, 473, 477, - 478, 482, 483, 487, 492, 497, 501, 508, 509, 512, - 517, 520, 527, 528, 532, 535, 537, 539, 541, 543, - 545, 547, 554, 555, 558, 561, 565, 571, 574, 580, - 587, 595, 605, 610, 617, 618, 621, 622, 624, 626, - 628, 632, 636, 637, 644, 645, 649, 654, 661, 666, - 673, 674, 681, 688, 692, 696, 700, 704, 708, 709, - 718, 726, 727, 733, 734, 738, 740, 742, 744, 747, - 750, 753, 755, 756, 759, 763, 768, 772, 773, 776, - 777, 780, 782, 784, 786, 788, 790, 792, 794, 796, - 798, 800, 803, 807, 812, 814, 818, 819, 821, 824, - 826, 828, 832, 835, 838, 842, 846, 850, 854, 858, - 862, 866, 870, 873, 875, 877, 881, 884, 888, 892, - 896, 900, 904, 908, 912 + 224, 229, 230, 235, 236, 241, 242, 247, 248, 253, + 254, 258, 270, 283, 296, 310, 311, 316, 317, 322, + 323, 327, 328, 333, 334, 339, 346, 355, 366, 378, + 379, 384, 385, 389, 390, 395, 396, 401, 402, 407, + 408, 413, 414, 419, 420, 424, 425, 430, 431, 447, + 454, 463, 473, 474, 477, 479, 482, 483, 487, 488, + 492, 493, 497, 498, 502, 507, 512, 516, 523, 524, + 527, 532, 535, 542, 543, 547, 550, 552, 554, 556, + 558, 560, 562, 569, 570, 573, 576, 580, 586, 589, + 595, 602, 610, 620, 625, 632, 633, 636, 637, 639, + 641, 643, 647, 651, 652, 659, 660, 664, 669, 676, + 681, 688, 689, 696, 703, 707, 711, 715, 719, 723, + 724, 733, 741, 742, 748, 749, 753, 755, 757, 759, + 762, 765, 768, 770, 771, 774, 778, 783, 787, 788, + 791, 792, 795, 797, 799, 801, 803, 805, 807, 809, + 811, 813, 815, 818, 822, 827, 829, 833, 834, 836, + 839, 841, 843, 847, 850, 853, 857, 861, 865, 869, + 873, 877, 881, 885, 888, 890, 892, 896, 899, 903, + 907, 911, 915, 919, 923, 927 }; static const short yyrhs[] = { @@ -293,76 +298,78 @@ static const short yyrhs[] = 183, 183, 0, 113, 41, 184, 95, 80, 183, 183, 183, 0, 113, 46, 172, 0, 113, 44, 184, 0, 113, 43, 184, 183, 0, 113, 45, 184, 0, 0, - 114, 115, 0, 0, 20, 116, 137, 0, 0, 21, - 117, 137, 0, 0, 22, 118, 137, 0, 0, 38, - 119, 137, 0, 0, 23, 120, 137, 0, 0, 24, - 121, 137, 0, 10, 138, 184, 183, 140, 183, 183, - 183, 183, 182, 139, 0, 10, 138, 184, 183, 140, - 183, 183, 183, 183, 183, 183, 139, 0, 10, 138, - 184, 95, 80, 140, 183, 183, 183, 183, 182, 139, - 0, 10, 138, 184, 95, 80, 140, 183, 183, 183, - 183, 183, 183, 139, 0, 0, 25, 122, 137, 0, - 0, 26, 123, 137, 0, 0, 27, 124, 137, 0, - 0, 28, 125, 137, 0, 0, 39, 126, 137, 0, - 42, 174, 184, 183, 183, 139, 0, 42, 174, 184, - 183, 183, 183, 183, 139, 0, 42, 174, 184, 183, - 183, 183, 183, 142, 182, 139, 0, 42, 174, 184, - 183, 183, 183, 183, 142, 183, 183, 139, 0, 0, - 40, 127, 137, 0, 0, 29, 128, 137, 0, 0, - 30, 129, 137, 0, 0, 31, 130, 137, 0, 0, - 32, 131, 137, 0, 0, 33, 132, 137, 0, 0, - 34, 133, 137, 0, 0, 35, 134, 137, 0, 0, - 36, 135, 137, 0, 0, 37, 80, 95, 184, 95, - 184, 95, 184, 95, 184, 95, 184, 95, 136, 180, - 182, 0, 138, 184, 183, 183, 183, 183, 139, 0, - 138, 184, 183, 183, 183, 183, 144, 182, 139, 0, - 138, 184, 183, 183, 183, 183, 144, 183, 183, 139, - 0, 0, 80, 0, 80, 95, 0, 0, 3, 159, - 4, 0, 0, 95, 141, 180, 0, 0, 95, 143, - 180, 0, 0, 95, 145, 180, 0, 172, 41, 176, - 179, 0, 172, 42, 176, 179, 0, 43, 184, 183, - 0, 172, 46, 175, 3, 150, 4, 0, 0, 150, - 151, 0, 48, 80, 183, 152, 0, 48, 49, 0, - 50, 80, 152, 3, 150, 4, 0, 0, 152, 95, - 153, 0, 152, 153, 0, 51, 0, 52, 0, 53, - 0, 54, 0, 55, 0, 56, 0, 172, 47, 175, - 3, 155, 4, 0, 0, 155, 156, 0, 48, 80, - 0, 48, 80, 183, 0, 48, 80, 183, 183, 182, - 0, 48, 49, 0, 50, 80, 3, 155, 4, 0, - 50, 80, 183, 3, 155, 4, 0, 50, 80, 183, - 183, 3, 155, 4, 0, 50, 80, 183, 183, 183, - 182, 3, 155, 4, 0, 172, 57, 177, 179, 0, - 172, 58, 175, 3, 159, 4, 0, 0, 160, 161, - 0, 0, 162, 0, 83, 0, 185, 0, 162, 95, - 83, 0, 162, 95, 185, 0, 0, 59, 175, 3, - 164, 165, 4, 0, 0, 165, 184, 80, 0, 165, - 184, 95, 80, 0, 172, 172, 175, 3, 159, 4, - 0, 172, 172, 175, 179, 0, 172, 60, 168, 3, - 169, 4, 0, 0, 168, 61, 184, 183, 183, 183, - 0, 168, 62, 184, 183, 183, 183, 0, 168, 63, - 184, 0, 168, 64, 184, 0, 168, 65, 184, 0, - 168, 66, 184, 0, 168, 67, 184, 0, 0, 169, - 68, 3, 71, 3, 170, 4, 4, 0, 169, 69, - 3, 70, 80, 171, 4, 0, 0, 170, 70, 80, - 95, 80, 0, 0, 171, 183, 183, 0, 187, 0, - 81, 0, 80, 0, 80, 95, 0, 81, 95, 0, - 187, 95, 0, 173, 0, 0, 175, 178, 0, 175, - 44, 184, 0, 175, 43, 184, 183, 0, 175, 45, - 184, 0, 0, 176, 178, 0, 0, 177, 178, 0, - 72, 0, 73, 0, 74, 0, 75, 0, 76, 0, - 77, 0, 78, 0, 80, 0, 81, 0, 181, 0, - 79, 181, 0, 180, 85, 181, 0, 180, 85, 79, - 181, 0, 82, 0, 97, 184, 98, 0, 0, 183, - 0, 95, 184, 0, 185, 0, 82, 0, 97, 185, - 98, 0, 93, 185, 0, 89, 185, 0, 185, 90, - 185, 0, 185, 91, 185, 0, 185, 92, 185, 0, - 185, 88, 185, 0, 185, 89, 185, 0, 185, 87, - 185, 0, 185, 86, 185, 0, 185, 85, 185, 0, - 95, 187, 0, 188, 0, 82, 0, 97, 185, 98, - 0, 93, 185, 0, 188, 90, 185, 0, 188, 91, - 185, 0, 188, 92, 185, 0, 188, 88, 185, 0, - 188, 89, 185, 0, 188, 87, 185, 0, 188, 86, - 185, 0, 188, 85, 185, 0 + 114, 115, 0, 0, 20, 138, 116, 137, 0, 0, + 21, 138, 117, 137, 0, 0, 22, 138, 118, 137, + 0, 0, 38, 138, 119, 137, 0, 0, 23, 138, + 120, 137, 0, 0, 24, 121, 137, 0, 10, 138, + 184, 183, 140, 183, 183, 183, 183, 182, 139, 0, + 10, 138, 184, 183, 140, 183, 183, 183, 183, 183, + 183, 139, 0, 10, 138, 184, 95, 80, 140, 183, + 183, 183, 183, 182, 139, 0, 10, 138, 184, 95, + 80, 140, 183, 183, 183, 183, 183, 183, 139, 0, + 0, 25, 138, 122, 137, 0, 0, 26, 138, 123, + 137, 0, 0, 27, 124, 137, 0, 0, 28, 138, + 125, 137, 0, 0, 39, 138, 126, 137, 0, 42, + 174, 184, 183, 183, 139, 0, 42, 174, 184, 183, + 183, 183, 183, 139, 0, 42, 174, 184, 183, 183, + 183, 183, 142, 182, 139, 0, 42, 174, 184, 183, + 183, 183, 183, 142, 183, 183, 139, 0, 0, 40, + 138, 127, 137, 0, 0, 29, 128, 137, 0, 0, + 30, 138, 129, 137, 0, 0, 31, 138, 130, 137, + 0, 0, 32, 138, 131, 137, 0, 0, 33, 138, + 132, 137, 0, 0, 34, 138, 133, 137, 0, 0, + 35, 134, 137, 0, 0, 36, 138, 135, 137, 0, + 0, 37, 174, 184, 95, 184, 95, 184, 95, 184, + 95, 184, 95, 136, 180, 182, 0, 184, 183, 183, + 183, 183, 139, 0, 184, 183, 183, 183, 183, 144, + 182, 139, 0, 184, 183, 183, 183, 183, 144, 183, + 183, 139, 0, 0, 187, 95, 0, 80, 0, 80, + 95, 0, 0, 3, 159, 4, 0, 0, 95, 141, + 180, 0, 0, 95, 143, 180, 0, 0, 95, 145, + 180, 0, 172, 41, 176, 179, 0, 172, 42, 176, + 179, 0, 43, 184, 183, 0, 172, 46, 175, 3, + 150, 4, 0, 0, 150, 151, 0, 48, 80, 183, + 152, 0, 48, 49, 0, 50, 80, 152, 3, 150, + 4, 0, 0, 152, 95, 153, 0, 152, 153, 0, + 51, 0, 52, 0, 53, 0, 54, 0, 55, 0, + 56, 0, 172, 47, 175, 3, 155, 4, 0, 0, + 155, 156, 0, 48, 80, 0, 48, 80, 183, 0, + 48, 80, 183, 183, 182, 0, 48, 49, 0, 50, + 80, 3, 155, 4, 0, 50, 80, 183, 3, 155, + 4, 0, 50, 80, 183, 183, 3, 155, 4, 0, + 50, 80, 183, 183, 183, 182, 3, 155, 4, 0, + 172, 57, 177, 179, 0, 172, 58, 175, 3, 159, + 4, 0, 0, 160, 161, 0, 0, 162, 0, 83, + 0, 185, 0, 162, 95, 83, 0, 162, 95, 185, + 0, 0, 59, 175, 3, 164, 165, 4, 0, 0, + 165, 184, 80, 0, 165, 184, 95, 80, 0, 172, + 172, 175, 3, 159, 4, 0, 172, 172, 175, 179, + 0, 172, 60, 168, 3, 169, 4, 0, 0, 168, + 61, 184, 183, 183, 183, 0, 168, 62, 184, 183, + 183, 183, 0, 168, 63, 184, 0, 168, 64, 184, + 0, 168, 65, 184, 0, 168, 66, 184, 0, 168, + 67, 184, 0, 0, 169, 68, 3, 71, 3, 170, + 4, 4, 0, 169, 69, 3, 70, 80, 171, 4, + 0, 0, 170, 70, 80, 95, 80, 0, 0, 171, + 183, 183, 0, 187, 0, 81, 0, 80, 0, 80, + 95, 0, 81, 95, 0, 187, 95, 0, 173, 0, + 0, 175, 178, 0, 175, 44, 184, 0, 175, 43, + 184, 183, 0, 175, 45, 184, 0, 0, 176, 178, + 0, 0, 177, 178, 0, 72, 0, 73, 0, 74, + 0, 75, 0, 76, 0, 77, 0, 78, 0, 80, + 0, 81, 0, 181, 0, 79, 181, 0, 180, 85, + 181, 0, 180, 85, 79, 181, 0, 82, 0, 97, + 184, 98, 0, 0, 183, 0, 95, 184, 0, 185, + 0, 82, 0, 97, 185, 98, 0, 93, 185, 0, + 89, 185, 0, 185, 90, 185, 0, 185, 91, 185, + 0, 185, 92, 185, 0, 185, 88, 185, 0, 185, + 89, 185, 0, 185, 87, 185, 0, 185, 86, 185, + 0, 185, 85, 185, 0, 95, 187, 0, 188, 0, + 82, 0, 97, 185, 98, 0, 93, 185, 0, 188, + 90, 185, 0, 188, 91, 185, 0, 188, 92, 185, + 0, 188, 88, 185, 0, 188, 89, 185, 0, 188, + 87, 185, 0, 188, 86, 185, 0, 188, 85, 185, + 0 }; #endif @@ -371,31 +378,31 @@ static const short yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const short yyrline[] = { - 0, 154, 156, 157, 158, 159, 160, 161, 162, 163, - 164, 165, 166, 167, 168, 169, 170, 175, 185, 190, - 210, 216, 227, 249, 258, 263, 268, 274, 279, 284, - 288, 292, 296, 304, 316, 328, 328, 354, 354, 381, - 381, 411, 416, 422, 424, 430, 434, 439, 443, 447, - 460, 475, 490, 505, 509, 513, 517, 523, 525, 535, - 535, 546, 546, 556, 556, 566, 566, 579, 579, 589, - 589, 599, 610, 619, 632, 643, 643, 653, 653, 663, - 663, 673, 673, 683, 683, 696, 701, 707, 713, 719, - 719, 732, 732, 742, 742, 752, 752, 762, 762, 772, - 772, 782, 782, 792, 792, 802, 802, 812, 812, 829, - 842, 853, 864, 869, 873, 879, 884, 892, 892, 898, - 898, 904, 904, 912, 924, 937, 946, 956, 961, 977, - 982, 986, 992, 997, 1001, 1007, 1012, 1016, 1020, 1024, - 1028, 1036, 1046, 1051, 1067, 1072, 1076, 1080, 1084, 1088, - 1092, 1096, 1105, 1117, 1130, 1130, 1141, 1147, 1153, 1162, - 1170, 1179, 1192, 1192, 1198, 1200, 1207, 1219, 1227, 1238, - 1248, 1255, 1261, 1267, 1272, 1277, 1282, 1287, 1300, 1305, - 1309, 1315, 1320, 1326, 1331, 1339, 1345, 1360, 1365, 1369, - 1376, 1382, 1398, 1406, 1412, 1417, 1422, 1431, 1438, 1448, - 1455, 1466, 1472, 1477, 1482, 1487, 1492, 1497, 1506, 1511, - 1527, 1532, 1536, 1540, 1546, 1551, 1559, 1564, 1572, 1581, - 1590, 1595, 1599, 1604, 1609, 1614, 1619, 1624, 1629, 1634, - 1639, 1644, 1654, 1663, 1674, 1679, 1683, 1688, 1693, 1698, - 1703, 1708, 1713, 1718, 1723 + 0, 159, 161, 162, 163, 164, 165, 166, 167, 168, + 169, 170, 171, 172, 173, 174, 175, 180, 190, 195, + 215, 221, 232, 254, 263, 268, 273, 279, 284, 289, + 293, 297, 301, 309, 321, 333, 333, 359, 359, 386, + 386, 416, 421, 427, 429, 435, 439, 444, 448, 452, + 465, 480, 495, 510, 514, 518, 522, 528, 530, 540, + 540, 552, 552, 563, 563, 574, 574, 588, 588, 599, + 599, 612, 623, 632, 645, 656, 656, 667, 667, 678, + 678, 689, 689, 700, 700, 714, 719, 725, 731, 737, + 737, 751, 751, 762, 762, 773, 773, 783, 783, 794, + 794, 805, 805, 816, 816, 827, 827, 838, 838, 855, + 867, 878, 889, 894, 899, 903, 909, 914, 922, 922, + 928, 928, 934, 934, 942, 954, 967, 976, 986, 991, + 1007, 1012, 1016, 1022, 1027, 1031, 1037, 1042, 1046, 1050, + 1054, 1058, 1066, 1076, 1081, 1097, 1102, 1106, 1110, 1114, + 1118, 1122, 1126, 1135, 1147, 1160, 1160, 1171, 1177, 1183, + 1192, 1200, 1209, 1222, 1222, 1228, 1230, 1237, 1249, 1257, + 1268, 1278, 1285, 1291, 1297, 1302, 1307, 1312, 1317, 1330, + 1335, 1339, 1345, 1350, 1356, 1361, 1369, 1375, 1390, 1395, + 1399, 1406, 1412, 1428, 1436, 1442, 1447, 1452, 1461, 1468, + 1478, 1485, 1496, 1502, 1507, 1512, 1517, 1522, 1527, 1536, + 1541, 1557, 1562, 1566, 1570, 1576, 1581, 1589, 1594, 1602, + 1611, 1620, 1625, 1629, 1634, 1639, 1644, 1649, 1654, 1659, + 1664, 1669, 1674, 1684, 1693, 1704, 1709, 1713, 1718, 1723, + 1728, 1733, 1738, 1743, 1748, 1753 }; #endif @@ -426,7 +433,7 @@ static const char *const yytname[] = "@3", "exstyle", "styles", "controls", "control", "@4", "@5", "@6", "@7", "@8", "@9", "@10", "@11", "@12", "@13", "@14", "@15", "@16", "@17", "@18", "@19", "@20", "@21", "@22", "@23", "@24", - "control_params", "optstringc", "opt_control_data", "control_styleexpr", + "control_params", "optresidc", "opt_control_data", "control_styleexpr", "@25", "icon_styleexpr", "@26", "control_params_styleexpr", "@27", "font", "icon", "language", "menu", "menuitems", "menuitem", "menuitem_flags", "menuitem_flag", "menuex", "menuexitems", @@ -454,20 +461,20 @@ static const short yyr1[] = 115, 125, 115, 126, 115, 115, 115, 115, 115, 127, 115, 128, 115, 129, 115, 130, 115, 131, 115, 132, 115, 133, 115, 134, 115, 135, 115, 136, 115, 137, - 137, 137, 138, 138, 138, 139, 139, 141, 140, 143, - 142, 145, 144, 146, 147, 148, 149, 150, 150, 151, - 151, 151, 152, 152, 152, 153, 153, 153, 153, 153, - 153, 154, 155, 155, 156, 156, 156, 156, 156, 156, - 156, 156, 157, 158, 160, 159, 161, 161, 162, 162, - 162, 162, 164, 163, 165, 165, 165, 166, 166, 167, - 168, 168, 168, 168, 168, 168, 168, 168, 169, 169, - 169, 170, 170, 171, 171, 172, 172, 173, 173, 173, - 174, 174, 175, 175, 175, 175, 175, 176, 176, 177, - 177, 178, 178, 178, 178, 178, 178, 178, 179, 179, - 180, 180, 180, 180, 181, 181, 182, 182, 183, 184, - 185, 185, 185, 185, 185, 185, 185, 185, 185, 185, - 185, 185, 186, 187, 188, 188, 188, 188, 188, 188, - 188, 188, 188, 188, 188 + 137, 137, 138, 138, 138, 138, 139, 139, 141, 140, + 143, 142, 145, 144, 146, 147, 148, 149, 150, 150, + 151, 151, 151, 152, 152, 152, 153, 153, 153, 153, + 153, 153, 154, 155, 155, 156, 156, 156, 156, 156, + 156, 156, 156, 157, 158, 160, 159, 161, 161, 162, + 162, 162, 162, 164, 163, 165, 165, 165, 166, 166, + 167, 168, 168, 168, 168, 168, 168, 168, 168, 169, + 169, 169, 170, 170, 171, 171, 172, 172, 173, 173, + 173, 174, 174, 175, 175, 175, 175, 175, 176, 176, + 177, 177, 178, 178, 178, 178, 178, 178, 178, 179, + 179, 180, 180, 180, 180, 181, 181, 182, 182, 183, + 184, 185, 185, 185, 185, 185, 185, 185, 185, 185, + 185, 185, 185, 186, 187, 188, 188, 188, 188, 188, + 188, 188, 188, 188, 188, 188 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -479,25 +486,25 @@ static const short yyr2[] = 1, 1, 1, 4, 4, 0, 13, 0, 13, 0, 14, 0, 3, 0, 3, 3, 3, 3, 3, 5, 6, 7, 8, 3, 3, 4, 3, 0, 2, 0, - 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, - 3, 11, 12, 12, 13, 0, 3, 0, 3, 0, - 3, 0, 3, 0, 3, 6, 8, 10, 11, 0, - 3, 0, 3, 0, 3, 0, 3, 0, 3, 0, - 3, 0, 3, 0, 3, 0, 3, 0, 16, 7, - 9, 10, 0, 1, 2, 0, 3, 0, 3, 0, - 3, 0, 3, 4, 4, 3, 6, 0, 2, 4, - 2, 6, 0, 3, 2, 1, 1, 1, 1, 1, - 1, 6, 0, 2, 2, 3, 5, 2, 5, 6, - 7, 9, 4, 6, 0, 2, 0, 1, 1, 1, - 3, 3, 0, 6, 0, 3, 4, 6, 4, 6, - 0, 6, 6, 3, 3, 3, 3, 3, 0, 8, - 7, 0, 5, 0, 3, 1, 1, 1, 2, 2, - 2, 1, 0, 2, 3, 4, 3, 0, 2, 0, - 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 3, 4, 1, 3, 0, 1, 2, 1, - 1, 3, 2, 2, 3, 3, 3, 3, 3, 3, - 3, 3, 2, 1, 1, 3, 2, 3, 3, 3, - 3, 3, 3, 3, 3 + 4, 0, 4, 0, 4, 0, 4, 0, 4, 0, + 3, 11, 12, 12, 13, 0, 4, 0, 4, 0, + 3, 0, 4, 0, 4, 6, 8, 10, 11, 0, + 4, 0, 3, 0, 4, 0, 4, 0, 4, 0, + 4, 0, 4, 0, 3, 0, 4, 0, 15, 6, + 8, 9, 0, 2, 1, 2, 0, 3, 0, 3, + 0, 3, 0, 3, 4, 4, 3, 6, 0, 2, + 4, 2, 6, 0, 3, 2, 1, 1, 1, 1, + 1, 1, 6, 0, 2, 2, 3, 5, 2, 5, + 6, 7, 9, 4, 6, 0, 2, 0, 1, 1, + 1, 3, 3, 0, 6, 0, 3, 4, 6, 4, + 6, 0, 6, 6, 3, 3, 3, 3, 3, 0, + 8, 7, 0, 5, 0, 3, 1, 1, 1, 2, + 2, 2, 1, 0, 2, 3, 4, 3, 0, 2, + 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 2, 3, 4, 1, 3, 0, 1, 2, + 1, 1, 3, 2, 2, 3, 3, 3, 3, 3, + 3, 3, 3, 2, 1, 1, 3, 2, 3, 3, + 3, 3, 3, 3, 3, 3 }; /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE @@ -505,293 +512,313 @@ static const short yyr2[] = error. */ static const short yydefact[] = { - 1, 0, 0, 192, 186, 234, 16, 0, 0, 2, + 1, 0, 0, 193, 187, 235, 16, 0, 0, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 0, 185, 233, 220, 0, 0, 0, - 0, 219, 0, 236, 0, 192, 199, 197, 199, 199, - 197, 197, 192, 192, 199, 192, 170, 192, 0, 0, - 0, 0, 0, 0, 0, 0, 223, 222, 0, 0, - 125, 0, 0, 0, 0, 0, 0, 0, 0, 162, - 0, 0, 0, 201, 202, 203, 204, 205, 206, 207, - 193, 235, 0, 0, 0, 41, 41, 0, 0, 0, - 0, 0, 0, 0, 0, 244, 243, 242, 240, 241, - 237, 238, 239, 221, 218, 231, 230, 229, 227, 228, - 224, 225, 226, 164, 0, 194, 196, 18, 208, 209, - 200, 33, 198, 34, 0, 0, 0, 123, 124, 127, - 142, 152, 154, 178, 0, 0, 0, 0, 0, 0, - 0, 154, 168, 0, 195, 0, 0, 0, 0, 0, - 0, 0, 156, 0, 0, 0, 173, 174, 175, 176, - 177, 0, 163, 0, 17, 22, 19, 0, 23, 42, - 0, 0, 126, 0, 0, 128, 141, 0, 0, 143, - 153, 158, 155, 157, 159, 169, 0, 0, 0, 0, - 167, 165, 0, 0, 20, 0, 0, 130, 0, 132, - 147, 144, 0, 0, 0, 0, 0, 0, 166, 232, - 0, 35, 37, 132, 0, 145, 142, 0, 160, 161, - 0, 0, 171, 172, 27, 28, 29, 30, 31, 32, - 21, 24, 43, 43, 39, 129, 127, 135, 136, 137, - 138, 139, 140, 0, 134, 216, 0, 142, 0, 181, - 183, 0, 26, 0, 0, 43, 0, 133, 146, 217, - 148, 0, 142, 216, 0, 0, 25, 57, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 57, 0, 131, - 149, 0, 0, 0, 0, 180, 0, 0, 47, 44, - 48, 45, 0, 214, 0, 46, 210, 0, 0, 54, - 56, 53, 0, 57, 150, 142, 179, 0, 184, 36, - 112, 59, 61, 63, 67, 69, 75, 77, 79, 81, - 91, 93, 95, 97, 99, 101, 103, 105, 0, 65, - 83, 89, 0, 58, 211, 0, 0, 0, 55, 38, - 0, 0, 0, 113, 0, 112, 112, 112, 112, 112, - 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, - 112, 112, 0, 112, 112, 112, 187, 0, 191, 0, - 0, 215, 0, 212, 49, 40, 151, 182, 114, 0, - 60, 0, 62, 64, 68, 70, 76, 78, 80, 82, - 92, 94, 96, 98, 100, 102, 104, 106, 0, 66, - 84, 90, 188, 189, 0, 190, 213, 50, 0, 0, - 0, 0, 0, 51, 0, 117, 0, 0, 0, 115, - 52, 0, 0, 0, 0, 0, 154, 85, 0, 0, - 118, 0, 0, 0, 0, 115, 0, 0, 115, 0, - 116, 119, 86, 216, 0, 216, 121, 109, 216, 0, - 0, 115, 217, 216, 115, 217, 0, 115, 217, 0, - 120, 87, 115, 115, 217, 71, 115, 122, 110, 115, - 0, 88, 73, 115, 72, 111, 0, 74, 107, 0, - 216, 108, 0, 0 + 13, 14, 15, 0, 186, 234, 221, 0, 0, 0, + 0, 220, 0, 237, 0, 193, 200, 198, 200, 200, + 198, 198, 193, 193, 200, 193, 171, 193, 0, 0, + 0, 0, 0, 0, 0, 0, 224, 223, 0, 0, + 126, 0, 0, 0, 0, 0, 0, 0, 0, 163, + 0, 0, 0, 202, 203, 204, 205, 206, 207, 208, + 194, 236, 0, 0, 0, 41, 41, 0, 0, 0, + 0, 0, 0, 0, 0, 245, 244, 243, 241, 242, + 238, 239, 240, 222, 219, 232, 231, 230, 228, 229, + 225, 226, 227, 165, 0, 195, 197, 18, 209, 210, + 201, 33, 199, 34, 0, 0, 0, 124, 125, 128, + 143, 153, 155, 179, 0, 0, 0, 0, 0, 0, + 0, 155, 169, 0, 196, 0, 0, 0, 0, 0, + 0, 0, 157, 0, 0, 0, 174, 175, 176, 177, + 178, 0, 164, 0, 17, 22, 19, 0, 23, 42, + 0, 0, 127, 0, 0, 129, 142, 0, 0, 144, + 154, 159, 156, 158, 160, 170, 0, 0, 0, 0, + 168, 166, 0, 0, 20, 0, 0, 131, 0, 133, + 148, 145, 0, 0, 0, 0, 0, 0, 167, 233, + 0, 35, 37, 133, 0, 146, 143, 0, 161, 162, + 0, 0, 172, 173, 27, 28, 29, 30, 31, 32, + 21, 24, 43, 43, 39, 130, 128, 136, 137, 138, + 139, 140, 141, 0, 135, 217, 0, 143, 0, 182, + 184, 0, 26, 0, 0, 43, 0, 134, 147, 218, + 149, 0, 143, 217, 0, 0, 25, 57, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 57, 0, 132, + 150, 0, 0, 0, 0, 181, 0, 0, 47, 44, + 48, 45, 0, 215, 0, 46, 211, 0, 0, 54, + 56, 53, 0, 57, 151, 143, 180, 0, 185, 36, + 112, 112, 112, 112, 112, 69, 112, 112, 79, 112, + 91, 112, 112, 112, 112, 112, 103, 112, 0, 112, + 112, 112, 0, 58, 212, 0, 0, 0, 55, 38, + 0, 0, 0, 114, 0, 0, 59, 61, 63, 67, + 0, 75, 77, 0, 81, 0, 93, 95, 97, 99, + 101, 0, 105, 188, 0, 192, 0, 0, 65, 83, + 89, 0, 216, 0, 213, 49, 40, 152, 183, 115, + 0, 113, 0, 0, 0, 0, 70, 0, 0, 0, + 80, 0, 92, 0, 0, 0, 0, 0, 104, 0, + 189, 190, 0, 191, 0, 0, 0, 0, 214, 50, + 0, 0, 60, 62, 64, 68, 0, 76, 78, 82, + 94, 96, 98, 100, 102, 106, 0, 66, 84, 90, + 0, 51, 0, 118, 0, 0, 0, 116, 52, 0, + 0, 0, 0, 0, 155, 85, 0, 0, 119, 0, + 116, 0, 0, 116, 0, 0, 122, 109, 217, 0, + 117, 120, 86, 217, 0, 217, 0, 116, 218, 0, + 0, 116, 218, 217, 116, 218, 123, 110, 116, 0, + 121, 87, 116, 116, 218, 71, 116, 111, 0, 88, + 73, 116, 72, 107, 74, 0, 217, 108, 0, 0 }; static const short yydefgoto[] = { 1, 9, 145, 166, 167, 230, 231, 10, 11, 12, - 232, 233, 255, 125, 253, 287, 333, 345, 346, 347, - 363, 348, 349, 350, 351, 352, 353, 364, 365, 354, - 355, 356, 357, 358, 359, 360, 361, 479, 380, 381, - 427, 416, 422, 443, 450, 448, 456, 13, 14, 15, + 232, 233, 255, 125, 253, 287, 333, 382, 383, 384, + 404, 385, 350, 388, 389, 353, 391, 405, 406, 355, + 393, 394, 395, 396, 397, 361, 399, 495, 386, 344, + 445, 434, 440, 463, 470, 458, 466, 13, 14, 15, 16, 149, 175, 214, 244, 17, 150, 179, 18, 19, 151, 152, 182, 183, 20, 113, 143, 21, 22, 93, - 153, 264, 265, 23, 368, 369, 32, 84, 83, 80, - 121, 295, 296, 258, 259, 104, 31, 194, 24, 25 + 153, 264, 265, 23, 365, 366, 32, 84, 83, 80, + 121, 295, 296, 258, 259, 387, 31, 194, 345, 25 }; static const short yypact[] = { - -32768, 13, 412,-32768,-32768,-32768,-32768, 412, 412,-32768, + -32768, 13, 265,-32768,-32768,-32768,-32768, 265, 265,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768, 111,-32768, 511,-32768, 412, 412, 412, - -79, 600, 244,-32768, 562,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 412, 412, - 412, 412, 412, 412, 412, 412,-32768,-32768, 576, 412, - -32768, 412, 412, 412, 412, 412, 412, 412, 412,-32768, - 412, 412, 412,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768, 256, 603, 603, 297, 297, 603, 603, 280, - 337, 603, 345, 100, 231, 607, 613, 567, 172, 172, - -32768,-32768,-32768,-32768,-32768, 607, 613, 567, 172, 172, - -32768,-32768,-32768,-32768, -79,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768,-32768, -60, 63, 63,-32768,-32768,-32768, - -32768,-32768,-32768,-32768, 412, 412, 412, 412, 412, 412, - 412,-32768,-32768, 7,-32768, 5, 412, -79, -79, 33, - 34, 35, 254, 51, -79, -79,-32768,-32768,-32768,-32768, - -32768, 36,-32768, 60,-32768,-32768,-32768, -38,-32768,-32768, - -79, -79,-32768, -39, 11,-32768,-32768, 59, 25,-32768, - -32768,-32768,-32768, 27, 600,-32768, 127, 144, -79, -79, - -32768,-32768, 74, 63, 87, -79, -79,-32768, -79,-32768, - -32768, -79, 12, 294, 118, 128, -79, -79,-32768,-32768, - 700,-32768, -79,-32768, 22, -79,-32768, 14,-32768, 600, - 194, 121,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 23,-32768,-32768,-32768,-32768, 309,-32768,-32768,-32768,-32768, - -32768,-32768,-32768, 661,-32768, -79, 38,-32768, 16,-32768, - -32768, 700,-32768, 383, 472,-32768, 42,-32768,-32768,-32768, - -32768, 124,-32768, -79, 10, 4,-32768,-32768, 412, 126, - 187, 99, 412, 412, 412, 412, 200,-32768, 480,-32768, - -32768, 125, 204, 207, 135,-32768, -79, 510,-32768,-32768, - -32768,-32768, 49,-32768, 412, 136,-32768, 133, -79,-32768, - -32768,-32768, 547,-32768,-32768,-32768,-32768, 134,-32768,-32768, - 152,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 153,-32768, - -32768,-32768, 374,-32768,-32768, 140, 112, 157,-32768,-32768, - 584, 138, 160, 148, 412, 152, 152, 152, 152, 152, - 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, - 152, 152, 158, 152, 152, 152, 161, 163,-32768, 412, - 165,-32768, 49,-32768, -79,-32768,-32768,-32768,-32768, 170, - -32768, 412,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 412,-32768, - -32768,-32768,-32768,-32768, -79,-32768,-32768, -79, 123, 183, - -79, 184, -79, -79, 183,-32768, -79, -79, 412, 17, - -32768, -79, 99, -79, -79, 190,-32768,-32768, -79, -79, - 136, -79, -79, 412, 248, 18, -79, -79, 19, 195, - -32768,-32768,-32768, -79, -79, -79,-32768,-32768, -79, 412, - 99, 245, -79, -79, 245, -79, 99, 245, -79, 196, - 136,-32768, 245, 245, -79,-32768, 245, 136,-32768, 245, - 412,-32768,-32768, 245,-32768,-32768, 201,-32768,-32768, 99, - 64,-32768, 295,-32768 + -32768,-32768,-32768, 110,-32768, 567,-32768, 265, 265, 265, + -70, 605, 300,-32768, 657,-32768,-32768,-32768,-32768,-32768, + -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 265, 265, + 265, 265, 265, 265, 265, 265,-32768,-32768, 671, 265, + -32768, 265, 265, 265, 265, 265, 265, 265, 265,-32768, + 265, 265, 265,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + -32768,-32768, 307, 698, 698, 224, 224, 698, 698, 323, + 345, 698, 445, 195, 244, 694, 700, 217, 89, 89, + -32768,-32768,-32768,-32768,-32768, 694, 700, 217, 89, 89, + -32768,-32768,-32768,-32768, -70,-32768,-32768,-32768,-32768,-32768, + -32768,-32768,-32768,-32768, -42, 141, 141,-32768,-32768,-32768, + -32768,-32768,-32768,-32768, 265, 265, 265, 265, 265, 265, + 265,-32768,-32768, -1,-32768, 5, 265, -70, -70, 3, + 34, 51, 186, 39, -70, -70,-32768,-32768,-32768,-32768, + -32768, 54,-32768, 10,-32768,-32768,-32768, -12,-32768,-32768, + -70, -70,-32768, -35, 11,-32768,-32768, -31, 31,-32768, + -32768,-32768,-32768, 23, 605,-32768, 128, 137, -70, -70, + -32768,-32768, 68, 141, 58, -70, -70,-32768, -70,-32768, + -32768, -70, 8, 516, 28, 85, -70, -70,-32768,-32768, + 787,-32768, -70,-32768, 158, -70,-32768, 9,-32768, 605, + 156, 80,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 22,-32768,-32768,-32768,-32768, 359,-32768,-32768,-32768,-32768, + -32768,-32768,-32768, 748,-32768, -70, 115,-32768, 14,-32768, + -32768, 787,-32768, 529, 540,-32768, 123,-32768,-32768,-32768, + -32768, 124,-32768, -70, 30, 6,-32768,-32768, 265, 86, + 65, 96, 265, 265, 265, 265, 256,-32768, 549,-32768, + -32768, 138, 166, 178, 105,-32768, -70, 604,-32768,-32768, + -32768,-32768, 57,-32768, 265, 104,-32768, 100, -70,-32768, + -32768,-32768, 641,-32768,-32768,-32768,-32768, 107,-32768,-32768, + 170, 170, 170, 170, 170,-32768, 170, 170,-32768, 170, + -32768, 170, 170, 170, 170, 170,-32768, 170, 140, 170, + 170, 170, 140,-32768,-32768, 106, 108, 139,-32768,-32768, + 678, 146, 148, 131, 265, 134,-32768,-32768,-32768,-32768, + 265,-32768,-32768, 265,-32768, 265,-32768,-32768,-32768,-32768, + -32768, 265,-32768, 147, 150,-32768, 265, 153,-32768,-32768, + -32768, 265,-32768, 57,-32768, -70,-32768,-32768,-32768,-32768, + 159,-32768, 265, 265, 265, 265,-32768, -70, 265, 265, + -32768, 265,-32768, 265, 265, 265, 265, 265,-32768, 265, + -32768,-32768, 169,-32768, 265, 265, 265, -70,-32768, -70, + 346, 181,-32768,-32768,-32768,-32768, -70,-32768,-32768,-32768, + -32768,-32768,-32768,-32768,-32768,-32768, 265,-32768,-32768,-32768, + -70, -70, 181,-32768, -70, -70, 183, 18,-32768, -70, + 96, -70, -70, 265,-32768,-32768, -70, -70, 104, -70, + 19, 187, 228, 21, -70, -70,-32768,-32768, -70, 265, + -32768,-32768,-32768, -70, -70, -70, 96, 240, -70, 189, + 96, 240, -70, -70, 240, -70, 104,-32768, 240, 265, + 104,-32768, 240, 240, -70,-32768, 240,-32768, 190,-32768, + -32768, 240,-32768,-32768,-32768, 96, -59,-32768, 251,-32768 }; static const short yypgoto[] = { - -32768,-32768,-32768,-32768,-32768,-32768, -206,-32768,-32768,-32768, - -32768,-32768,-32768, 212, -85, -259,-32768,-32768,-32768,-32768, + -32768,-32768,-32768,-32768,-32768,-32768, -207,-32768,-32768,-32768, + -32768,-32768,-32768, 179, -218, -191,-32768,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 281, -8, - -212, -104,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768, 78,-32768, 113, 92,-32768, -204,-32768,-32768,-32768, + -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 145, 410, + 129, -151,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + -32768, 50,-32768, 77, 48,-32768, -212,-32768,-32768,-32768, -140,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - -32768,-32768,-32768, -21,-32768,-32768, 350, 139, 175, 475, - 416, -329, -257, -258, 29, -2, -1,-32768, -122,-32768 + -32768,-32768,-32768, -21,-32768, -39, 288, 7, 82, 424, + 343, -424, -284, -257, 29, -2, 12,-32768, 4,-32768 }; -#define YYLAST 717 +#define YYLAST 804 static const short yytable[] = { - 30, 161, 47, 147, 148, 282, 33, 34, 285, 164, - 197, 162, 246, 482, 283, 216, 59, 247, 302, 262, - 426, 426, 426, 168, 252, 236, 56, 57, 58, 224, - 225, 226, 227, 228, 229, 334, 146, 172, 176, 180, - 190, 198, 260, 261, 340, 266, 279, 95, 96, 97, - 98, 99, 100, 101, 102, 185, 2, 193, 281, 60, - 105, 106, 107, 108, 109, 110, 111, 112, 114, 115, - 116, 209, 3, 237, 238, 239, 240, 241, 242, 373, - 284, 173, 177, 174, 178, 165, 177, 5, 178, 26, - 173, 199, 174, 430, 4, 5, 27, 6, 7, 59, - 28, 341, 8, 133, 29, 202, 7, 59, 200, 59, - 8, 59, 59, 441, 446, 406, 35, 243, 251, 186, - 187, 460, 203, 36, 37, 38, 39, 467, 280, 304, - 204, 293, 154, 155, 156, 157, 158, 159, 160, 201, - 191, 163, 376, 144, 169, 5, 294, 205, 254, 336, - 480, 184, 40, 41, 208, 192, 7, 42, 43, 59, - 8, 134, 135, 136, 137, 138, 139, 140, 44, 45, - 278, 46, 177, 177, 178, 178, 170, 171, 292, 87, - 88, 293, 210, 188, 189, 451, 177, 454, 178, 220, - 457, 372, 4, 5, 293, 463, 294, 249, 221, 195, - 196, 250, 219, 414, 7, 26, 289, 305, 8, 294, - 370, 306, 27, 85, 86, 307, 28, 206, 207, 91, - 29, 336, 481, 442, 211, 212, 447, 213, 337, 342, - 215, 217, 343, 362, 141, 222, 223, 374, 371, 461, - 377, 234, 465, 378, 245, 468, 248, 69, 426, 291, - 471, 472, 440, 398, 474, 301, 402, 475, 403, 117, - 405, 477, 66, 67, 68, 408, 288, 290, 4, 5, - 297, 298, 299, 300, 70, 71, 72, 263, 415, 418, - 7, 4, 5, 129, 8, 433, 434, 70, 71, 72, - 449, 470, 335, 7, 286, 483, 478, 8, 126, 70, - 71, 72, 344, 73, 74, 75, 76, 77, 78, 79, - 421, 118, 119, 124, 256, 308, 73, 74, 75, 76, - 77, 78, 79, 70, 71, 72, 235, 338, 73, 74, - 75, 76, 77, 78, 79, 257, 26, 181, 0, 0, - 130, 0, 379, 27, 0, 0, 0, 28, 132, 0, - 0, 29, 73, 74, 75, 76, 77, 78, 79, 0, - 237, 238, 239, 240, 241, 242, 0, 404, 0, 73, - 74, 75, 76, 77, 78, 79, 26, 218, 0, 410, - 70, 71, 72, 27, 0, 82, 267, 28, 70, 71, - 72, 29, 89, 90, 0, 92, 411, 94, 0, 268, - 269, 270, 271, 407, 243, 0, 0, 0, 409, 73, - 74, 75, 76, 77, 78, 79, 425, 73, 74, 75, - 76, 77, 78, 79, 272, 0, 273, 274, 275, 276, - 0, 439, 0, 412, 0, 0, 413, 0, 0, 417, - 0, 419, 420, 0, 0, 423, 424, 459, 428, 0, - 429, 0, 431, 432, 366, 367, 5, 435, 436, 0, - 437, 438, 0, 0, 0, 444, 445, 7, 476, 0, - 0, 8, 452, 453, 455, 277, 0, 458, 0, 0, - 0, 462, 464, 303, 466, 0, 0, 469, 268, 269, - 270, 271, 0, 473, 26, 0, 268, 269, 270, 271, - 123, 27, 0, 127, 128, 28, 0, 131, 0, 29, - 142, 0, 0, 272, 309, 273, 274, 275, 276, 0, - 310, 272, 0, 273, 274, 275, 276, 0, 0, 0, - 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, - 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, - 331, 339, 332, 0, 0, 0, 0, 310, 120, 122, - 120, 120, 122, 122, 0, 0, 120, 311, 312, 313, - 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, - 324, 325, 326, 327, 328, 329, 330, 331, 375, 332, - 0, 0, 0, 0, 310, 0, 48, 49, 50, 51, - 52, 53, 54, 55, 311, 312, 313, 314, 315, 316, + 30, 161, 47, 162, 246, 24, 282, 172, 334, 164, + 285, 216, 247, 498, 197, 254, 448, 262, 200, 33, + 34, 444, 444, 252, 444, 59, 336, 24, 224, 225, + 226, 227, 228, 229, 283, 261, 59, 278, 176, 56, + 57, 58, 476, 185, 266, 198, 480, 87, 88, 201, + 281, 173, 374, 174, 146, 180, 2, 104, 190, 60, + 95, 96, 97, 98, 99, 100, 101, 102, 114, 115, + 116, 496, 3, 105, 106, 107, 108, 109, 110, 111, + 112, 26, 177, 193, 178, 165, 302, 5, 27, 408, + 191, 199, 28, 341, 4, 5, 29, 6, 7, 220, + 284, 59, 8, 59, 59, 192, 7, 186, 187, 59, + 8, 202, 340, 59, 456, 35, 461, 251, 203, 260, + 85, 86, 36, 37, 38, 39, 91, 279, 280, 147, + 148, 204, 154, 155, 156, 157, 158, 159, 160, 293, + 205, 163, 304, 144, 169, 290, 4, 5, 208, 168, + 377, 40, 41, 210, 294, 221, 42, 43, 7, 249, + 250, 236, 8, 177, 184, 178, 289, 44, 45, 305, + 46, 173, 177, 174, 178, 292, 170, 171, 293, 66, + 67, 68, 306, 188, 189, 307, 177, 373, 178, 336, + 293, 4, 5, 294, 177, 337, 178, 209, 133, 195, + 196, 467, 342, 7, 372, 294, 471, 8, 474, 237, + 238, 239, 240, 241, 242, 219, 483, 206, 207, 375, + 363, 364, 5, 5, 211, 212, 379, 213, 378, 381, + 215, 217, 460, 7, 7, 222, 223, 8, 8, 497, + 124, 234, 400, 444, 245, 401, 248, 141, 403, 291, + 343, 499, 5, 243, 410, 301, 134, 135, 136, 137, + 138, 139, 140, 7, 426, 126, 288, 8, 26, 181, + 297, 298, 299, 300, 24, 27, 433, 263, 443, 28, + 24, 439, 459, 29, 479, 493, 256, 70, 71, 72, + 235, 257, 335, 371, 286, 0, 73, 74, 75, 76, + 77, 78, 79, 69, 452, 64, 65, 66, 67, 68, + 117, 0, 0, 0, 0, 308, 73, 74, 75, 76, + 77, 78, 79, 82, 118, 119, 129, 338, 0, 0, + 89, 90, 367, 92, 0, 94, 367, 4, 5, 0, + 0, 0, 380, 70, 71, 72, 0, 26, 130, 7, + 70, 71, 72, 8, 27, 0, 0, 0, 28, 0, + 0, 0, 29, 0, 402, 0, 70, 71, 72, 407, + 0, 0, 73, 74, 75, 76, 77, 78, 79, 73, + 74, 75, 76, 77, 78, 79, 0, 0, 70, 71, + 72, 0, 0, 0, 0, 73, 74, 75, 76, 77, + 78, 79, 0, 0, 409, 0, 0, 0, 104, 411, + 237, 238, 239, 240, 241, 242, 416, 73, 74, 75, + 76, 77, 78, 79, 436, 0, 432, 123, 26, 0, + 127, 128, 0, 0, 131, 27, 430, 142, 431, 28, + 0, 451, 0, 29, 0, 435, 0, 0, 132, 0, + 0, 0, 0, 0, 243, 0, 0, 469, 0, 437, + 438, 0, 0, 441, 442, 0, 446, 0, 447, 0, + 449, 450, 0, 0, 0, 453, 454, 488, 455, 0, + 0, 0, 0, 464, 465, 0, 0, 468, 70, 71, + 72, 0, 472, 473, 475, 0, 0, 478, 390, 0, + 392, 482, 484, 0, 486, 0, 398, 120, 122, 120, + 120, 122, 122, 491, 0, 120, 0, 73, 74, 75, + 76, 77, 78, 79, 0, 0, 0, 412, 413, 414, + 415, 0, 267, 417, 418, 0, 419, 0, 420, 421, + 422, 423, 424, 277, 425, 268, 269, 270, 271, 427, + 428, 429, 303, 0, 0, 0, 268, 269, 270, 271, + 0, 0, 0, 0, 0, 268, 269, 270, 271, 0, + 272, 0, 273, 274, 275, 276, 0, 0, 0, 457, + 0, 272, 462, 273, 274, 275, 276, 0, 0, 0, + 272, 0, 273, 274, 275, 276, 477, 0, 26, 218, + 481, 0, 0, 485, 0, 27, 0, 487, 309, 28, + 0, 489, 490, 29, 310, 492, 0, 0, 0, 0, + 494, 0, 0, 0, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, - 327, 328, 329, 330, 331, 0, 332, 382, 383, 384, - 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, - 395, 396, 397, 0, 399, 400, 401, 61, 62, 63, - 64, 65, 66, 67, 68, 64, 65, 66, 67, 68, - 81, 61, 62, 63, 64, 65, 66, 67, 68, 0, - 0, 0, 0, 0, 103, 73, 74, 75, 76, 77, - 78, 79, 0, 118, 119, 61, 62, 63, 64, 65, - 66, 67, 68, 62, 63, 64, 65, 66, 67, 68, - 63, 64, 65, 66, 67, 68, 224, 225, 226, 227, - 228, 229, 237, 238, 239, 240, 241, 242 + 327, 328, 329, 330, 331, 339, 332, 0, 0, 0, + 0, 310, 48, 49, 50, 51, 52, 53, 54, 55, + 0, 311, 312, 313, 314, 315, 316, 317, 318, 319, + 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 376, 332, 0, 0, 0, 0, 310, 0, + 61, 62, 63, 64, 65, 66, 67, 68, 311, 312, + 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, + 323, 324, 325, 326, 327, 328, 329, 330, 331, 0, + 332, 346, 347, 348, 349, 0, 351, 352, 0, 354, + 0, 356, 357, 358, 359, 360, 0, 362, 0, 368, + 369, 370, 61, 62, 63, 64, 65, 66, 67, 68, + 0, 0, 0, 0, 0, 81, 61, 62, 63, 64, + 65, 66, 67, 68, 0, 0, 0, 0, 0, 103, + 73, 74, 75, 76, 77, 78, 79, 0, 118, 119, + 62, 63, 64, 65, 66, 67, 68, 63, 64, 65, + 66, 67, 68, 224, 225, 226, 227, 228, 229, 237, + 238, 239, 240, 241, 242 }; static const short yycheck[] = { - 2, 141, 23, 125, 126, 263, 7, 8, 4, 4, - 49, 4, 216, 0, 4, 3, 95, 3, 277, 3, - 3, 3, 3, 145, 230, 3, 27, 28, 29, 6, - 7, 8, 9, 10, 11, 292, 96, 4, 4, 4, - 4, 80, 4, 247, 303, 251, 4, 48, 49, 50, - 51, 52, 53, 54, 55, 4, 43, 95, 262, 30, - 61, 62, 63, 64, 65, 66, 67, 68, 70, 71, - 72, 193, 59, 51, 52, 53, 54, 55, 56, 336, - 70, 48, 48, 50, 50, 80, 48, 82, 50, 82, - 48, 80, 50, 422, 81, 82, 89, 84, 93, 95, - 93, 305, 97, 3, 97, 80, 93, 95, 49, 95, - 97, 95, 95, 95, 95, 372, 5, 95, 95, 68, - 69, 450, 95, 12, 13, 14, 15, 456, 4, 4, - 3, 82, 134, 135, 136, 137, 138, 139, 140, 80, - 80, 143, 4, 114, 146, 82, 97, 3, 233, 85, - 479, 152, 41, 42, 80, 95, 93, 46, 47, 95, - 97, 61, 62, 63, 64, 65, 66, 67, 57, 58, - 255, 60, 48, 48, 50, 50, 147, 148, 79, 40, - 41, 82, 95, 154, 155, 443, 48, 445, 50, 71, - 448, 79, 81, 82, 82, 453, 97, 3, 70, 170, - 171, 80, 203, 80, 93, 82, 80, 3, 97, 97, - 332, 4, 89, 38, 39, 80, 93, 188, 189, 44, - 97, 85, 480, 435, 195, 196, 438, 198, 95, 95, - 201, 202, 80, 80, 3, 206, 207, 80, 98, 451, - 80, 212, 454, 95, 215, 457, 217, 3, 3, 270, - 462, 463, 4, 95, 466, 276, 95, 469, 95, 3, - 95, 473, 90, 91, 92, 95, 268, 80, 81, 82, - 272, 273, 274, 275, 43, 44, 45, 248, 95, 95, - 93, 81, 82, 3, 97, 95, 426, 43, 44, 45, - 95, 95, 294, 93, 265, 0, 95, 97, 86, 43, - 44, 45, 310, 72, 73, 74, 75, 76, 77, 78, - 414, 80, 81, 16, 236, 286, 72, 73, 74, 75, - 76, 77, 78, 43, 44, 45, 213, 298, 72, 73, - 74, 75, 76, 77, 78, 243, 82, 83, -1, -1, - 3, -1, 344, 89, -1, -1, -1, 93, 3, -1, - -1, 97, 72, 73, 74, 75, 76, 77, 78, -1, - 51, 52, 53, 54, 55, 56, -1, 369, -1, 72, - 73, 74, 75, 76, 77, 78, 82, 83, -1, 381, - 43, 44, 45, 89, -1, 35, 3, 93, 43, 44, - 45, 97, 42, 43, -1, 45, 398, 47, -1, 16, - 17, 18, 19, 374, 95, -1, -1, -1, 379, 72, - 73, 74, 75, 76, 77, 78, 418, 72, 73, 74, - 75, 76, 77, 78, 41, -1, 43, 44, 45, 46, - -1, 433, -1, 404, -1, -1, 407, -1, -1, 410, - -1, 412, 413, -1, -1, 416, 417, 449, 419, -1, - 421, -1, 423, 424, 80, 81, 82, 428, 429, -1, - 431, 432, -1, -1, -1, 436, 437, 93, 470, -1, - -1, 97, 443, 444, 445, 3, -1, 448, -1, -1, - -1, 452, 453, 3, 455, -1, -1, 458, 16, 17, - 18, 19, -1, 464, 82, -1, 16, 17, 18, 19, - 84, 89, -1, 87, 88, 93, -1, 91, -1, 97, - 94, -1, -1, 41, 4, 43, 44, 45, 46, -1, - 10, 41, -1, 43, 44, 45, 46, -1, -1, -1, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 4, 42, -1, -1, -1, -1, 10, 83, 84, - 85, 86, 87, 88, -1, -1, 91, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 4, 42, - -1, -1, -1, -1, 10, -1, 85, 86, 87, 88, - 89, 90, 91, 92, 20, 21, 22, 23, 24, 25, + 2, 141, 23, 4, 216, 1, 263, 4, 292, 4, + 4, 3, 3, 0, 49, 233, 440, 3, 49, 7, + 8, 3, 3, 230, 3, 95, 85, 23, 6, 7, + 8, 9, 10, 11, 4, 247, 95, 255, 4, 27, + 28, 29, 466, 4, 251, 80, 470, 40, 41, 80, + 262, 48, 336, 50, 96, 4, 43, 59, 4, 30, + 48, 49, 50, 51, 52, 53, 54, 55, 70, 71, + 72, 495, 59, 61, 62, 63, 64, 65, 66, 67, + 68, 82, 48, 95, 50, 80, 277, 82, 89, 373, + 80, 80, 93, 305, 81, 82, 97, 84, 93, 71, + 70, 95, 97, 95, 95, 95, 93, 68, 69, 95, + 97, 80, 303, 95, 95, 5, 95, 95, 95, 4, + 38, 39, 12, 13, 14, 15, 44, 4, 4, 125, + 126, 3, 134, 135, 136, 137, 138, 139, 140, 82, + 3, 143, 4, 114, 146, 80, 81, 82, 80, 145, + 4, 41, 42, 95, 97, 70, 46, 47, 93, 3, + 80, 3, 97, 48, 152, 50, 80, 57, 58, 3, + 60, 48, 48, 50, 50, 79, 147, 148, 82, 90, + 91, 92, 4, 154, 155, 80, 48, 79, 50, 85, + 82, 81, 82, 97, 48, 95, 50, 193, 3, 170, + 171, 458, 95, 93, 98, 97, 463, 97, 465, 51, + 52, 53, 54, 55, 56, 203, 473, 188, 189, 80, + 80, 81, 82, 82, 195, 196, 95, 198, 80, 95, + 201, 202, 4, 93, 93, 206, 207, 97, 97, 496, + 16, 212, 95, 3, 215, 95, 217, 3, 95, 270, + 80, 0, 82, 95, 95, 276, 61, 62, 63, 64, + 65, 66, 67, 93, 95, 86, 268, 97, 82, 83, + 272, 273, 274, 275, 270, 89, 95, 248, 95, 93, + 276, 432, 95, 97, 95, 95, 236, 43, 44, 45, + 213, 243, 294, 332, 265, -1, 72, 73, 74, 75, + 76, 77, 78, 3, 444, 88, 89, 90, 91, 92, + 3, -1, -1, -1, -1, 286, 72, 73, 74, 75, + 76, 77, 78, 35, 80, 81, 3, 298, -1, -1, + 42, 43, 328, 45, -1, 47, 332, 81, 82, -1, + -1, -1, 344, 43, 44, 45, -1, 82, 3, 93, + 43, 44, 45, 97, 89, -1, -1, -1, 93, -1, + -1, -1, 97, -1, 366, -1, 43, 44, 45, 371, + -1, -1, 72, 73, 74, 75, 76, 77, 78, 72, + 73, 74, 75, 76, 77, 78, -1, -1, 43, 44, + 45, -1, -1, -1, -1, 72, 73, 74, 75, 76, + 77, 78, -1, -1, 375, -1, -1, -1, 410, 380, + 51, 52, 53, 54, 55, 56, 387, 72, 73, 74, + 75, 76, 77, 78, 426, -1, 80, 84, 82, -1, + 87, 88, -1, -1, 91, 89, 407, 94, 409, 93, + -1, 443, -1, 97, -1, 416, -1, -1, 3, -1, + -1, -1, -1, -1, 95, -1, -1, 459, -1, 430, + 431, -1, -1, 434, 435, -1, 437, -1, 439, -1, + 441, 442, -1, -1, -1, 446, 447, 479, 449, -1, + -1, -1, -1, 454, 455, -1, -1, 458, 43, 44, + 45, -1, 463, 464, 465, -1, -1, 468, 353, -1, + 355, 472, 473, -1, 475, -1, 361, 83, 84, 85, + 86, 87, 88, 484, -1, 91, -1, 72, 73, 74, + 75, 76, 77, 78, -1, -1, -1, 382, 383, 384, + 385, -1, 3, 388, 389, -1, 391, -1, 393, 394, + 395, 396, 397, 3, 399, 16, 17, 18, 19, 404, + 405, 406, 3, -1, -1, -1, 16, 17, 18, 19, + -1, -1, -1, -1, -1, 16, 17, 18, 19, -1, + 41, -1, 43, 44, 45, 46, -1, -1, -1, 450, + -1, 41, 453, 43, 44, 45, 46, -1, -1, -1, + 41, -1, 43, 44, 45, 46, 467, -1, 82, 83, + 471, -1, -1, 474, -1, 89, -1, 478, 4, 93, + -1, 482, 483, 97, 10, 486, -1, -1, -1, -1, + 491, -1, -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, -1, 42, 346, 347, 348, - 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, - 359, 360, 361, -1, 363, 364, 365, 85, 86, 87, - 88, 89, 90, 91, 92, 88, 89, 90, 91, 92, - 98, 85, 86, 87, 88, 89, 90, 91, 92, -1, - -1, -1, -1, -1, 98, 72, 73, 74, 75, 76, - 77, 78, -1, 80, 81, 85, 86, 87, 88, 89, - 90, 91, 92, 86, 87, 88, 89, 90, 91, 92, - 87, 88, 89, 90, 91, 92, 6, 7, 8, 9, - 10, 11, 51, 52, 53, 54, 55, 56 + 36, 37, 38, 39, 40, 4, 42, -1, -1, -1, + -1, 10, 85, 86, 87, 88, 89, 90, 91, 92, + -1, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 40, 4, 42, -1, -1, -1, -1, 10, -1, + 85, 86, 87, 88, 89, 90, 91, 92, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, -1, + 42, 311, 312, 313, 314, -1, 316, 317, -1, 319, + -1, 321, 322, 323, 324, 325, -1, 327, -1, 329, + 330, 331, 85, 86, 87, 88, 89, 90, 91, 92, + -1, -1, -1, -1, -1, 98, 85, 86, 87, 88, + 89, 90, 91, 92, -1, -1, -1, -1, -1, 98, + 72, 73, 74, 75, 76, 77, 78, -1, 80, 81, + 86, 87, 88, 89, 90, 91, 92, 87, 88, 89, + 90, 91, 92, 6, 7, 8, 9, 10, 11, 51, + 52, 53, 54, 55, 56 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/share/bison/bison.simple" +#line 3 "/usr/share/bison-1.35/bison.simple" /* Skeleton output parser for bison, @@ -1104,7 +1131,7 @@ yystpcpy (yydest, yysrc) # endif #endif -#line 315 "/usr/share/bison/bison.simple" +#line 315 "/usr/share/bison-1.35/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed @@ -1498,7 +1525,7 @@ yyreduce: switch (yyn) { case 17: -#line 177 "rcparse.y" +#line 182 "rcparse.y" { define_accelerator (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].pacc); if (yychar != YYEMPTY) @@ -1507,13 +1534,13 @@ case 17: } break; case 18: -#line 187 "rcparse.y" +#line 192 "rcparse.y" { yyval.pacc = NULL; } break; case 19: -#line 191 "rcparse.y" +#line 196 "rcparse.y" { struct accelerator *a; @@ -1533,25 +1560,25 @@ case 19: } break; case 20: -#line 212 "rcparse.y" +#line 217 "rcparse.y" { yyval.acc = yyvsp[-1].acc; yyval.acc.id = yyvsp[0].il; } break; case 21: -#line 217 "rcparse.y" +#line 222 "rcparse.y" { yyval.acc = yyvsp[-3].acc; yyval.acc.id = yyvsp[-2].il; yyval.acc.flags |= yyvsp[0].is; if ((yyval.acc.flags & ACC_VIRTKEY) == 0 - && (yyval.acc.flags & (ACC_SHIFT | ACC_CONTROL | ACC_ALT)) != 0) + && (yyval.acc.flags & (ACC_SHIFT | ACC_CONTROL)) != 0) rcparse_warning (_("inappropriate modifiers for non-VIRTKEY")); } break; case 22: -#line 229 "rcparse.y" +#line 234 "rcparse.y" { const char *s = yyvsp[0].s; char ch; @@ -1574,7 +1601,7 @@ case 22: } break; case 23: -#line 250 "rcparse.y" +#line 255 "rcparse.y" { yyval.acc.next = NULL; yyval.acc.flags = 0; @@ -1583,62 +1610,62 @@ case 23: } break; case 24: -#line 260 "rcparse.y" +#line 265 "rcparse.y" { yyval.is = yyvsp[0].is; } break; case 25: -#line 264 "rcparse.y" +#line 269 "rcparse.y" { yyval.is = yyvsp[-2].is | yyvsp[0].is; } break; case 26: -#line 269 "rcparse.y" +#line 274 "rcparse.y" { yyval.is = yyvsp[-1].is | yyvsp[0].is; } break; case 27: -#line 276 "rcparse.y" +#line 281 "rcparse.y" { yyval.is = ACC_VIRTKEY; } break; case 28: -#line 280 "rcparse.y" +#line 285 "rcparse.y" { /* This is just the absence of VIRTKEY. */ yyval.is = 0; } break; case 29: -#line 285 "rcparse.y" +#line 290 "rcparse.y" { yyval.is = ACC_NOINVERT; } break; case 30: -#line 289 "rcparse.y" +#line 294 "rcparse.y" { yyval.is = ACC_SHIFT; } break; case 31: -#line 293 "rcparse.y" +#line 298 "rcparse.y" { yyval.is = ACC_CONTROL; } break; case 32: -#line 297 "rcparse.y" +#line 302 "rcparse.y" { yyval.is = ACC_ALT; } break; case 33: -#line 306 "rcparse.y" +#line 311 "rcparse.y" { define_bitmap (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s); if (yychar != YYEMPTY) @@ -1647,7 +1674,7 @@ case 33: } break; case 34: -#line 318 "rcparse.y" +#line 323 "rcparse.y" { define_cursor (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s); if (yychar != YYEMPTY) @@ -1656,7 +1683,7 @@ case 34: } break; case 35: -#line 331 "rcparse.y" +#line 336 "rcparse.y" { memset (&dialog, 0, sizeof dialog); dialog.x = yyvsp[-3].il; @@ -1675,7 +1702,7 @@ case 35: } break; case 36: -#line 348 "rcparse.y" +#line 353 "rcparse.y" { define_dialog (yyvsp[-12].id, &sub_res_info, &dialog); if (yychar != YYEMPTY) @@ -1684,7 +1711,7 @@ case 36: } break; case 37: -#line 356 "rcparse.y" +#line 361 "rcparse.y" { memset (&dialog, 0, sizeof dialog); dialog.x = yyvsp[-3].il; @@ -1705,7 +1732,7 @@ case 37: } break; case 38: -#line 375 "rcparse.y" +#line 380 "rcparse.y" { define_dialog (yyvsp[-12].id, &sub_res_info, &dialog); if (yychar != YYEMPTY) @@ -1714,7 +1741,7 @@ case 38: } break; case 39: -#line 383 "rcparse.y" +#line 388 "rcparse.y" { memset (&dialog, 0, sizeof dialog); dialog.x = yyvsp[-4].il; @@ -1736,7 +1763,7 @@ case 39: } break; case 40: -#line 403 "rcparse.y" +#line 408 "rcparse.y" { define_dialog (yyvsp[-13].id, &sub_res_info, &dialog); if (yychar != YYEMPTY) @@ -1745,19 +1772,19 @@ case 40: } break; case 41: -#line 413 "rcparse.y" +#line 418 "rcparse.y" { yyval.il = 0; } break; case 42: -#line 417 "rcparse.y" +#line 422 "rcparse.y" { yyval.il = yyvsp[0].il; } break; case 44: -#line 425 "rcparse.y" +#line 430 "rcparse.y" { dialog.style |= WS_CAPTION; style |= WS_CAPTION; @@ -1765,31 +1792,31 @@ case 44: } break; case 45: -#line 431 "rcparse.y" +#line 436 "rcparse.y" { dialog.class = yyvsp[0].id; } break; case 46: -#line 436 "rcparse.y" +#line 441 "rcparse.y" { dialog.style = style; } break; case 47: -#line 440 "rcparse.y" +#line 445 "rcparse.y" { dialog.exstyle = yyvsp[0].il; } break; case 48: -#line 444 "rcparse.y" +#line 449 "rcparse.y" { res_string_to_id (& dialog.class, yyvsp[0].s); } break; case 49: -#line 448 "rcparse.y" +#line 453 "rcparse.y" { dialog.style |= DS_SETFONT; style |= DS_SETFONT; @@ -1804,7 +1831,7 @@ case 49: } break; case 50: -#line 461 "rcparse.y" +#line 466 "rcparse.y" { dialog.style |= DS_SETFONT; style |= DS_SETFONT; @@ -1821,7 +1848,7 @@ case 50: } break; case 51: -#line 476 "rcparse.y" +#line 481 "rcparse.y" { dialog.style |= DS_SETFONT; style |= DS_SETFONT; @@ -1838,7 +1865,7 @@ case 51: } break; case 52: -#line 491 "rcparse.y" +#line 496 "rcparse.y" { dialog.style |= DS_SETFONT; style |= DS_SETFONT; @@ -1855,31 +1882,31 @@ case 52: } break; case 53: -#line 506 "rcparse.y" +#line 511 "rcparse.y" { dialog.menu = yyvsp[0].id; } break; case 54: -#line 510 "rcparse.y" +#line 515 "rcparse.y" { sub_res_info.characteristics = yyvsp[0].il; } break; case 55: -#line 514 "rcparse.y" +#line 519 "rcparse.y" { sub_res_info.language = yyvsp[-1].il | (yyvsp[0].il << SUBLANG_SHIFT); } break; case 56: -#line 518 "rcparse.y" +#line 523 "rcparse.y" { sub_res_info.version = yyvsp[0].il; } break; case 58: -#line 526 "rcparse.y" +#line 531 "rcparse.y" { struct dialog_control **pp; @@ -1889,57 +1916,61 @@ case 58: } break; case 59: -#line 537 "rcparse.y" +#line 542 "rcparse.y" { default_style = BS_AUTO3STATE | WS_TABSTOP; base_style = BS_AUTO3STATE; class = CTL_BUTTON; + res_text_field = yyvsp[0].id; } break; case 60: -#line 543 "rcparse.y" +#line 549 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 61: -#line 547 "rcparse.y" +#line 553 "rcparse.y" { default_style = BS_AUTOCHECKBOX | WS_TABSTOP; base_style = BS_AUTOCHECKBOX; class = CTL_BUTTON; + res_text_field = yyvsp[0].id; } break; case 62: -#line 553 "rcparse.y" +#line 560 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 63: -#line 557 "rcparse.y" +#line 564 "rcparse.y" { default_style = BS_AUTORADIOBUTTON | WS_TABSTOP; base_style = BS_AUTORADIOBUTTON; class = CTL_BUTTON; + res_text_field = yyvsp[0].id; } break; case 64: -#line 563 "rcparse.y" +#line 571 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 65: -#line 567 "rcparse.y" +#line 575 "rcparse.y" { default_style = ES_LEFT | WS_BORDER | WS_TABSTOP; base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class = CTL_EDIT; + res_text_field = yyvsp[0].id; } break; case 66: -#line 573 "rcparse.y" +#line 582 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; if (dialog.ex == NULL) @@ -1948,37 +1979,41 @@ case 66: } break; case 67: -#line 580 "rcparse.y" +#line 589 "rcparse.y" { default_style = BS_CHECKBOX | WS_TABSTOP; base_style = BS_CHECKBOX | WS_TABSTOP; class = CTL_BUTTON; + res_text_field = yyvsp[0].id; } break; case 68: -#line 586 "rcparse.y" +#line 596 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 69: -#line 590 "rcparse.y" +#line 600 "rcparse.y" { + /* This is as per MSDN documentation. With some (???) + versions of MS rc.exe their is no default style. */ default_style = CBS_SIMPLE | WS_TABSTOP; base_style = 0; class = CTL_COMBOBOX; + res_text_field = res_null_text; } break; case 70: -#line 596 "rcparse.y" +#line 609 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 71: -#line 601 "rcparse.y" +#line 614 "rcparse.y" { - yyval.dialog_control = define_control (yyvsp[-9].s, yyvsp[-8].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-2].il, yyvsp[-7].il, style, yyvsp[-1].il); + yyval.dialog_control = define_control (yyvsp[-9].id, yyvsp[-8].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-2].il, yyvsp[-7].il, style, yyvsp[-1].il); if (yyvsp[0].rcdata_item != NULL) { if (dialog.ex == NULL) @@ -1988,9 +2023,9 @@ case 71: } break; case 72: -#line 612 "rcparse.y" +#line 625 "rcparse.y" { - yyval.dialog_control = define_control (yyvsp[-10].s, yyvsp[-9].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-8].il, style, yyvsp[-2].il); + yyval.dialog_control = define_control (yyvsp[-10].id, yyvsp[-9].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-8].il, style, yyvsp[-2].il); if (dialog.ex == NULL) rcparse_warning (_("help ID requires DIALOGEX")); yyval.dialog_control->help = yyvsp[-1].il; @@ -1998,9 +2033,9 @@ case 72: } break; case 73: -#line 621 "rcparse.y" +#line 634 "rcparse.y" { - yyval.dialog_control = define_control (yyvsp[-10].s, yyvsp[-9].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-2].il, 0, style, yyvsp[-1].il); + yyval.dialog_control = define_control (yyvsp[-10].id, yyvsp[-9].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-2].il, 0, style, yyvsp[-1].il); if (yyvsp[0].rcdata_item != NULL) { if (dialog.ex == NULL) @@ -2012,9 +2047,9 @@ case 73: } break; case 74: -#line 634 "rcparse.y" +#line 647 "rcparse.y" { - yyval.dialog_control = define_control (yyvsp[-11].s, yyvsp[-10].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, 0, style, yyvsp[-2].il); + yyval.dialog_control = define_control (yyvsp[-11].id, yyvsp[-10].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, 0, style, yyvsp[-2].il); if (dialog.ex == NULL) rcparse_warning ("help ID requires DIALOGEX"); yyval.dialog_control->help = yyvsp[-1].il; @@ -2024,71 +2059,76 @@ case 74: } break; case 75: -#line 644 "rcparse.y" +#line 657 "rcparse.y" { default_style = SS_CENTER | WS_GROUP; base_style = SS_CENTER; class = CTL_STATIC; + res_text_field = yyvsp[0].id; } break; case 76: -#line 650 "rcparse.y" +#line 664 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 77: -#line 654 "rcparse.y" +#line 668 "rcparse.y" { default_style = BS_DEFPUSHBUTTON | WS_TABSTOP; base_style = BS_DEFPUSHBUTTON | WS_TABSTOP; class = CTL_BUTTON; + res_text_field = yyvsp[0].id; } break; case 78: -#line 660 "rcparse.y" +#line 675 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 79: -#line 664 "rcparse.y" +#line 679 "rcparse.y" { default_style = ES_LEFT | WS_BORDER | WS_TABSTOP; base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class = CTL_EDIT; + res_text_field = res_null_text; } break; case 80: -#line 670 "rcparse.y" +#line 686 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 81: -#line 674 "rcparse.y" +#line 690 "rcparse.y" { default_style = BS_GROUPBOX; base_style = BS_GROUPBOX; class = CTL_BUTTON; + res_text_field = yyvsp[0].id; } break; case 82: -#line 680 "rcparse.y" +#line 697 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 83: -#line 684 "rcparse.y" +#line 701 "rcparse.y" { default_style = ES_LEFT | WS_BORDER | WS_TABSTOP; base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class = CTL_EDIT; + res_text_field = yyvsp[0].id; } break; case 84: -#line 690 "rcparse.y" +#line 708 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; if (dialog.ex == NULL) @@ -2097,43 +2137,44 @@ case 84: } break; case 85: -#line 697 "rcparse.y" +#line 715 "rcparse.y" { yyval.dialog_control = define_icon_control (yyvsp[-4].id, yyvsp[-3].il, yyvsp[-2].il, yyvsp[-1].il, 0, 0, 0, yyvsp[0].rcdata_item, dialog.ex); } break; case 86: -#line 703 "rcparse.y" +#line 721 "rcparse.y" { yyval.dialog_control = define_icon_control (yyvsp[-6].id, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, 0, 0, 0, yyvsp[0].rcdata_item, dialog.ex); } break; case 87: -#line 709 "rcparse.y" +#line 727 "rcparse.y" { yyval.dialog_control = define_icon_control (yyvsp[-8].id, yyvsp[-7].il, yyvsp[-6].il, yyvsp[-5].il, style, yyvsp[-1].il, 0, yyvsp[0].rcdata_item, dialog.ex); } break; case 88: -#line 715 "rcparse.y" +#line 733 "rcparse.y" { yyval.dialog_control = define_icon_control (yyvsp[-9].id, yyvsp[-8].il, yyvsp[-7].il, yyvsp[-6].il, style, yyvsp[-2].il, yyvsp[-1].il, yyvsp[0].rcdata_item, dialog.ex); } break; case 89: -#line 720 "rcparse.y" +#line 738 "rcparse.y" { default_style = ES_LEFT | WS_BORDER | WS_TABSTOP; base_style = ES_LEFT | WS_BORDER | WS_TABSTOP; class = CTL_EDIT; + res_text_field = yyvsp[0].id; } break; case 90: -#line 726 "rcparse.y" +#line 745 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; if (dialog.ex == NULL) @@ -2142,35 +2183,37 @@ case 90: } break; case 91: -#line 733 "rcparse.y" +#line 752 "rcparse.y" { default_style = LBS_NOTIFY | WS_BORDER; base_style = LBS_NOTIFY | WS_BORDER; class = CTL_LISTBOX; + res_text_field = res_null_text; } break; case 92: -#line 739 "rcparse.y" +#line 759 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 93: -#line 743 "rcparse.y" +#line 763 "rcparse.y" { default_style = SS_LEFT | WS_GROUP; base_style = SS_LEFT; class = CTL_STATIC; + res_text_field = yyvsp[0].id; } break; case 94: -#line 749 "rcparse.y" +#line 770 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 95: -#line 753 "rcparse.y" +#line 774 "rcparse.y" { default_style = BS_PUSHBOX | WS_TABSTOP; base_style = BS_PUSHBOX; @@ -2178,96 +2221,101 @@ case 95: } break; case 96: -#line 759 "rcparse.y" +#line 780 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 97: -#line 763 "rcparse.y" +#line 784 "rcparse.y" { default_style = BS_PUSHBUTTON | WS_TABSTOP; base_style = BS_PUSHBUTTON | WS_TABSTOP; class = CTL_BUTTON; + res_text_field = yyvsp[0].id; } break; case 98: -#line 769 "rcparse.y" +#line 791 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 99: -#line 773 "rcparse.y" +#line 795 "rcparse.y" { default_style = BS_RADIOBUTTON | WS_TABSTOP; base_style = BS_RADIOBUTTON; class = CTL_BUTTON; + res_text_field = yyvsp[0].id; } break; case 100: -#line 779 "rcparse.y" +#line 802 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 101: -#line 783 "rcparse.y" +#line 806 "rcparse.y" { default_style = SS_RIGHT | WS_GROUP; base_style = SS_RIGHT; class = CTL_STATIC; + res_text_field = yyvsp[0].id; } break; case 102: -#line 789 "rcparse.y" +#line 813 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 103: -#line 793 "rcparse.y" +#line 817 "rcparse.y" { default_style = SBS_HORZ; base_style = 0; class = CTL_SCROLLBAR; + res_text_field = res_null_text; } break; case 104: -#line 799 "rcparse.y" +#line 824 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 105: -#line 803 "rcparse.y" +#line 828 "rcparse.y" { default_style = BS_3STATE | WS_TABSTOP; base_style = BS_3STATE; class = CTL_BUTTON; + res_text_field = yyvsp[0].id; } break; case 106: -#line 809 "rcparse.y" +#line 835 "rcparse.y" { yyval.dialog_control = yyvsp[0].dialog_control; } break; case 107: -#line 814 "rcparse.y" +#line 840 "rcparse.y" { style = WS_CHILD | WS_VISIBLE; } break; case 108: -#line 816 "rcparse.y" +#line 842 "rcparse.y" { - yyval.dialog_control = define_control (yyvsp[-14].s, yyvsp[-12].il, yyvsp[-10].il, yyvsp[-8].il, yyvsp[-6].il, yyvsp[-4].il, CTL_BUTTON, + yyval.dialog_control = define_control (yyvsp[-13].id, yyvsp[-12].il, yyvsp[-10].il, yyvsp[-8].il, yyvsp[-6].il, yyvsp[-4].il, CTL_BUTTON, style, yyvsp[0].il); } break; case 109: -#line 832 "rcparse.y" +#line 857 "rcparse.y" { - yyval.dialog_control = define_control (yyvsp[-6].s, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-2].il, yyvsp[-1].il, class, + yyval.dialog_control = define_control (res_text_field, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-2].il, yyvsp[-1].il, class, default_style | WS_CHILD | WS_VISIBLE, 0); if (yyvsp[0].rcdata_item != NULL) { @@ -2278,9 +2326,9 @@ case 109: } break; case 110: -#line 844 "rcparse.y" +#line 869 "rcparse.y" { - yyval.dialog_control = define_control (yyvsp[-8].s, yyvsp[-7].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, class, style, yyvsp[-1].il); + yyval.dialog_control = define_control (res_text_field, yyvsp[-7].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, class, style, yyvsp[-1].il); if (yyvsp[0].rcdata_item != NULL) { if (dialog.ex == NULL) @@ -2290,9 +2338,9 @@ case 110: } break; case 111: -#line 855 "rcparse.y" +#line 880 "rcparse.y" { - yyval.dialog_control = define_control (yyvsp[-9].s, yyvsp[-8].il, yyvsp[-7].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, class, style, yyvsp[-2].il); + yyval.dialog_control = define_control (res_text_field, yyvsp[-8].il, yyvsp[-7].il, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, class, style, yyvsp[-2].il); if (dialog.ex == NULL) rcparse_warning (_("help ID requires DIALOGEX")); yyval.dialog_control->help = yyvsp[-1].il; @@ -2300,49 +2348,56 @@ case 111: } break; case 112: -#line 866 "rcparse.y" +#line 891 "rcparse.y" { - yyval.s = NULL; + res_string_to_id (&yyval.id, ""); } break; case 113: -#line 870 "rcparse.y" +#line 895 "rcparse.y" { - yyval.s = yyvsp[0].s; + yyval.id.named = 0; + yyval.id.u.id = yyvsp[-1].il; } break; case 114: -#line 874 "rcparse.y" +#line 900 "rcparse.y" { - yyval.s = yyvsp[-1].s; + res_string_to_id (&yyval.id, yyvsp[0].s); } break; case 115: -#line 881 "rcparse.y" +#line 904 "rcparse.y" { - yyval.rcdata_item = NULL; + res_string_to_id (&yyval.id, yyvsp[-1].s); } break; case 116: -#line 885 "rcparse.y" +#line 911 "rcparse.y" { - yyval.rcdata_item = yyvsp[-1].rcdata.first; + yyval.rcdata_item = NULL; } break; case 117: -#line 894 "rcparse.y" +#line 915 "rcparse.y" +{ + yyval.rcdata_item = yyvsp[-1].rcdata.first; + } + break; +case 118: +#line 924 "rcparse.y" { style = WS_CHILD | WS_VISIBLE; } break; -case 119: -#line 900 "rcparse.y" +case 120: +#line 930 "rcparse.y" { style = SS_ICON | WS_CHILD | WS_VISIBLE; } break; -case 121: -#line 906 "rcparse.y" +case 122: +#line 936 "rcparse.y" { style = base_style | WS_CHILD | WS_VISIBLE; } break; -case 123: -#line 914 "rcparse.y" +case 124: +#line 944 "rcparse.y" { define_font (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s); if (yychar != YYEMPTY) @@ -2350,8 +2405,8 @@ case 123: rcparse_discard_strings (); } break; -case 124: -#line 926 "rcparse.y" +case 125: +#line 956 "rcparse.y" { define_icon (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s); if (yychar != YYEMPTY) @@ -2359,14 +2414,14 @@ case 124: rcparse_discard_strings (); } break; -case 125: -#line 939 "rcparse.y" +case 126: +#line 969 "rcparse.y" { language = yyvsp[-1].il | (yyvsp[0].il << SUBLANG_SHIFT); } break; -case 126: -#line 948 "rcparse.y" +case 127: +#line 978 "rcparse.y" { define_menu (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].menuitem); if (yychar != YYEMPTY) @@ -2374,14 +2429,14 @@ case 126: rcparse_discard_strings (); } break; -case 127: -#line 958 "rcparse.y" +case 128: +#line 988 "rcparse.y" { yyval.menuitem = NULL; } break; -case 128: -#line 962 "rcparse.y" +case 129: +#line 992 "rcparse.y" { if (yyvsp[-1].menuitem == NULL) yyval.menuitem = yyvsp[0].menuitem; @@ -2396,80 +2451,80 @@ case 128: } } break; -case 129: -#line 979 "rcparse.y" +case 130: +#line 1009 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-2].s, yyvsp[-1].il, yyvsp[0].is, 0, 0, NULL); } break; -case 130: -#line 983 "rcparse.y" +case 131: +#line 1013 "rcparse.y" { yyval.menuitem = define_menuitem (NULL, 0, 0, 0, 0, NULL); } break; -case 131: -#line 987 "rcparse.y" +case 132: +#line 1017 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-4].s, 0, yyvsp[-3].is, 0, 0, yyvsp[-1].menuitem); } break; -case 132: -#line 994 "rcparse.y" +case 133: +#line 1024 "rcparse.y" { yyval.is = 0; } break; -case 133: -#line 998 "rcparse.y" +case 134: +#line 1028 "rcparse.y" { yyval.is = yyvsp[-2].is | yyvsp[0].is; } break; -case 134: -#line 1002 "rcparse.y" +case 135: +#line 1032 "rcparse.y" { yyval.is = yyvsp[-1].is | yyvsp[0].is; } break; -case 135: -#line 1009 "rcparse.y" +case 136: +#line 1039 "rcparse.y" { yyval.is = MENUITEM_CHECKED; } break; -case 136: -#line 1013 "rcparse.y" +case 137: +#line 1043 "rcparse.y" { yyval.is = MENUITEM_GRAYED; } break; -case 137: -#line 1017 "rcparse.y" +case 138: +#line 1047 "rcparse.y" { yyval.is = MENUITEM_HELP; } break; -case 138: -#line 1021 "rcparse.y" +case 139: +#line 1051 "rcparse.y" { yyval.is = MENUITEM_INACTIVE; } break; -case 139: -#line 1025 "rcparse.y" +case 140: +#line 1055 "rcparse.y" { yyval.is = MENUITEM_MENUBARBREAK; } break; -case 140: -#line 1029 "rcparse.y" +case 141: +#line 1059 "rcparse.y" { yyval.is = MENUITEM_MENUBREAK; } break; -case 141: -#line 1038 "rcparse.y" +case 142: +#line 1068 "rcparse.y" { define_menu (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].menuitem); if (yychar != YYEMPTY) @@ -2477,14 +2532,14 @@ case 141: rcparse_discard_strings (); } break; -case 142: -#line 1048 "rcparse.y" +case 143: +#line 1078 "rcparse.y" { yyval.menuitem = NULL; } break; -case 143: -#line 1052 "rcparse.y" +case 144: +#line 1082 "rcparse.y" { if (yyvsp[-1].menuitem == NULL) yyval.menuitem = yyvsp[0].menuitem; @@ -2499,56 +2554,56 @@ case 143: } } break; -case 144: -#line 1069 "rcparse.y" +case 145: +#line 1099 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[0].s, 0, 0, 0, 0, NULL); } break; -case 145: -#line 1073 "rcparse.y" +case 146: +#line 1103 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-1].s, yyvsp[0].il, 0, 0, 0, NULL); } break; -case 146: -#line 1077 "rcparse.y" +case 147: +#line 1107 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-3].s, yyvsp[-2].il, yyvsp[-1].il, yyvsp[0].il, 0, NULL); } break; -case 147: -#line 1081 "rcparse.y" +case 148: +#line 1111 "rcparse.y" { yyval.menuitem = define_menuitem (NULL, 0, 0, 0, 0, NULL); } break; -case 148: -#line 1085 "rcparse.y" +case 149: +#line 1115 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-3].s, 0, 0, 0, 0, yyvsp[-1].menuitem); } break; -case 149: -#line 1089 "rcparse.y" +case 150: +#line 1119 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-4].s, yyvsp[-3].il, 0, 0, 0, yyvsp[-1].menuitem); } break; -case 150: -#line 1093 "rcparse.y" +case 151: +#line 1123 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-5].s, yyvsp[-4].il, yyvsp[-3].il, 0, 0, yyvsp[-1].menuitem); } break; -case 151: -#line 1098 "rcparse.y" +case 152: +#line 1128 "rcparse.y" { yyval.menuitem = define_menuitem (yyvsp[-7].s, yyvsp[-6].il, yyvsp[-5].il, yyvsp[-4].il, yyvsp[-3].il, yyvsp[-1].menuitem); } break; -case 152: -#line 1107 "rcparse.y" +case 153: +#line 1137 "rcparse.y" { define_messagetable (yyvsp[-3].id, &yyvsp[-1].res_info, yyvsp[0].s); if (yychar != YYEMPTY) @@ -2556,8 +2611,8 @@ case 152: rcparse_discard_strings (); } break; -case 153: -#line 1119 "rcparse.y" +case 154: +#line 1149 "rcparse.y" { define_rcdata (yyvsp[-5].id, &yyvsp[-3].res_info, yyvsp[-1].rcdata.first); if (yychar != YYEMPTY) @@ -2565,34 +2620,34 @@ case 153: rcparse_discard_strings (); } break; -case 154: -#line 1131 "rcparse.y" +case 155: +#line 1161 "rcparse.y" { rcparse_rcdata (); } break; -case 155: -#line 1135 "rcparse.y" +case 156: +#line 1165 "rcparse.y" { rcparse_normal (); yyval.rcdata = yyvsp[0].rcdata; } break; -case 156: -#line 1143 "rcparse.y" +case 157: +#line 1173 "rcparse.y" { yyval.rcdata.first = NULL; yyval.rcdata.last = NULL; } break; -case 157: -#line 1148 "rcparse.y" +case 158: +#line 1178 "rcparse.y" { yyval.rcdata = yyvsp[0].rcdata; } break; -case 158: -#line 1155 "rcparse.y" +case 159: +#line 1185 "rcparse.y" { struct rcdata_item *ri; @@ -2601,8 +2656,8 @@ case 158: yyval.rcdata.last = ri; } break; -case 159: -#line 1163 "rcparse.y" +case 160: +#line 1193 "rcparse.y" { struct rcdata_item *ri; @@ -2611,8 +2666,8 @@ case 159: yyval.rcdata.last = ri; } break; -case 160: -#line 1171 "rcparse.y" +case 161: +#line 1201 "rcparse.y" { struct rcdata_item *ri; @@ -2622,8 +2677,8 @@ case 160: yyval.rcdata.last = ri; } break; -case 161: -#line 1180 "rcparse.y" +case 162: +#line 1210 "rcparse.y" { struct rcdata_item *ri; @@ -2633,12 +2688,12 @@ case 161: yyval.rcdata.last = ri; } break; -case 162: -#line 1194 "rcparse.y" +case 163: +#line 1224 "rcparse.y" { sub_res_info = yyvsp[-1].res_info; } break; -case 165: -#line 1201 "rcparse.y" +case 166: +#line 1231 "rcparse.y" { define_stringtable (&sub_res_info, yyvsp[-1].il, yyvsp[0].s); if (yychar != YYEMPTY) @@ -2646,8 +2701,8 @@ case 165: rcparse_discard_strings (); } break; -case 166: -#line 1208 "rcparse.y" +case 167: +#line 1238 "rcparse.y" { define_stringtable (&sub_res_info, yyvsp[-2].il, yyvsp[0].s); if (yychar != YYEMPTY) @@ -2655,8 +2710,8 @@ case 166: rcparse_discard_strings (); } break; -case 167: -#line 1221 "rcparse.y" +case 168: +#line 1251 "rcparse.y" { define_user_data (yyvsp[-5].id, yyvsp[-4].id, &yyvsp[-3].res_info, yyvsp[-1].rcdata.first); if (yychar != YYEMPTY) @@ -2664,8 +2719,8 @@ case 167: rcparse_discard_strings (); } break; -case 168: -#line 1228 "rcparse.y" +case 169: +#line 1258 "rcparse.y" { define_user_file (yyvsp[-3].id, yyvsp[-2].id, &yyvsp[-1].res_info, yyvsp[0].s); if (yychar != YYEMPTY) @@ -2673,8 +2728,8 @@ case 168: rcparse_discard_strings (); } break; -case 169: -#line 1240 "rcparse.y" +case 170: +#line 1270 "rcparse.y" { define_versioninfo (yyvsp[-5].id, language, yyvsp[-3].fixver, yyvsp[-1].verinfo); if (yychar != YYEMPTY) @@ -2682,116 +2737,116 @@ case 169: rcparse_discard_strings (); } break; -case 170: -#line 1250 "rcparse.y" +case 171: +#line 1280 "rcparse.y" { yyval.fixver = ((struct fixed_versioninfo *) res_alloc (sizeof (struct fixed_versioninfo))); memset (yyval.fixver, 0, sizeof (struct fixed_versioninfo)); } break; -case 171: -#line 1256 "rcparse.y" +case 172: +#line 1286 "rcparse.y" { yyvsp[-5].fixver->file_version_ms = (yyvsp[-3].il << 16) | yyvsp[-2].il; yyvsp[-5].fixver->file_version_ls = (yyvsp[-1].il << 16) | yyvsp[0].il; yyval.fixver = yyvsp[-5].fixver; } break; -case 172: -#line 1262 "rcparse.y" +case 173: +#line 1292 "rcparse.y" { yyvsp[-5].fixver->product_version_ms = (yyvsp[-3].il << 16) | yyvsp[-2].il; yyvsp[-5].fixver->product_version_ls = (yyvsp[-1].il << 16) | yyvsp[0].il; yyval.fixver = yyvsp[-5].fixver; } break; -case 173: -#line 1268 "rcparse.y" +case 174: +#line 1298 "rcparse.y" { yyvsp[-2].fixver->file_flags_mask = yyvsp[0].il; yyval.fixver = yyvsp[-2].fixver; } break; -case 174: -#line 1273 "rcparse.y" +case 175: +#line 1303 "rcparse.y" { yyvsp[-2].fixver->file_flags = yyvsp[0].il; yyval.fixver = yyvsp[-2].fixver; } break; -case 175: -#line 1278 "rcparse.y" +case 176: +#line 1308 "rcparse.y" { yyvsp[-2].fixver->file_os = yyvsp[0].il; yyval.fixver = yyvsp[-2].fixver; } break; -case 176: -#line 1283 "rcparse.y" +case 177: +#line 1313 "rcparse.y" { yyvsp[-2].fixver->file_type = yyvsp[0].il; yyval.fixver = yyvsp[-2].fixver; } break; -case 177: -#line 1288 "rcparse.y" +case 178: +#line 1318 "rcparse.y" { yyvsp[-2].fixver->file_subtype = yyvsp[0].il; yyval.fixver = yyvsp[-2].fixver; } break; -case 178: -#line 1302 "rcparse.y" +case 179: +#line 1332 "rcparse.y" { yyval.verinfo = NULL; } break; -case 179: -#line 1306 "rcparse.y" +case 180: +#line 1336 "rcparse.y" { yyval.verinfo = append_ver_stringfileinfo (yyvsp[-7].verinfo, yyvsp[-4].s, yyvsp[-2].verstring); } break; -case 180: -#line 1310 "rcparse.y" +case 181: +#line 1340 "rcparse.y" { yyval.verinfo = append_ver_varfileinfo (yyvsp[-6].verinfo, yyvsp[-2].s, yyvsp[-1].vervar); } break; -case 181: -#line 1317 "rcparse.y" +case 182: +#line 1347 "rcparse.y" { yyval.verstring = NULL; } break; -case 182: -#line 1321 "rcparse.y" +case 183: +#line 1351 "rcparse.y" { yyval.verstring = append_verval (yyvsp[-4].verstring, yyvsp[-2].s, yyvsp[0].s); } break; -case 183: -#line 1328 "rcparse.y" +case 184: +#line 1358 "rcparse.y" { yyval.vervar = NULL; } break; -case 184: -#line 1332 "rcparse.y" +case 185: +#line 1362 "rcparse.y" { yyval.vervar = append_vertrans (yyvsp[-2].vervar, yyvsp[-1].il, yyvsp[0].il); } break; -case 185: -#line 1341 "rcparse.y" +case 186: +#line 1371 "rcparse.y" { yyval.id.named = 0; yyval.id.u.id = yyvsp[0].il; } break; -case 186: -#line 1346 "rcparse.y" +case 187: +#line 1376 "rcparse.y" { char *copy, *s; @@ -2803,33 +2858,33 @@ case 186: free (copy); } break; -case 187: -#line 1362 "rcparse.y" +case 188: +#line 1392 "rcparse.y" { yyval.s = yyvsp[0].s; } break; -case 188: -#line 1366 "rcparse.y" +case 189: +#line 1396 "rcparse.y" { yyval.s = yyvsp[-1].s; } break; -case 189: -#line 1370 "rcparse.y" +case 190: +#line 1400 "rcparse.y" { yyval.s = yyvsp[-1].s; } break; -case 190: -#line 1378 "rcparse.y" +case 191: +#line 1408 "rcparse.y" { yyval.id.named = 0; yyval.id.u.id = yyvsp[-1].il; } break; -case 191: -#line 1383 "rcparse.y" +case 192: +#line 1413 "rcparse.y" { char *copy, *s; @@ -2841,8 +2896,8 @@ case 191: free (copy); } break; -case 192: -#line 1400 "rcparse.y" +case 193: +#line 1430 "rcparse.y" { memset (&yyval.res_info, 0, sizeof (struct res_res_info)); yyval.res_info.language = language; @@ -2850,352 +2905,352 @@ case 192: yyval.res_info.memflags = MEMFLAG_MOVEABLE | MEMFLAG_PURE | MEMFLAG_DISCARDABLE; } break; -case 193: -#line 1407 "rcparse.y" +case 194: +#line 1437 "rcparse.y" { yyval.res_info = yyvsp[-1].res_info; yyval.res_info.memflags |= yyvsp[0].memflags.on; yyval.res_info.memflags &=~ yyvsp[0].memflags.off; } break; -case 194: -#line 1413 "rcparse.y" +case 195: +#line 1443 "rcparse.y" { yyval.res_info = yyvsp[-2].res_info; yyval.res_info.characteristics = yyvsp[0].il; } break; -case 195: -#line 1418 "rcparse.y" +case 196: +#line 1448 "rcparse.y" { yyval.res_info = yyvsp[-3].res_info; yyval.res_info.language = yyvsp[-1].il | (yyvsp[0].il << SUBLANG_SHIFT); } break; -case 196: -#line 1423 "rcparse.y" +case 197: +#line 1453 "rcparse.y" { yyval.res_info = yyvsp[-2].res_info; yyval.res_info.version = yyvsp[0].il; } break; -case 197: -#line 1433 "rcparse.y" +case 198: +#line 1463 "rcparse.y" { memset (&yyval.res_info, 0, sizeof (struct res_res_info)); yyval.res_info.language = language; yyval.res_info.memflags = MEMFLAG_MOVEABLE | MEMFLAG_DISCARDABLE; } break; -case 198: -#line 1439 "rcparse.y" +case 199: +#line 1469 "rcparse.y" { yyval.res_info = yyvsp[-1].res_info; yyval.res_info.memflags |= yyvsp[0].memflags.on; yyval.res_info.memflags &=~ yyvsp[0].memflags.off; } break; -case 199: -#line 1450 "rcparse.y" +case 200: +#line 1480 "rcparse.y" { memset (&yyval.res_info, 0, sizeof (struct res_res_info)); yyval.res_info.language = language; yyval.res_info.memflags = MEMFLAG_MOVEABLE | MEMFLAG_PURE | MEMFLAG_DISCARDABLE; } break; -case 200: -#line 1456 "rcparse.y" +case 201: +#line 1486 "rcparse.y" { yyval.res_info = yyvsp[-1].res_info; yyval.res_info.memflags |= yyvsp[0].memflags.on; yyval.res_info.memflags &=~ yyvsp[0].memflags.off; } break; -case 201: -#line 1468 "rcparse.y" +case 202: +#line 1498 "rcparse.y" { yyval.memflags.on = MEMFLAG_MOVEABLE; yyval.memflags.off = 0; } break; -case 202: -#line 1473 "rcparse.y" +case 203: +#line 1503 "rcparse.y" { yyval.memflags.on = 0; yyval.memflags.off = MEMFLAG_MOVEABLE; } break; -case 203: -#line 1478 "rcparse.y" +case 204: +#line 1508 "rcparse.y" { yyval.memflags.on = MEMFLAG_PURE; yyval.memflags.off = 0; } break; -case 204: -#line 1483 "rcparse.y" +case 205: +#line 1513 "rcparse.y" { yyval.memflags.on = 0; yyval.memflags.off = MEMFLAG_PURE; } break; -case 205: -#line 1488 "rcparse.y" +case 206: +#line 1518 "rcparse.y" { yyval.memflags.on = MEMFLAG_PRELOAD; yyval.memflags.off = 0; } break; -case 206: -#line 1493 "rcparse.y" +case 207: +#line 1523 "rcparse.y" { yyval.memflags.on = 0; yyval.memflags.off = MEMFLAG_PRELOAD; } break; -case 207: -#line 1498 "rcparse.y" +case 208: +#line 1528 "rcparse.y" { yyval.memflags.on = MEMFLAG_DISCARDABLE; yyval.memflags.off = 0; } break; -case 208: -#line 1508 "rcparse.y" +case 209: +#line 1538 "rcparse.y" { yyval.s = yyvsp[0].s; } break; -case 209: -#line 1512 "rcparse.y" +case 210: +#line 1542 "rcparse.y" { yyval.s = yyvsp[0].s; } break; -case 210: -#line 1529 "rcparse.y" +case 211: +#line 1559 "rcparse.y" { style |= yyvsp[0].il; } break; -case 211: -#line 1533 "rcparse.y" +case 212: +#line 1563 "rcparse.y" { style &=~ yyvsp[0].il; } break; -case 212: -#line 1537 "rcparse.y" +case 213: +#line 1567 "rcparse.y" { style |= yyvsp[0].il; } break; -case 213: -#line 1541 "rcparse.y" +case 214: +#line 1571 "rcparse.y" { style &=~ yyvsp[0].il; } break; -case 214: -#line 1548 "rcparse.y" +case 215: +#line 1578 "rcparse.y" { yyval.il = yyvsp[0].i.val; } break; -case 215: -#line 1552 "rcparse.y" +case 216: +#line 1582 "rcparse.y" { yyval.il = yyvsp[-1].il; } break; -case 216: -#line 1561 "rcparse.y" +case 217: +#line 1591 "rcparse.y" { yyval.il = 0; } break; -case 217: -#line 1565 "rcparse.y" +case 218: +#line 1595 "rcparse.y" { yyval.il = yyvsp[0].il; } break; -case 218: -#line 1574 "rcparse.y" +case 219: +#line 1604 "rcparse.y" { yyval.il = yyvsp[0].il; } break; -case 219: -#line 1583 "rcparse.y" +case 220: +#line 1613 "rcparse.y" { yyval.il = yyvsp[0].i.val; } break; -case 220: -#line 1592 "rcparse.y" +case 221: +#line 1622 "rcparse.y" { yyval.i = yyvsp[0].i; } break; -case 221: -#line 1596 "rcparse.y" +case 222: +#line 1626 "rcparse.y" { yyval.i = yyvsp[-1].i; } break; -case 222: -#line 1600 "rcparse.y" +case 223: +#line 1630 "rcparse.y" { yyval.i.val = ~ yyvsp[0].i.val; yyval.i.dword = yyvsp[0].i.dword; } break; -case 223: -#line 1605 "rcparse.y" +case 224: +#line 1635 "rcparse.y" { yyval.i.val = - yyvsp[0].i.val; yyval.i.dword = yyvsp[0].i.dword; } break; -case 224: -#line 1610 "rcparse.y" +case 225: +#line 1640 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val * yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 225: -#line 1615 "rcparse.y" +case 226: +#line 1645 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val / yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 226: -#line 1620 "rcparse.y" +case 227: +#line 1650 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val % yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 227: -#line 1625 "rcparse.y" +case 228: +#line 1655 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val + yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 228: -#line 1630 "rcparse.y" +case 229: +#line 1660 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val - yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 229: -#line 1635 "rcparse.y" +case 230: +#line 1665 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val & yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 230: -#line 1640 "rcparse.y" +case 231: +#line 1670 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val ^ yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 231: -#line 1645 "rcparse.y" +case 232: +#line 1675 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val | yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 232: -#line 1656 "rcparse.y" +case 233: +#line 1686 "rcparse.y" { yyval.il = yyvsp[0].il; } break; -case 233: -#line 1665 "rcparse.y" +case 234: +#line 1695 "rcparse.y" { yyval.il = yyvsp[0].i.val; } break; -case 234: -#line 1676 "rcparse.y" +case 235: +#line 1706 "rcparse.y" { yyval.i = yyvsp[0].i; } break; -case 235: -#line 1680 "rcparse.y" +case 236: +#line 1710 "rcparse.y" { yyval.i = yyvsp[-1].i; } break; -case 236: -#line 1684 "rcparse.y" +case 237: +#line 1714 "rcparse.y" { yyval.i.val = ~ yyvsp[0].i.val; yyval.i.dword = yyvsp[0].i.dword; } break; -case 237: -#line 1689 "rcparse.y" +case 238: +#line 1719 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val * yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 238: -#line 1694 "rcparse.y" +case 239: +#line 1724 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val / yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 239: -#line 1699 "rcparse.y" +case 240: +#line 1729 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val % yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 240: -#line 1704 "rcparse.y" +case 241: +#line 1734 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val + yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 241: -#line 1709 "rcparse.y" +case 242: +#line 1739 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val - yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 242: -#line 1714 "rcparse.y" +case 243: +#line 1744 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val & yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 243: -#line 1719 "rcparse.y" +case 244: +#line 1749 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val ^ yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; } break; -case 244: -#line 1724 "rcparse.y" +case 245: +#line 1754 "rcparse.y" { yyval.i.val = yyvsp[-2].i.val | yyvsp[0].i.val; yyval.i.dword = yyvsp[-2].i.dword || yyvsp[0].i.dword; @@ -3203,7 +3258,7 @@ case 244: break; } -#line 705 "/usr/share/bison/bison.simple" +#line 705 "/usr/share/bison-1.35/bison.simple" yyvsp -= yylen; @@ -3434,14 +3489,13 @@ yyreturn: #endif return yyresult; } -#line 1730 "rcparse.y" +#line 1760 "rcparse.y" /* Set the language from the command line. */ void -rcparse_set_language (lang) - int lang; +rcparse_set_language (int lang) { language = lang; } |