diff options
| author | Jason Merrill <jason@casey.cygnus.com> | 2000-02-18 22:42:07 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2000-02-18 17:42:07 -0500 |
| commit | 1f51a99218e6eb4214e6a40e9937a7cc419f1e95 (patch) | |
| tree | 684bc3c3537e59eeb5cfab653c80b41fd9a188bf /gcc/cp/parse.c | |
| parent | 6d1e16d74e7d55c8a0d38076850356f9e83951ab (diff) | |
| download | gcc-1f51a99218e6eb4214e6a40e9937a7cc419f1e95.zip gcc-1f51a99218e6eb4214e6a40e9937a7cc419f1e95.tar.gz gcc-1f51a99218e6eb4214e6a40e9937a7cc419f1e95.tar.bz2 | |
semantics.c (deferred_type_access_control): Walk the entire type_lookups list.
* semantics.c (deferred_type_access_control): Walk the entire
type_lookups list.
(save_type_access_control): Rename from
initial_deferred_type_access_control. Just remember the value.
(decl_type_access_control): New fn.
(begin_function_definition): Use deferred_type_access_control, after
we've started the function. Set type_lookups to error_mark_node.
* parse.y (frob_specs, fn.def1): Adjust.
(parse_decl0, parse_field, parse_field0, parse_bitfield): New fns.
(parse_end_decl, parse_bitfield0, parse_method): New fns.
(fn.def2, initdcl, initdcl0_innards, nomods_initdcl0): Use them.
(after_type_component_declarator0): Likewise.
(after_type_component_declarator): Likewise.
(notype_component_declarator): Likewise.
* cp-tree.h: Adjust.
* decl.c (redeclaration_error_message): Allow redeclaration of
namespace-scope decls.
From-SVN: r32059
Diffstat (limited to 'gcc/cp/parse.c')
| -rw-r--r-- | gcc/cp/parse.c | 1899 |
1 files changed, 965 insertions, 934 deletions
diff --git a/gcc/cp/parse.c b/gcc/cp/parse.c index eebd16b..66e2a91 100644 --- a/gcc/cp/parse.c +++ b/gcc/cp/parse.c @@ -127,39 +127,10 @@ extern int end_of_file; error message if the user supplies an empty conditional expression. */ static const char *cond_stmt_keyword; -static tree empty_parms PARAMS ((void)); -static void parse_decl PARAMS ((tree, tree, tree, tree, int, tree *)); - /* Nonzero if we have an `extern "C"' acting as an extern specifier. */ int have_extern_spec; int used_extern_spec; -/* Cons up an empty parameter list. */ -static inline tree -empty_parms () -{ - tree parms; - - if (strict_prototype - || current_class_type != NULL) - parms = void_list_node; - else - parms = NULL_TREE; - return parms; -} - - -#line 90 "parse.y" -typedef union { - long itype; - tree ttype; - char *strtype; - enum tree_code code; - flagged_type_tree ftype; - struct pending_inline *pi; -} YYSTYPE; -#line 293 "parse.y" - /* List of types and structure classes of the current declaration. */ static tree current_declspecs; @@ -177,35 +148,43 @@ static tree current_aggr; /* When defining an enumeration, this is the type of the enumeration. */ static tree current_enum_type; -/* Tell yyparse how to print a token's value, if yydebug is set. */ +static tree empty_parms PARAMS ((void)); +static tree parse_decl0 PARAMS ((tree, tree, tree, tree, int)); +static tree parse_decl PARAMS ((tree, tree, int)); +static void parse_end_decl PARAMS ((tree, tree, tree)); +static tree parse_field0 PARAMS ((tree, tree, tree, tree, tree, tree)); +static tree parse_field PARAMS ((tree, tree, tree, tree)); +static tree parse_bitfield0 PARAMS ((tree, tree, tree, tree, tree)); +static tree parse_bitfield PARAMS ((tree, tree, tree)); +static tree parse_method PARAMS ((tree, tree, tree)); +static void frob_specs PARAMS ((tree, tree)); -#define YYPRINT(FILE,YYCHAR,YYLVAL) yyprint(FILE,YYCHAR,YYLVAL) -extern void yyprint PARAMS ((FILE *, int, YYSTYPE)); -extern tree combine_strings PARAMS ((tree)); +/* Cons up an empty parameter list. */ +static inline tree +empty_parms () +{ + tree parms; + + if (strict_prototype + || current_class_type != NULL) + parms = void_list_node; + else + parms = NULL_TREE; + return parms; +} + +/* Record the decl-specifiers, attributes and type lookups from the + decl-specifier-seq in a declaration. */ static void frob_specs (specs_attrs, lookups) - tree specs_attrs; - tree lookups; + tree specs_attrs, lookups; { - initial_deferred_type_access_control (lookups); + save_type_access_control (lookups); split_specs_attrs (specs_attrs, ¤t_declspecs, &prefix_attributes); if (current_declspecs && TREE_CODE (current_declspecs) != TREE_LIST) current_declspecs = build_decl_list (NULL_TREE, current_declspecs); -} - -static void -parse_decl (declarator, specs_attrs, lookups, attributes, initialized, decl) - tree declarator; - tree specs_attrs; - tree lookups; - tree attributes; - int initialized; - tree* decl; -{ - frob_specs (specs_attrs, lookups); - if (have_extern_spec && !used_extern_spec) { current_declspecs = decl_tree_cons (NULL_TREE, @@ -213,8 +192,79 @@ parse_decl (declarator, specs_attrs, lookups, attributes, initialized, decl) current_declspecs); used_extern_spec = 1; } - *decl = start_decl (declarator, current_declspecs, initialized, - attributes, prefix_attributes); +} + +static tree +parse_decl (declarator, attributes, initialized) + tree declarator, attributes; + int initialized; +{ + return start_decl (declarator, current_declspecs, initialized, + attributes, prefix_attributes); +} + +static tree +parse_decl0 (declarator, specs_attrs, lookups, attributes, initialized) + tree declarator, specs_attrs, lookups, attributes; + int initialized; +{ + frob_specs (specs_attrs, lookups); + return parse_decl (declarator, attributes, initialized); +} + +static void +parse_end_decl (decl, init, asmspec) + tree decl, init, asmspec; +{ + decl_type_access_control (decl); + cp_finish_decl (decl, init, asmspec, init ? LOOKUP_ONLYCONVERTING : 0); +} + +static tree +parse_field (declarator, attributes, asmspec, init) + tree declarator, attributes, asmspec, init; +{ + tree d = grokfield (declarator, current_declspecs, init, asmspec, + build_tree_list (attributes, prefix_attributes)); + decl_type_access_control (d); + return d; +} + +static tree +parse_field0 (declarator, specs_attrs, lookups, attributes, asmspec, init) + tree declarator, specs_attrs, lookups, attributes, asmspec, init; +{ + frob_specs (specs_attrs, lookups); + return parse_field (declarator, attributes, asmspec, init); +} + +static tree +parse_bitfield (declarator, attributes, width) + tree declarator, attributes, width; +{ + tree d = grokbitfield (declarator, current_declspecs, width); + cplus_decl_attributes (d, attributes, prefix_attributes); + decl_type_access_control (d); + return d; +} + +static tree +parse_bitfield0 (declarator, specs_attrs, lookups, attributes, width) + tree declarator, specs_attrs, lookups, attributes, width; +{ + frob_specs (specs_attrs, lookups); + return parse_bitfield (declarator, attributes, width); +} + +static tree +parse_method (declarator, specs_attrs, lookups) + tree declarator, specs_attrs, lookups; +{ + tree d; + frob_specs (specs_attrs, lookups); + d = start_method (current_declspecs, declarator, prefix_attributes); + decl_type_access_control (d); + return d; } void @@ -225,6 +275,21 @@ cp_parse_init () ggc_add_tree_root (¤t_aggr, 1); ggc_add_tree_root (¤t_enum_type, 1); } + +#line 217 "parse.y" +typedef union { + long itype; + tree ttype; + char *strtype; + enum tree_code code; + flagged_type_tree ftype; + struct pending_inline *pi; +} YYSTYPE; +#line 420 "parse.y" + +/* Tell yyparse how to print a token's value, if yydebug is set. */ +#define YYPRINT(FILE,YYCHAR,YYLVAL) yyprint(FILE,YYCHAR,YYLVAL) +extern void yyprint PARAMS ((FILE *, int, YYSTYPE)); #include <stdio.h> #ifndef __cplusplus @@ -664,94 +729,94 @@ static const short yyrhs[] = { -1, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 362, 364, 372, 375, 376, 380, 382, 385, 390, 394, - 400, 404, 408, 412, 415, 417, 419, 422, 424, 427, - 430, 432, 434, 436, 438, 439, 441, 442, 446, 449, - 458, 461, 463, 467, 470, 472, 476, 479, 491, 498, - 506, 508, 509, 511, 515, 518, 524, 527, 529, 534, - 537, 541, 544, 547, 550, 554, 559, 569, 571, 573, - 575, 577, 590, 593, 597, 600, 602, 604, 607, 610, - 614, 616, 618, 620, 625, 627, 629, 631, 633, 634, - 641, 642, 643, 646, 649, 653, 655, 656, 659, 661, - 664, 667, 669, 673, 676, 678, 682, 684, 686, 690, - 692, 694, 698, 700, 702, 708, 712, 715, 718, 721, - 726, 729, 731, 733, 739, 751, 754, 760, 765, 768, - 773, 778, 787, 790, 792, 796, 805, 821, 824, 826, - 827, 830, 837, 843, 845, 847, 849, 851, 854, 857, - 860, 862, 863, 864, 865, 868, 870, 871, 874, 876, - 877, 880, 885, 885, 889, 889, 892, 892, 895, 895, - 899, 899, 904, 904, 907, 907, 910, 912, 915, 922, - 926, 929, 932, 934, 938, 944, 953, 955, 963, 966, - 969, 972, 976, 979, 981, 984, 987, 989, 991, 993, - 997, 1000, 1003, 1008, 1012, 1017, 1021, 1024, 1025, 1029, - 1047, 1053, 1056, 1058, 1059, 1060, 1063, 1067, 1068, 1072, - 1076, 1079, 1081, 1085, 1088, 1091, 1095, 1098, 1100, 1102, - 1104, 1107, 1111, 1113, 1116, 1118, 1124, 1127, 1130, 1133, - 1136, 1141, 1144, 1147, 1151, 1153, 1157, 1161, 1163, 1165, - 1170, 1173, 1178, 1181, 1183, 1191, 1204, 1209, 1215, 1217, - 1219, 1232, 1235, 1237, 1239, 1241, 1243, 1245, 1247, 1249, - 1251, 1253, 1255, 1257, 1259, 1261, 1263, 1265, 1267, 1269, - 1271, 1273, 1275, 1279, 1281, 1283, 1300, 1303, 1305, 1306, - 1307, 1308, 1309, 1312, 1324, 1327, 1331, 1334, 1336, 1341, - 1343, 1344, 1347, 1349, 1357, 1359, 1361, 1363, 1367, 1370, - 1374, 1378, 1379, 1380, 1384, 1392, 1393, 1394, 1404, 1406, - 1409, 1411, 1422, 1427, 1429, 1431, 1433, 1435, 1437, 1439, - 1442, 1444, 1455, 1456, 1460, 1464, 1468, 1472, 1474, 1478, - 1480, 1482, 1490, 1492, 1494, 1496, 1500, 1502, 1504, 1506, - 1511, 1513, 1515, 1517, 1520, 1522, 1524, 1568, 1571, 1575, - 1578, 1582, 1585, 1590, 1592, 1596, 1605, 1608, 1615, 1621, - 1625, 1627, 1632, 1634, 1641, 1643, 1647, 1651, 1657, 1661, - 1664, 1668, 1671, 1681, 1684, 1688, 1692, 1695, 1698, 1701, - 1704, 1710, 1716, 1718, 1723, 1725, 1743, 1746, 1751, 1756, - 1764, 1766, 1779, 1783, 1786, 1789, 1794, 1797, 1805, 1808, - 1810, 1812, 1815, 1818, 1833, 1852, 1855, 1857, 1860, 1862, - 1866, 1868, 1872, 1874, 1878, 1881, 1885, 1894, 1895, 1910, - 1917, 1919, 1926, 1931, 1936, 1942, 1943, 1951, 1954, 1958, - 1961, 1965, 1970, 1973, 1977, 1980, 1982, 1984, 1986, 1993, - 1995, 1996, 1997, 2001, 2004, 2008, 2011, 2017, 2019, 2022, - 2025, 2028, 2034, 2037, 2040, 2042, 2044, 2048, 2055, 2061, - 2066, 2072, 2074, 2079, 2082, 2085, 2087, 2089, 2093, 2097, - 2102, 2105, 2110, 2113, 2116, 2122, 2124, 2136, 2140, 2145, - 2171, 2173, 2176, 2178, 2183, 2185, 2187, 2189, 2191, 2193, - 2197, 2205, 2208, 2210, 2214, 2221, 2227, 2233, 2239, 2249, - 2255, 2259, 2266, 2294, 2304, 2310, 2313, 2316, 2318, 2322, - 2324, 2328, 2331, 2335, 2343, 2346, 2348, 2352, 2363, 2377, - 2378, 2379, 2380, 2383, 2392, 2397, 2403, 2405, 2410, 2412, - 2414, 2416, 2418, 2420, 2423, 2433, 2440, 2465, 2471, 2474, - 2477, 2479, 2490, 2495, 2498, 2503, 2506, 2513, 2523, 2526, - 2533, 2543, 2545, 2548, 2550, 2553, 2558, 2564, 2569, 2573, - 2577, 2583, 2587, 2592, 2596, 2599, 2604, 2606, 2613, 2615, - 2618, 2621, 2626, 2630, 2635, 2645, 2648, 2652, 2656, 2665, - 2668, 2670, 2672, 2678, 2680, 2689, 2692, 2694, 2696, 2698, - 2702, 2705, 2708, 2710, 2712, 2714, 2718, 2721, 2732, 2742, - 2744, 2745, 2749, 2757, 2759, 2767, 2770, 2772, 2774, 2776, - 2780, 2783, 2786, 2788, 2790, 2792, 2796, 2799, 2802, 2804, - 2806, 2808, 2810, 2817, 2821, 2826, 2830, 2835, 2837, 2841, - 2844, 2846, 2850, 2852, 2853, 2856, 2858, 2860, 2867, 2878, - 2884, 2890, 2904, 2906, 2910, 2924, 2926, 2928, 2932, 2938, - 2951, 2954, 2959, 2972, 2978, 2980, 2981, 2982, 2990, 2995, - 3004, 3005, 3009, 3012, 3018, 3024, 3027, 3029, 3031, 3033, - 3037, 3041, 3045, 3048, 3052, 3054, 3063, 3066, 3068, 3070, - 3072, 3074, 3076, 3078, 3080, 3084, 3088, 3092, 3096, 3098, - 3100, 3102, 3104, 3106, 3108, 3110, 3112, 3120, 3122, 3123, - 3124, 3127, 3133, 3135, 3140, 3142, 3145, 3158, 3161, 3164, - 3168, 3171, 3178, 3180, 3183, 3185, 3187, 3190, 3193, 3196, - 3199, 3201, 3204, 3208, 3210, 3216, 3218, 3219, 3221, 3226, - 3228, 3230, 3232, 3234, 3237, 3238, 3240, 3243, 3244, 3247, - 3247, 3250, 3250, 3253, 3253, 3255, 3257, 3259, 3261, 3267, - 3273, 3275, 3278, 3281, 3284, 3287, 3293, 3295, 3296, 3299, - 3301, 3302, 3303, 3305, 3308, 3311, 3314, 3320, 3324, 3326, - 3329, 3331, 3334, 3338, 3340, 3343, 3345, 3348, 3365, 3373, - 3376, 3378, 3380, 3384, 3387, 3388, 3396, 3400, 3404, 3407, - 3408, 3414, 3417, 3420, 3422, 3426, 3431, 3434, 3444, 3449, - 3450, 3457, 3460, 3463, 3465, 3468, 3470, 3480, 3494, 3498, - 3501, 3503, 3507, 3511, 3514, 3517, 3519, 3523, 3525, 3532, - 3539, 3542, 3546, 3550, 3554, 3560, 3564, 3569, 3571, 3574, - 3579, 3585, 3596, 3599, 3601, 3605, 3613, 3616, 3620, 3623, - 3625, 3627, 3633, 3638, 3641, 3643, 3645, 3647, 3649, 3651, - 3653, 3655, 3657, 3659, 3661, 3663, 3665, 3667, 3669, 3671, - 3673, 3675, 3677, 3679, 3681, 3683, 3685, 3687, 3689, 3691, - 3693, 3695, 3697, 3699, 3701, 3703, 3706, 3708 + 427, 429, 437, 440, 441, 445, 447, 450, 455, 459, + 465, 469, 473, 477, 480, 482, 484, 487, 489, 492, + 495, 497, 499, 501, 503, 504, 506, 507, 511, 514, + 523, 526, 528, 532, 535, 537, 541, 544, 556, 563, + 571, 573, 574, 576, 580, 583, 589, 592, 594, 599, + 602, 606, 609, 612, 615, 619, 624, 634, 636, 638, + 640, 642, 655, 658, 662, 665, 667, 669, 672, 675, + 679, 681, 683, 685, 690, 692, 694, 696, 698, 699, + 706, 707, 708, 711, 714, 718, 720, 721, 724, 726, + 729, 732, 734, 738, 741, 743, 747, 749, 751, 755, + 757, 759, 763, 765, 767, 773, 777, 780, 783, 786, + 791, 794, 796, 798, 804, 813, 816, 818, 820, 823, + 825, 830, 839, 842, 844, 848, 857, 873, 876, 878, + 879, 882, 889, 895, 897, 899, 901, 903, 906, 909, + 912, 914, 915, 916, 917, 920, 922, 923, 926, 928, + 929, 932, 937, 937, 941, 941, 944, 944, 947, 947, + 951, 951, 956, 956, 959, 959, 962, 964, 967, 974, + 978, 981, 984, 986, 990, 996, 1005, 1007, 1015, 1018, + 1021, 1024, 1028, 1031, 1033, 1036, 1039, 1041, 1043, 1045, + 1049, 1052, 1055, 1060, 1064, 1069, 1073, 1076, 1077, 1081, + 1098, 1104, 1107, 1109, 1110, 1111, 1114, 1118, 1119, 1123, + 1127, 1130, 1132, 1136, 1139, 1142, 1146, 1149, 1151, 1153, + 1155, 1158, 1162, 1164, 1167, 1169, 1175, 1178, 1181, 1184, + 1187, 1192, 1195, 1198, 1202, 1204, 1208, 1212, 1214, 1216, + 1221, 1224, 1229, 1232, 1234, 1242, 1255, 1260, 1266, 1268, + 1270, 1283, 1286, 1288, 1290, 1292, 1294, 1296, 1298, 1300, + 1302, 1304, 1306, 1308, 1310, 1312, 1314, 1316, 1318, 1320, + 1322, 1324, 1326, 1330, 1332, 1334, 1351, 1354, 1356, 1357, + 1358, 1359, 1360, 1363, 1375, 1378, 1382, 1385, 1387, 1392, + 1394, 1395, 1398, 1400, 1408, 1410, 1412, 1414, 1418, 1421, + 1425, 1429, 1430, 1431, 1435, 1443, 1444, 1445, 1455, 1457, + 1460, 1462, 1473, 1478, 1480, 1482, 1484, 1486, 1488, 1490, + 1493, 1495, 1506, 1507, 1511, 1515, 1519, 1523, 1525, 1529, + 1531, 1533, 1541, 1543, 1545, 1547, 1551, 1553, 1555, 1557, + 1562, 1564, 1566, 1568, 1571, 1573, 1575, 1619, 1622, 1626, + 1629, 1633, 1636, 1641, 1643, 1647, 1656, 1659, 1666, 1672, + 1676, 1678, 1683, 1685, 1692, 1694, 1698, 1702, 1708, 1712, + 1715, 1719, 1722, 1732, 1735, 1739, 1743, 1746, 1749, 1752, + 1755, 1761, 1767, 1769, 1774, 1776, 1794, 1797, 1802, 1807, + 1815, 1817, 1830, 1834, 1837, 1840, 1845, 1848, 1856, 1859, + 1861, 1863, 1866, 1869, 1884, 1903, 1906, 1908, 1911, 1913, + 1917, 1919, 1923, 1925, 1929, 1932, 1936, 1941, 1942, 1955, + 1962, 1963, 1969, 1974, 1979, 1985, 1986, 1993, 1996, 2000, + 2003, 2007, 2012, 2015, 2019, 2022, 2024, 2026, 2028, 2035, + 2037, 2038, 2039, 2043, 2046, 2050, 2053, 2059, 2061, 2064, + 2067, 2070, 2076, 2079, 2082, 2084, 2086, 2090, 2097, 2103, + 2108, 2114, 2116, 2121, 2124, 2127, 2129, 2131, 2135, 2139, + 2144, 2147, 2152, 2155, 2158, 2164, 2166, 2178, 2182, 2187, + 2213, 2215, 2218, 2220, 2225, 2227, 2229, 2231, 2233, 2235, + 2239, 2247, 2250, 2252, 2256, 2263, 2269, 2275, 2281, 2291, + 2297, 2301, 2308, 2336, 2346, 2352, 2355, 2358, 2360, 2364, + 2366, 2370, 2373, 2377, 2385, 2388, 2390, 2394, 2405, 2419, + 2420, 2421, 2422, 2425, 2434, 2439, 2445, 2447, 2452, 2454, + 2456, 2458, 2460, 2462, 2465, 2475, 2482, 2507, 2513, 2516, + 2519, 2521, 2532, 2537, 2540, 2545, 2548, 2555, 2565, 2568, + 2575, 2585, 2587, 2590, 2592, 2595, 2599, 2604, 2608, 2611, + 2614, 2619, 2622, 2626, 2629, 2631, 2635, 2637, 2644, 2646, + 2649, 2652, 2657, 2661, 2666, 2676, 2679, 2683, 2687, 2696, + 2699, 2701, 2703, 2709, 2711, 2720, 2723, 2725, 2727, 2729, + 2733, 2736, 2739, 2741, 2743, 2745, 2749, 2752, 2763, 2773, + 2775, 2776, 2780, 2788, 2790, 2798, 2801, 2803, 2805, 2807, + 2811, 2814, 2817, 2819, 2821, 2823, 2827, 2830, 2833, 2835, + 2837, 2839, 2841, 2848, 2852, 2857, 2861, 2866, 2868, 2872, + 2875, 2877, 2881, 2883, 2884, 2887, 2889, 2891, 2898, 2909, + 2915, 2921, 2935, 2937, 2941, 2955, 2957, 2959, 2963, 2969, + 2982, 2985, 2990, 3003, 3009, 3011, 3012, 3013, 3021, 3026, + 3035, 3036, 3040, 3043, 3049, 3055, 3058, 3060, 3062, 3064, + 3068, 3072, 3076, 3079, 3083, 3085, 3094, 3097, 3099, 3101, + 3103, 3105, 3107, 3109, 3111, 3115, 3119, 3123, 3127, 3129, + 3131, 3133, 3135, 3137, 3139, 3141, 3143, 3151, 3153, 3154, + 3155, 3158, 3164, 3166, 3171, 3173, 3176, 3189, 3192, 3195, + 3199, 3202, 3209, 3211, 3214, 3216, 3218, 3221, 3224, 3227, + 3230, 3232, 3235, 3239, 3241, 3247, 3249, 3250, 3252, 3257, + 3259, 3261, 3263, 3265, 3268, 3269, 3271, 3274, 3275, 3278, + 3278, 3281, 3281, 3284, 3284, 3286, 3288, 3290, 3292, 3298, + 3304, 3306, 3309, 3312, 3315, 3318, 3324, 3326, 3327, 3330, + 3332, 3333, 3334, 3336, 3339, 3342, 3345, 3351, 3355, 3357, + 3360, 3362, 3365, 3369, 3371, 3374, 3376, 3379, 3396, 3404, + 3407, 3409, 3411, 3415, 3418, 3419, 3427, 3431, 3435, 3438, + 3439, 3445, 3448, 3451, 3453, 3457, 3462, 3465, 3475, 3480, + 3481, 3488, 3491, 3494, 3496, 3499, 3501, 3511, 3525, 3529, + 3532, 3534, 3538, 3542, 3545, 3548, 3550, 3554, 3556, 3563, + 3570, 3573, 3577, 3581, 3585, 3591, 3595, 3600, 3602, 3605, + 3610, 3616, 3627, 3630, 3632, 3636, 3644, 3647, 3651, 3654, + 3656, 3658, 3664, 3669, 3672, 3674, 3676, 3678, 3680, 3682, + 3684, 3686, 3688, 3690, 3692, 3694, 3696, 3698, 3700, 3702, + 3704, 3706, 3708, 3710, 3712, 3714, 3716, 3718, 3720, 3722, + 3724, 3726, 3728, 3730, 3732, 3734, 3737, 3739 }; #endif @@ -4505,107 +4570,107 @@ yyreduce: switch (yyn) { case 2: -#line 365 "parse.y" +#line 430 "parse.y" { finish_translation_unit (); ; break;} case 3: -#line 373 "parse.y" +#line 438 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 4: -#line 375 "parse.y" +#line 440 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 5: -#line 377 "parse.y" +#line 442 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 8: -#line 386 "parse.y" +#line 451 "parse.y" { have_extern_spec = 1; used_extern_spec = 0; yyval.ttype = NULL_TREE; ; break;} case 9: -#line 391 "parse.y" +#line 456 "parse.y" { have_extern_spec = 0; ; break;} case 10: -#line 396 "parse.y" +#line 461 "parse.y" { yyval.itype = pedantic; pedantic = 0; ; break;} case 12: -#line 405 "parse.y" +#line 470 "parse.y" { if (pending_lang_change) do_pending_lang_change(); type_lookups = NULL_TREE; ; break;} case 13: -#line 408 "parse.y" +#line 473 "parse.y" { if (! toplevel_bindings_p ()) pop_everything (); ; break;} case 14: -#line 414 "parse.y" +#line 479 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 15: -#line 416 "parse.y" +#line 481 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 16: -#line 418 "parse.y" +#line 483 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 17: -#line 420 "parse.y" +#line 485 "parse.y" { if (TREE_CHAIN (yyvsp[-2].ttype)) yyvsp[-2].ttype = combine_strings (yyvsp[-2].ttype); assemble_asm (yyvsp[-2].ttype); ; break;} case 18: -#line 423 "parse.y" +#line 488 "parse.y" { pop_lang_context (); ; break;} case 19: -#line 425 "parse.y" +#line 490 "parse.y" { if (pending_inlines) do_pending_inlines (); pop_lang_context (); ; break;} case 20: -#line 428 "parse.y" +#line 493 "parse.y" { if (pending_inlines) do_pending_inlines (); pop_lang_context (); ; break;} case 21: -#line 431 "parse.y" +#line 496 "parse.y" { push_namespace (yyvsp[-1].ttype); ; break;} case 22: -#line 433 "parse.y" +#line 498 "parse.y" { pop_namespace (); ; break;} case 23: -#line 435 "parse.y" +#line 500 "parse.y" { push_namespace (NULL_TREE); ; break;} case 24: -#line 437 "parse.y" +#line 502 "parse.y" { pop_namespace (); ; break;} case 26: -#line 440 "parse.y" +#line 505 "parse.y" { do_toplevel_using_decl (yyvsp[-1].ttype); ; break;} case 28: -#line 443 "parse.y" +#line 508 "parse.y" { pedantic = yyvsp[-1].itype; ; break;} case 29: -#line 448 "parse.y" +#line 513 "parse.y" { begin_only_namespace_names (); ; break;} case 30: -#line 450 "parse.y" +#line 515 "parse.y" { end_only_namespace_names (); if (lastiddecl) @@ -4614,35 +4679,35 @@ case 30: ; break;} case 31: -#line 460 "parse.y" +#line 525 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 32: -#line 462 "parse.y" +#line 527 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 33: -#line 464 "parse.y" +#line 529 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 34: -#line 469 "parse.y" +#line 534 "parse.y" { yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 35: -#line 471 "parse.y" +#line 536 "parse.y" { yyval.ttype = build_parse_node (SCOPE_REF, global_namespace, yyvsp[0].ttype); ; break;} case 36: -#line 473 "parse.y" +#line 538 "parse.y" { yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 37: -#line 478 "parse.y" +#line 543 "parse.y" { begin_only_namespace_names (); ; break;} case 38: -#line 480 "parse.y" +#line 545 "parse.y" { end_only_namespace_names (); /* If no declaration was found, the using-directive is @@ -4654,7 +4719,7 @@ case 38: ; break;} case 39: -#line 493 "parse.y" +#line 558 "parse.y" { if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -4662,7 +4727,7 @@ case 39: ; break;} case 40: -#line 499 "parse.y" +#line 564 "parse.y" { yyval.ttype = yyvsp[-1].ttype; if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE) @@ -4671,86 +4736,86 @@ case 40: ; break;} case 43: -#line 510 "parse.y" +#line 575 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 44: -#line 512 "parse.y" +#line 577 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 45: -#line 517 "parse.y" +#line 582 "parse.y" { push_lang_context (yyvsp[0].ttype); ; break;} case 46: -#line 519 "parse.y" +#line 584 "parse.y" { if (current_lang_name != yyvsp[0].ttype) cp_error ("use of linkage spec `%D' is different from previous spec `%D'", yyvsp[0].ttype, current_lang_name); pop_lang_context (); push_lang_context (yyvsp[0].ttype); ; break;} case 47: -#line 526 "parse.y" +#line 591 "parse.y" { begin_template_parm_list (); ; break;} case 48: -#line 528 "parse.y" +#line 593 "parse.y" { yyval.ttype = end_template_parm_list (yyvsp[-1].ttype); ; break;} case 49: -#line 530 "parse.y" +#line 595 "parse.y" { begin_specialization(); yyval.ttype = NULL_TREE; ; break;} case 50: -#line 536 "parse.y" +#line 601 "parse.y" { yyval.ttype = process_template_parm (NULL_TREE, yyvsp[0].ttype); ; break;} case 51: -#line 538 "parse.y" +#line 603 "parse.y" { yyval.ttype = process_template_parm (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 52: -#line 543 "parse.y" +#line 608 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 53: -#line 545 "parse.y" +#line 610 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 54: -#line 549 "parse.y" +#line 614 "parse.y" { yyval.ttype = finish_template_type_parm (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 55: -#line 551 "parse.y" +#line 616 "parse.y" { yyval.ttype = finish_template_type_parm (class_type_node, yyvsp[0].ttype); ; break;} case 56: -#line 556 "parse.y" +#line 621 "parse.y" { yyval.ttype = finish_template_template_parm (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 57: -#line 568 "parse.y" +#line 633 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ; break;} case 58: -#line 570 "parse.y" +#line 635 "parse.y" { yyval.ttype = build_tree_list (groktypename (yyvsp[0].ftype.t), yyvsp[-2].ttype); ; break;} case 59: -#line 572 "parse.y" +#line 637 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ftype.t); ; break;} case 60: -#line 574 "parse.y" +#line 639 "parse.y" { yyval.ttype = build_tree_list (yyvsp[0].ttype, yyvsp[-2].ftype.t); ; break;} case 61: -#line 576 "parse.y" +#line 641 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ; break;} case 62: -#line 578 "parse.y" +#line 643 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) != TEMPLATE_DECL && TREE_CODE (yyvsp[0].ttype) != TEMPLATE_TEMPLATE_PARM @@ -4763,66 +4828,66 @@ case 62: ; break;} case 63: -#line 592 "parse.y" +#line 657 "parse.y" { finish_template_decl (yyvsp[-1].ttype); ; break;} case 64: -#line 594 "parse.y" +#line 659 "parse.y" { finish_template_decl (yyvsp[-1].ttype); ; break;} case 65: -#line 599 "parse.y" +#line 664 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 66: -#line 601 "parse.y" +#line 666 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 67: -#line 603 "parse.y" +#line 668 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 68: -#line 605 "parse.y" +#line 670 "parse.y" { if (pending_inlines) do_pending_inlines (); pop_lang_context (); ; break;} case 69: -#line 608 "parse.y" +#line 673 "parse.y" { if (pending_inlines) do_pending_inlines (); pop_lang_context (); ; break;} case 70: -#line 611 "parse.y" +#line 676 "parse.y" { pedantic = yyvsp[-1].itype; ; break;} case 72: -#line 617 "parse.y" +#line 682 "parse.y" {; break;} case 73: -#line 619 "parse.y" +#line 684 "parse.y" { note_list_got_semicolon (yyvsp[-2].ftype.t); ; break;} case 74: -#line 621 "parse.y" +#line 686 "parse.y" { maybe_process_partial_specialization (yyvsp[-1].ftype.t); note_got_semicolon (yyvsp[-1].ftype.t); ; break;} case 76: -#line 628 "parse.y" +#line 693 "parse.y" {; break;} case 77: -#line 630 "parse.y" +#line 695 "parse.y" { note_list_got_semicolon (yyvsp[-2].ftype.t); ; break;} case 78: -#line 632 "parse.y" +#line 697 "parse.y" { pedwarn ("empty declaration"); ; break;} case 80: -#line 635 "parse.y" +#line 700 "parse.y" { tree t, attrs; split_specs_attrs (yyvsp[-1].ftype.t, &t, &attrs); @@ -4831,128 +4896,125 @@ case 80: ; break;} case 84: -#line 648 "parse.y" +#line 713 "parse.y" { yyval.itype = 0; ; break;} case 85: -#line 650 "parse.y" +#line 715 "parse.y" { yyval.itype = 1; ; break;} case 91: -#line 666 "parse.y" +#line 731 "parse.y" { expand_body (finish_function (lineno, (int)yyvsp[-1].itype)); ; break;} case 92: -#line 668 "parse.y" +#line 733 "parse.y" { expand_body (finish_function (lineno, (int)yyvsp[0].itype)); ; break;} case 93: -#line 670 "parse.y" +#line 735 "parse.y" { ; break;} case 94: -#line 675 "parse.y" +#line 740 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 95: -#line 677 "parse.y" +#line 742 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 96: -#line 679 "parse.y" +#line 744 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 97: -#line 683 "parse.y" +#line 748 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 98: -#line 685 "parse.y" +#line 750 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 99: -#line 687 "parse.y" +#line 752 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 100: -#line 691 "parse.y" +#line 756 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 101: -#line 693 "parse.y" +#line 758 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 102: -#line 695 "parse.y" +#line 760 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 103: -#line 699 "parse.y" +#line 764 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 104: -#line 701 "parse.y" +#line 766 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 105: -#line 703 "parse.y" +#line 768 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 106: -#line 710 "parse.y" -{ if (!begin_function_definition (yyvsp[-1].ftype.t, yyvsp[-1].ftype.lookups, yyvsp[0].ttype)) +#line 775 "parse.y" +{ if (!begin_function_definition (yyvsp[-1].ftype.t, yyvsp[0].ttype)) YYERROR1; ; break;} case 107: -#line 713 "parse.y" -{ if (!begin_function_definition (yyvsp[-1].ftype.t, NULL_TREE, yyvsp[0].ttype)) +#line 778 "parse.y" +{ if (!begin_function_definition (yyvsp[-1].ftype.t, yyvsp[0].ttype)) YYERROR1; ; break;} case 108: -#line 716 "parse.y" -{ if (!begin_function_definition (NULL_TREE, NULL_TREE, yyvsp[0].ttype)) +#line 781 "parse.y" +{ if (!begin_function_definition (NULL_TREE, yyvsp[0].ttype)) YYERROR1; ; break;} case 109: -#line 719 "parse.y" -{ if (!begin_function_definition (yyvsp[-1].ftype.t, NULL_TREE, yyvsp[0].ttype)) +#line 784 "parse.y" +{ if (!begin_function_definition (yyvsp[-1].ftype.t, yyvsp[0].ttype)) YYERROR1; ; break;} case 110: -#line 722 "parse.y" -{ if (!begin_function_definition (NULL_TREE, NULL_TREE, yyvsp[0].ttype)) +#line 787 "parse.y" +{ if (!begin_function_definition (NULL_TREE, yyvsp[0].ttype)) YYERROR1; ; break;} case 111: -#line 728 "parse.y" +#line 793 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-5].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 112: -#line 730 "parse.y" +#line 795 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-3].ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 113: -#line 732 "parse.y" +#line 797 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-5].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 114: -#line 734 "parse.y" +#line 799 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-3].ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 115: -#line 741 "parse.y" -{ tree specs, attrs; - split_specs_attrs (yyvsp[-1].ftype.t, &specs, &attrs); - attrs = build_tree_list (attrs, NULL_TREE); - yyval.ttype = start_method (specs, yyvsp[0].ttype, attrs); +#line 806 "parse.y" +{ yyval.ttype = parse_method (yyvsp[0].ttype, yyvsp[-1].ftype.t, yyvsp[-1].ftype.lookups); rest_of_mdef: if (! yyval.ttype) YYERROR1; @@ -4961,44 +5023,34 @@ case 115: reinit_parse_for_method (yychar, yyval.ttype); ; break;} case 116: -#line 752 "parse.y" -{ yyval.ttype = start_method (NULL_TREE, yyvsp[0].ttype, NULL_TREE); +#line 814 "parse.y" +{ yyval.ttype = parse_method (yyvsp[0].ttype, NULL_TREE, NULL_TREE); goto rest_of_mdef; ; break;} case 117: -#line 755 "parse.y" -{ tree specs, attrs; - split_specs_attrs (yyvsp[-1].ftype.t, &specs, &attrs); - attrs = build_tree_list (attrs, NULL_TREE); - initial_deferred_type_access_control (yyvsp[-1].ftype.lookups); - yyval.ttype = start_method (specs, yyvsp[0].ttype, attrs); goto rest_of_mdef; ; +#line 817 "parse.y" +{ yyval.ttype = parse_method (yyvsp[0].ttype, yyvsp[-1].ftype.t, yyvsp[-1].ftype.lookups); goto rest_of_mdef;; break;} case 118: -#line 761 "parse.y" -{ tree specs, attrs; - split_specs_attrs (yyvsp[-1].ftype.t, &specs, &attrs); - attrs = build_tree_list (attrs, NULL_TREE); - yyval.ttype = start_method (specs, yyvsp[0].ttype, attrs); goto rest_of_mdef; ; +#line 819 "parse.y" +{ yyval.ttype = parse_method (yyvsp[0].ttype, yyvsp[-1].ftype.t, yyvsp[-1].ftype.lookups); goto rest_of_mdef;; break;} case 119: -#line 766 "parse.y" -{ yyval.ttype = start_method (NULL_TREE, yyval.ttype, NULL_TREE); +#line 821 "parse.y" +{ yyval.ttype = parse_method (yyvsp[0].ttype, NULL_TREE, NULL_TREE); goto rest_of_mdef; ; break;} case 120: -#line 769 "parse.y" -{ tree specs, attrs; - split_specs_attrs (yyvsp[-1].ftype.t, &specs, &attrs); - attrs = build_tree_list (attrs, NULL_TREE); - yyval.ttype = start_method (specs, yyvsp[0].ttype, attrs); goto rest_of_mdef; ; +#line 824 "parse.y" +{ yyval.ttype = parse_method (yyvsp[0].ttype, yyvsp[-1].ftype.t, yyvsp[-1].ftype.lookups); goto rest_of_mdef;; break;} case 121: -#line 774 "parse.y" -{ yyval.ttype = start_method (NULL_TREE, yyval.ttype, NULL_TREE); +#line 826 "parse.y" +{ yyval.ttype = parse_method (yyvsp[0].ttype, NULL_TREE, NULL_TREE); goto rest_of_mdef; ; break;} case 122: -#line 780 "parse.y" +#line 832 "parse.y" { if (! current_function_parms_stored) store_parm_decls (); @@ -5006,19 +5058,19 @@ case 122: ; break;} case 123: -#line 789 "parse.y" +#line 841 "parse.y" { finish_named_return_value (yyval.ttype, yyvsp[0].ttype); ; break;} case 124: -#line 791 "parse.y" +#line 843 "parse.y" { finish_named_return_value (yyval.ttype, yyvsp[-1].ttype); ; break;} case 125: -#line 793 "parse.y" +#line 845 "parse.y" { finish_named_return_value (yyval.ttype, NULL_TREE); ; break;} case 126: -#line 798 "parse.y" +#line 850 "parse.y" { if (yyvsp[0].itype == 0) error ("no base initializers given following ':'"); @@ -5026,7 +5078,7 @@ case 126: ; break;} case 127: -#line 807 "parse.y" +#line 859 "parse.y" { if (! current_function_parms_stored) store_parm_decls (); @@ -5041,15 +5093,15 @@ case 127: ; break;} case 128: -#line 823 "parse.y" +#line 875 "parse.y" { yyval.itype = 0; ; break;} case 129: -#line 825 "parse.y" +#line 877 "parse.y" { yyval.itype = 1; ; break;} case 132: -#line 832 "parse.y" +#line 884 "parse.y" { if (current_class_name) pedwarn ("anachronistic old style base class initializer"); @@ -5057,7 +5109,7 @@ case 132: ; break;} case 133: -#line 838 "parse.y" +#line 890 "parse.y" { if (current_class_name) pedwarn ("anachronistic old style base class initializer"); @@ -5065,93 +5117,93 @@ case 133: ; break;} case 134: -#line 844 "parse.y" +#line 896 "parse.y" { expand_member_init (current_class_ref, yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 135: -#line 846 "parse.y" +#line 898 "parse.y" { expand_member_init (current_class_ref, yyvsp[-1].ttype, void_type_node); ; break;} case 136: -#line 848 "parse.y" +#line 900 "parse.y" { expand_member_init (current_class_ref, yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 137: -#line 850 "parse.y" +#line 902 "parse.y" { expand_member_init (current_class_ref, yyvsp[-1].ttype, void_type_node); ; break;} case 138: -#line 852 "parse.y" +#line 904 "parse.y" { expand_member_init (current_class_ref, TYPE_MAIN_DECL (yyvsp[-3].ttype), yyvsp[-1].ttype); ; break;} case 139: -#line 855 "parse.y" +#line 907 "parse.y" { expand_member_init (current_class_ref, TYPE_MAIN_DECL (yyvsp[-1].ttype), void_type_node); ; break;} case 152: -#line 882 "parse.y" +#line 934 "parse.y" { do_type_instantiation (yyvsp[-1].ftype.t, NULL_TREE); yyungetc (';', 1); ; break;} case 154: -#line 886 "parse.y" +#line 938 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ftype.t); do_decl_instantiation (specs, yyvsp[0].ttype, NULL_TREE); ; break;} case 156: -#line 890 "parse.y" +#line 942 "parse.y" { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ; break;} case 158: -#line 893 "parse.y" +#line 945 "parse.y" { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ; break;} case 160: -#line 896 "parse.y" +#line 948 "parse.y" { do_type_instantiation (yyvsp[-1].ftype.t, yyvsp[-4].ttype); yyungetc (';', 1); ; break;} case 162: -#line 901 "parse.y" +#line 953 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ftype.t); do_decl_instantiation (specs, yyvsp[0].ttype, yyvsp[-4].ttype); ; break;} case 164: -#line 905 "parse.y" +#line 957 "parse.y" { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, yyvsp[-3].ttype); ; break;} case 166: -#line 908 "parse.y" +#line 960 "parse.y" { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, yyvsp[-3].ttype); ; break;} case 168: -#line 913 "parse.y" +#line 965 "parse.y" { begin_explicit_instantiation(); ; break;} case 169: -#line 916 "parse.y" +#line 968 "parse.y" { end_explicit_instantiation(); ; break;} case 170: -#line 925 "parse.y" +#line 977 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 171: -#line 928 "parse.y" +#line 980 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 174: -#line 936 "parse.y" +#line 988 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 175: -#line 941 "parse.y" +#line 993 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 176: -#line 945 "parse.y" +#line 997 "parse.y" { if (yychar == YYEMPTY) yychar = YYLEX; @@ -5161,7 +5213,7 @@ case 176: ; break;} case 178: -#line 956 "parse.y" +#line 1008 "parse.y" { /* Handle `Class<Class<Type>>' without space in the `>>' */ pedwarn ("`>>' should be `> >' in template class name"); @@ -5169,79 +5221,79 @@ case 178: ; break;} case 179: -#line 965 "parse.y" +#line 1017 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 181: -#line 971 "parse.y" +#line 1023 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ; break;} case 182: -#line 973 "parse.y" +#line 1025 "parse.y" { yyval.ttype = chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 183: -#line 978 "parse.y" +#line 1030 "parse.y" { yyval.ttype = groktypename (yyvsp[0].ftype.t); ; break;} case 184: -#line 980 "parse.y" +#line 1032 "parse.y" { yyval.ttype = lastiddecl; ; break;} case 186: -#line 986 "parse.y" +#line 1038 "parse.y" { yyval.code = NEGATE_EXPR; ; break;} case 187: -#line 988 "parse.y" +#line 1040 "parse.y" { yyval.code = CONVERT_EXPR; ; break;} case 188: -#line 990 "parse.y" +#line 1042 "parse.y" { yyval.code = PREINCREMENT_EXPR; ; break;} case 189: -#line 992 "parse.y" +#line 1044 "parse.y" { yyval.code = PREDECREMENT_EXPR; ; break;} case 190: -#line 994 "parse.y" +#line 1046 "parse.y" { yyval.code = TRUTH_NOT_EXPR; ; break;} case 191: -#line 999 "parse.y" +#line 1051 "parse.y" { yyval.ttype = build_x_compound_expr (yyval.ttype); ; break;} case 193: -#line 1005 "parse.y" +#line 1057 "parse.y" { error ("ANSI C++ forbids an empty condition for `%s'", cond_stmt_keyword); yyval.ttype = integer_zero_node; ; break;} case 194: -#line 1009 "parse.y" +#line 1061 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 195: -#line 1014 "parse.y" +#line 1066 "parse.y" { error ("ANSI C++ forbids an empty condition for `%s'", cond_stmt_keyword); yyval.ttype = integer_zero_node; ; break;} case 196: -#line 1018 "parse.y" +#line 1070 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 197: -#line 1023 "parse.y" +#line 1075 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 199: -#line 1026 "parse.y" +#line 1078 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 200: -#line 1031 "parse.y" +#line 1083 "parse.y" { { tree d; for (d = getdecls (); d; d = TREE_CHAIN (d)) @@ -5254,194 +5306,193 @@ case 200: } } current_declspecs = yyvsp[-4].ftype.t; - yyval.ttype = start_decl (yyvsp[-3].ttype, current_declspecs, 1, - yyvsp[-1].ttype, /*prefix_attributes*/ NULL_TREE); + yyval.ttype = parse_decl (yyvsp[-3].ttype, yyvsp[-1].ttype, 1); ; break;} case 201: -#line 1047 "parse.y" +#line 1098 "parse.y" { - cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-3].ttype, LOOKUP_ONLYCONVERTING); + parse_end_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-3].ttype); yyval.ttype = convert_from_reference (yyvsp[-1].ttype); if (TREE_CODE (TREE_TYPE (yyval.ttype)) == ARRAY_TYPE) cp_error ("definition of array `%#D' in condition", yyval.ttype); ; break;} case 207: -#line 1065 "parse.y" +#line 1116 "parse.y" { yyval.ttype = begin_compound_stmt (1); ; break;} case 208: -#line 1067 "parse.y" +#line 1118 "parse.y" { finish_compound_stmt (1, yyvsp[-1].ttype); ; break;} case 210: -#line 1074 "parse.y" +#line 1125 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 211: -#line 1077 "parse.y" +#line 1128 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, build_tree_list (NULL_TREE, error_mark_node)); ; break;} case 212: -#line 1080 "parse.y" +#line 1131 "parse.y" { chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 213: -#line 1082 "parse.y" +#line 1133 "parse.y" { chainon (yyval.ttype, build_tree_list (NULL_TREE, error_mark_node)); ; break;} case 214: -#line 1087 "parse.y" +#line 1138 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ; break;} case 216: -#line 1093 "parse.y" +#line 1144 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 217: -#line 1096 "parse.y" +#line 1147 "parse.y" { yyval.ttype = yyvsp[0].ttype; pedantic = yyvsp[-1].itype; ; break;} case 218: -#line 1099 "parse.y" +#line 1150 "parse.y" { yyval.ttype = build_x_indirect_ref (yyvsp[0].ttype, "unary *"); ; break;} case 219: -#line 1101 "parse.y" +#line 1152 "parse.y" { yyval.ttype = build_x_unary_op (ADDR_EXPR, yyvsp[0].ttype); ; break;} case 220: -#line 1103 "parse.y" +#line 1154 "parse.y" { yyval.ttype = build_x_unary_op (BIT_NOT_EXPR, yyvsp[0].ttype); ; break;} case 221: -#line 1105 "parse.y" +#line 1156 "parse.y" { yyval.ttype = finish_unary_op_expr (yyvsp[-1].code, yyvsp[0].ttype); ; break;} case 222: -#line 1108 "parse.y" +#line 1159 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids `&&'"); yyval.ttype = finish_label_address_expr (yyvsp[0].ttype); ; break;} case 223: -#line 1112 "parse.y" +#line 1163 "parse.y" { yyval.ttype = expr_sizeof (yyvsp[0].ttype); ; break;} case 224: -#line 1114 "parse.y" +#line 1165 "parse.y" { yyval.ttype = c_sizeof (groktypename (yyvsp[-1].ftype.t)); check_for_new_type ("sizeof", yyvsp[-1].ftype); ; break;} case 225: -#line 1117 "parse.y" +#line 1168 "parse.y" { yyval.ttype = grok_alignof (yyvsp[0].ttype); ; break;} case 226: -#line 1119 "parse.y" +#line 1170 "parse.y" { yyval.ttype = c_alignof (groktypename (yyvsp[-1].ftype.t)); check_for_new_type ("alignof", yyvsp[-1].ftype); ; break;} case 227: -#line 1125 "parse.y" +#line 1176 "parse.y" { yyval.ttype = build_new (NULL_TREE, yyvsp[0].ftype.t, NULL_TREE, yyvsp[-1].itype); check_for_new_type ("new", yyvsp[0].ftype); ; break;} case 228: -#line 1128 "parse.y" +#line 1179 "parse.y" { yyval.ttype = build_new (NULL_TREE, yyvsp[-1].ftype.t, yyvsp[0].ttype, yyvsp[-2].itype); check_for_new_type ("new", yyvsp[-1].ftype); ; break;} case 229: -#line 1131 "parse.y" +#line 1182 "parse.y" { yyval.ttype = build_new (yyvsp[-1].ttype, yyvsp[0].ftype.t, NULL_TREE, yyvsp[-2].itype); check_for_new_type ("new", yyvsp[0].ftype); ; break;} case 230: -#line 1134 "parse.y" +#line 1185 "parse.y" { yyval.ttype = build_new (yyvsp[-2].ttype, yyvsp[-1].ftype.t, yyvsp[0].ttype, yyvsp[-3].itype); check_for_new_type ("new", yyvsp[-1].ftype); ; break;} case 231: -#line 1138 "parse.y" +#line 1189 "parse.y" { yyval.ttype = build_new (NULL_TREE, groktypename(yyvsp[-1].ftype.t), NULL_TREE, yyvsp[-3].itype); check_for_new_type ("new", yyvsp[-1].ftype); ; break;} case 232: -#line 1142 "parse.y" +#line 1193 "parse.y" { yyval.ttype = build_new (NULL_TREE, groktypename(yyvsp[-2].ftype.t), yyvsp[0].ttype, yyvsp[-4].itype); check_for_new_type ("new", yyvsp[-2].ftype); ; break;} case 233: -#line 1145 "parse.y" +#line 1196 "parse.y" { yyval.ttype = build_new (yyvsp[-3].ttype, groktypename(yyvsp[-1].ftype.t), NULL_TREE, yyvsp[-4].itype); check_for_new_type ("new", yyvsp[-1].ftype); ; break;} case 234: -#line 1148 "parse.y" +#line 1199 "parse.y" { yyval.ttype = build_new (yyvsp[-4].ttype, groktypename(yyvsp[-2].ftype.t), yyvsp[0].ttype, yyvsp[-5].itype); check_for_new_type ("new", yyvsp[-2].ftype); ; break;} case 235: -#line 1152 "parse.y" +#line 1203 "parse.y" { yyval.ttype = delete_sanity (yyvsp[0].ttype, NULL_TREE, 0, yyvsp[-1].itype); ; break;} case 236: -#line 1154 "parse.y" +#line 1205 "parse.y" { yyval.ttype = delete_sanity (yyvsp[0].ttype, NULL_TREE, 1, yyvsp[-3].itype); if (yychar == YYEMPTY) yychar = YYLEX; ; break;} case 237: -#line 1158 "parse.y" +#line 1209 "parse.y" { yyval.ttype = delete_sanity (yyvsp[0].ttype, yyvsp[-2].ttype, 2, yyvsp[-4].itype); if (yychar == YYEMPTY) yychar = YYLEX; ; break;} case 238: -#line 1162 "parse.y" +#line 1213 "parse.y" { yyval.ttype = build_x_unary_op (REALPART_EXPR, yyvsp[0].ttype); ; break;} case 239: -#line 1164 "parse.y" +#line 1215 "parse.y" { yyval.ttype = build_x_unary_op (IMAGPART_EXPR, yyvsp[0].ttype); ; break;} case 240: -#line 1166 "parse.y" +#line 1217 "parse.y" { yyval.ttype = build_x_va_arg (yyvsp[-3].ttype, groktypename (yyvsp[-1].ftype.t)); check_for_new_type ("__builtin_va_arg", yyvsp[-1].ftype); ; break;} case 241: -#line 1172 "parse.y" +#line 1223 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 242: -#line 1174 "parse.y" +#line 1225 "parse.y" { cp_pedwarn ("old style placement syntax, use () instead"); yyval.ttype = yyvsp[-1].ttype; ; break;} case 243: -#line 1180 "parse.y" +#line 1231 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 244: -#line 1182 "parse.y" +#line 1233 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 245: -#line 1184 "parse.y" +#line 1235 "parse.y" { cp_error ("`%T' is not a valid expression", yyvsp[-1].ftype.t); yyval.ttype = error_mark_node; ; break;} case 246: -#line 1192 "parse.y" +#line 1243 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids initialization of new expression with `='"); @@ -5453,23 +5504,23 @@ case 246: ; break;} case 247: -#line 1206 "parse.y" +#line 1257 "parse.y" { yyvsp[-1].ftype.t = finish_parmlist (build_tree_list (NULL_TREE, yyvsp[-1].ftype.t), 0); yyval.ttype = make_call_declarator (NULL_TREE, yyvsp[-1].ftype.t, NULL_TREE, NULL_TREE); check_for_new_type ("cast", yyvsp[-1].ftype); ; break;} case 248: -#line 1210 "parse.y" +#line 1261 "parse.y" { yyvsp[-1].ftype.t = finish_parmlist (build_tree_list (NULL_TREE, yyvsp[-1].ftype.t), 0); yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-1].ftype.t, NULL_TREE, NULL_TREE); check_for_new_type ("cast", yyvsp[-1].ftype); ; break;} case 250: -#line 1218 "parse.y" +#line 1269 "parse.y" { yyval.ttype = reparse_absdcl_as_casts (yyval.ttype, yyvsp[0].ttype); ; break;} case 251: -#line 1220 "parse.y" +#line 1271 "parse.y" { tree init = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-2].ttype)); @@ -5482,113 +5533,113 @@ case 251: ; break;} case 253: -#line 1236 "parse.y" +#line 1287 "parse.y" { yyval.ttype = build_x_binary_op (MEMBER_REF, yyval.ttype, yyvsp[0].ttype); ; break;} case 254: -#line 1238 "parse.y" +#line 1289 "parse.y" { yyval.ttype = build_m_component_ref (yyval.ttype, yyvsp[0].ttype); ; break;} case 255: -#line 1240 "parse.y" +#line 1291 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 256: -#line 1242 "parse.y" +#line 1293 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 257: -#line 1244 "parse.y" +#line 1295 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 258: -#line 1246 "parse.y" +#line 1297 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 259: -#line 1248 "parse.y" +#line 1299 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 260: -#line 1250 "parse.y" +#line 1301 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 261: -#line 1252 "parse.y" +#line 1303 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 262: -#line 1254 "parse.y" +#line 1305 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 263: -#line 1256 "parse.y" +#line 1307 "parse.y" { yyval.ttype = build_x_binary_op (LT_EXPR, yyval.ttype, yyvsp[0].ttype); ; break;} case 264: -#line 1258 "parse.y" +#line 1309 "parse.y" { yyval.ttype = build_x_binary_op (GT_EXPR, yyval.ttype, yyvsp[0].ttype); ; break;} case 265: -#line 1260 "parse.y" +#line 1311 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 266: -#line 1262 "parse.y" +#line 1313 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 267: -#line 1264 "parse.y" +#line 1315 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 268: -#line 1266 "parse.y" +#line 1317 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 269: -#line 1268 "parse.y" +#line 1319 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 270: -#line 1270 "parse.y" +#line 1321 "parse.y" { yyval.ttype = build_x_binary_op (TRUTH_ANDIF_EXPR, yyval.ttype, yyvsp[0].ttype); ; break;} case 271: -#line 1272 "parse.y" +#line 1323 "parse.y" { yyval.ttype = build_x_binary_op (TRUTH_ORIF_EXPR, yyval.ttype, yyvsp[0].ttype); ; break;} case 272: -#line 1274 "parse.y" +#line 1325 "parse.y" { yyval.ttype = build_x_conditional_expr (yyval.ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 273: -#line 1276 "parse.y" +#line 1327 "parse.y" { yyval.ttype = build_x_modify_expr (yyval.ttype, NOP_EXPR, yyvsp[0].ttype); if (yyval.ttype != error_mark_node) C_SET_EXP_ORIGINAL_CODE (yyval.ttype, MODIFY_EXPR); ; break;} case 274: -#line 1280 "parse.y" +#line 1331 "parse.y" { yyval.ttype = build_x_modify_expr (yyval.ttype, yyvsp[-1].code, yyvsp[0].ttype); ; break;} case 275: -#line 1282 "parse.y" +#line 1333 "parse.y" { yyval.ttype = build_throw (NULL_TREE); ; break;} case 276: -#line 1284 "parse.y" +#line 1335 "parse.y" { yyval.ttype = build_throw (yyvsp[0].ttype); ; break;} case 277: -#line 1302 "parse.y" +#line 1353 "parse.y" { yyval.ttype = build_parse_node (BIT_NOT_EXPR, yyvsp[0].ttype); ; break;} case 278: -#line 1304 "parse.y" +#line 1355 "parse.y" { yyval.ttype = build_parse_node (BIT_NOT_EXPR, yyvsp[0].ttype); ; break;} case 284: -#line 1313 "parse.y" +#line 1364 "parse.y" { /* If lastiddecl is a TREE_LIST, it's a baselink, which means that we're in an expression like S::f<int>, so @@ -5601,27 +5652,27 @@ case 284: ; break;} case 285: -#line 1326 "parse.y" +#line 1377 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 286: -#line 1328 "parse.y" +#line 1379 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 287: -#line 1333 "parse.y" +#line 1384 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 288: -#line 1335 "parse.y" +#line 1386 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 289: -#line 1338 "parse.y" +#line 1389 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 294: -#line 1350 "parse.y" +#line 1401 "parse.y" { /* Provide support for '(' attributes '*' declarator ')' etc */ @@ -5629,31 +5680,31 @@ case 294: ; break;} case 296: -#line 1360 "parse.y" +#line 1411 "parse.y" { yyval.ttype = build_parse_node (INDIRECT_REF, yyvsp[0].ttype); ; break;} case 297: -#line 1362 "parse.y" +#line 1413 "parse.y" { yyval.ttype = build_parse_node (ADDR_EXPR, yyvsp[0].ttype); ; break;} case 298: -#line 1364 "parse.y" +#line 1415 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 299: -#line 1369 "parse.y" +#line 1420 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 300: -#line 1371 "parse.y" +#line 1422 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 304: -#line 1381 "parse.y" +#line 1432 "parse.y" { yyval.ttype = finish_decl_parsing (yyvsp[-1].ttype); ; break;} case 305: -#line 1386 "parse.y" +#line 1437 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == BIT_NOT_EXPR) yyval.ttype = build_x_unary_op (BIT_NOT_EXPR, TREE_OPERAND (yyvsp[0].ttype, 0)); @@ -5662,7 +5713,7 @@ case 305: ; break;} case 308: -#line 1395 "parse.y" +#line 1446 "parse.y" { yyval.ttype = combine_strings (yyval.ttype); /* combine_strings doesn't set up TYPE_MAIN_VARIANT of @@ -5674,20 +5725,20 @@ case 308: ; break;} case 309: -#line 1405 "parse.y" +#line 1456 "parse.y" { yyval.ttype = finish_parenthesized_expr (yyvsp[-1].ttype); ; break;} case 310: -#line 1407 "parse.y" +#line 1458 "parse.y" { yyvsp[-1].ttype = reparse_decl_as_expr (NULL_TREE, yyvsp[-1].ttype); yyval.ttype = finish_parenthesized_expr (yyvsp[-1].ttype); ; break;} case 311: -#line 1410 "parse.y" +#line 1461 "parse.y" { yyval.ttype = error_mark_node; ; break;} case 312: -#line 1412 "parse.y" +#line 1463 "parse.y" { tree scope = current_scope (); if (!scope || TREE_CODE (scope) != FUNCTION_DECL) { @@ -5700,43 +5751,43 @@ case 312: ; break;} case 313: -#line 1423 "parse.y" +#line 1474 "parse.y" { yyval.ttype = finish_stmt_expr (yyvsp[-2].ttype); ; break;} case 314: -#line 1428 "parse.y" +#line 1479 "parse.y" { yyval.ttype = finish_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype, 1); ; break;} case 315: -#line 1430 "parse.y" +#line 1481 "parse.y" { yyval.ttype = finish_call_expr (yyvsp[-1].ttype, NULL_TREE, 1); ; break;} case 316: -#line 1432 "parse.y" +#line 1483 "parse.y" { yyval.ttype = finish_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype, 0); ; break;} case 317: -#line 1434 "parse.y" +#line 1485 "parse.y" { yyval.ttype = finish_call_expr (yyvsp[-1].ttype, NULL_TREE, 0); ; break;} case 318: -#line 1436 "parse.y" +#line 1487 "parse.y" { yyval.ttype = grok_array_decl (yyval.ttype, yyvsp[-1].ttype); ; break;} case 319: -#line 1438 "parse.y" +#line 1489 "parse.y" { yyval.ttype = finish_increment_expr (yyvsp[-1].ttype, POSTINCREMENT_EXPR); ; break;} case 320: -#line 1440 "parse.y" +#line 1491 "parse.y" { yyval.ttype = finish_increment_expr (yyvsp[-1].ttype, POSTDECREMENT_EXPR); ; break;} case 321: -#line 1443 "parse.y" +#line 1494 "parse.y" { yyval.ttype = finish_this_expr (); ; break;} case 322: -#line 1445 "parse.y" +#line 1496 "parse.y" { /* This is a C cast in C++'s `functional' notation using the "implicit int" extension so that: @@ -5749,49 +5800,49 @@ case 322: ; break;} case 324: -#line 1457 "parse.y" +#line 1508 "parse.y" { tree type = groktypename (yyvsp[-4].ftype.t); check_for_new_type ("dynamic_cast", yyvsp[-4].ftype); yyval.ttype = build_dynamic_cast (type, yyvsp[-1].ttype); ; break;} case 325: -#line 1461 "parse.y" +#line 1512 "parse.y" { tree type = groktypename (yyvsp[-4].ftype.t); check_for_new_type ("static_cast", yyvsp[-4].ftype); yyval.ttype = build_static_cast (type, yyvsp[-1].ttype); ; break;} case 326: -#line 1465 "parse.y" +#line 1516 "parse.y" { tree type = groktypename (yyvsp[-4].ftype.t); check_for_new_type ("reinterpret_cast", yyvsp[-4].ftype); yyval.ttype = build_reinterpret_cast (type, yyvsp[-1].ttype); ; break;} case 327: -#line 1469 "parse.y" +#line 1520 "parse.y" { tree type = groktypename (yyvsp[-4].ftype.t); check_for_new_type ("const_cast", yyvsp[-4].ftype); yyval.ttype = build_const_cast (type, yyvsp[-1].ttype); ; break;} case 328: -#line 1473 "parse.y" +#line 1524 "parse.y" { yyval.ttype = build_typeid (yyvsp[-1].ttype); ; break;} case 329: -#line 1475 "parse.y" +#line 1526 "parse.y" { tree type = groktypename (yyvsp[-1].ftype.t); check_for_new_type ("typeid", yyvsp[-1].ftype); yyval.ttype = get_typeid (TYPE_MAIN_VARIANT (type)); ; break;} case 330: -#line 1479 "parse.y" +#line 1530 "parse.y" { yyval.ttype = do_scoped_id (yyvsp[0].ttype, 1); ; break;} case 331: -#line 1481 "parse.y" +#line 1532 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 332: -#line 1483 "parse.y" +#line 1534 "parse.y" { got_scope = NULL_TREE; if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) @@ -5801,102 +5852,102 @@ case 332: ; break;} case 333: -#line 1491 "parse.y" +#line 1542 "parse.y" { yyval.ttype = build_offset_ref (OP0 (yyval.ttype), OP1 (yyval.ttype)); ; break;} case 334: -#line 1493 "parse.y" +#line 1544 "parse.y" { yyval.ttype = finish_qualified_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 335: -#line 1495 "parse.y" +#line 1546 "parse.y" { yyval.ttype = finish_qualified_call_expr (yyvsp[-1].ttype, NULL_TREE); ; break;} case 336: -#line 1497 "parse.y" +#line 1548 "parse.y" { yyval.ttype = build_x_component_ref (yyval.ttype, yyvsp[0].ttype, NULL_TREE, 1); ; break;} case 337: -#line 1501 "parse.y" +#line 1552 "parse.y" { yyval.ttype = finish_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ; break;} case 338: -#line 1503 "parse.y" +#line 1554 "parse.y" { yyval.ttype = finish_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ; break;} case 339: -#line 1505 "parse.y" +#line 1556 "parse.y" { yyval.ttype = build_x_component_ref (yyval.ttype, yyvsp[0].ttype, NULL_TREE, 1); ; break;} case 340: -#line 1507 "parse.y" +#line 1558 "parse.y" { if (processing_template_decl) yyval.ttype = build_min_nt (COMPONENT_REF, yyvsp[-1].ttype, yyvsp[0].ttype); else yyval.ttype = build_object_ref (yyval.ttype, OP0 (yyvsp[0].ttype), OP1 (yyvsp[0].ttype)); ; break;} case 341: -#line 1512 "parse.y" +#line 1563 "parse.y" { yyval.ttype = finish_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ; break;} case 342: -#line 1514 "parse.y" +#line 1565 "parse.y" { yyval.ttype = finish_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ; break;} case 343: -#line 1516 "parse.y" +#line 1567 "parse.y" { yyval.ttype = finish_qualified_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ; break;} case 344: -#line 1518 "parse.y" +#line 1569 "parse.y" { yyval.ttype = finish_qualified_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ; break;} case 345: -#line 1521 "parse.y" +#line 1572 "parse.y" { yyval.ttype = finish_pseudo_destructor_call_expr (yyvsp[-3].ttype, NULL_TREE, yyvsp[-1].ttype); ; break;} case 346: -#line 1523 "parse.y" +#line 1574 "parse.y" { yyval.ttype = finish_pseudo_destructor_call_expr (yyvsp[-5].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ; break;} case 347: -#line 1525 "parse.y" +#line 1576 "parse.y" { yyval.ttype = error_mark_node; ; break;} case 348: -#line 1570 "parse.y" +#line 1621 "parse.y" { yyval.itype = 0; ; break;} case 349: -#line 1572 "parse.y" +#line 1623 "parse.y" { got_scope = NULL_TREE; yyval.itype = 1; ; break;} case 350: -#line 1577 "parse.y" +#line 1628 "parse.y" { yyval.itype = 0; ; break;} case 351: -#line 1579 "parse.y" +#line 1630 "parse.y" { got_scope = NULL_TREE; yyval.itype = 1; ; break;} case 352: -#line 1584 "parse.y" +#line 1635 "parse.y" { yyval.ttype = boolean_true_node; ; break;} case 353: -#line 1586 "parse.y" +#line 1637 "parse.y" { yyval.ttype = boolean_false_node; ; break;} case 355: -#line 1593 "parse.y" +#line 1644 "parse.y" { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ; break;} case 356: -#line 1598 "parse.y" +#line 1649 "parse.y" { if (! current_function_parms_stored) store_parm_decls (); @@ -5904,169 +5955,169 @@ case 356: ; break;} case 357: -#line 1607 "parse.y" +#line 1658 "parse.y" { got_object = TREE_TYPE (yyval.ttype); ; break;} case 358: -#line 1609 "parse.y" +#line 1660 "parse.y" { yyval.ttype = build_x_arrow (yyval.ttype); got_object = TREE_TYPE (yyval.ttype); ; break;} case 359: -#line 1617 "parse.y" +#line 1668 "parse.y" { if (yyvsp[-2].ftype.t && IS_AGGR_TYPE_CODE (TREE_CODE (yyvsp[-2].ftype.t))) note_got_semicolon (yyvsp[-2].ftype.t); ; break;} case 360: -#line 1622 "parse.y" +#line 1673 "parse.y" { note_list_got_semicolon (yyvsp[-2].ftype.t); ; break;} case 361: -#line 1626 "parse.y" +#line 1677 "parse.y" {; break;} case 362: -#line 1628 "parse.y" +#line 1679 "parse.y" { shadow_tag (yyvsp[-1].ftype.t); note_list_got_semicolon (yyvsp[-1].ftype.t); ; break;} case 363: -#line 1633 "parse.y" +#line 1684 "parse.y" { warning ("empty declaration"); ; break;} case 364: -#line 1635 "parse.y" +#line 1686 "parse.y" { pedantic = yyvsp[-1].itype; ; break;} case 367: -#line 1649 "parse.y" +#line 1700 "parse.y" { yyval.ttype = make_call_declarator (NULL_TREE, empty_parms (), NULL_TREE, NULL_TREE); ; break;} case 368: -#line 1652 "parse.y" +#line 1703 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), NULL_TREE, NULL_TREE); ; break;} case 369: -#line 1659 "parse.y" +#line 1710 "parse.y" { yyval.ftype.t = build_decl_list (yyvsp[-1].ftype.t, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 370: -#line 1662 "parse.y" +#line 1713 "parse.y" { yyval.ftype.t = build_decl_list (yyvsp[-1].ftype.t, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 371: -#line 1665 "parse.y" +#line 1716 "parse.y" { yyval.ftype.t = build_decl_list (build_decl_list (NULL_TREE, yyvsp[-1].ftype.t), yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 372: -#line 1669 "parse.y" +#line 1720 "parse.y" { yyval.ftype.t = build_decl_list (yyvsp[0].ftype.t, NULL_TREE); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 373: -#line 1672 "parse.y" +#line 1723 "parse.y" { yyval.ftype.t = build_decl_list (yyvsp[0].ftype.t, NULL_TREE); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 374: -#line 1683 "parse.y" +#line 1734 "parse.y" { yyval.ftype.lookups = type_lookups; ; break;} case 375: -#line 1685 "parse.y" +#line 1736 "parse.y" { yyval.ftype.lookups = type_lookups; ; break;} case 376: -#line 1690 "parse.y" +#line 1741 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 377: -#line 1693 "parse.y" +#line 1744 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 378: -#line 1696 "parse.y" +#line 1747 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-2].ftype.t, chainon (yyvsp[-1].ttype, yyvsp[0].ttype)); yyval.ftype.new_type_flag = yyvsp[-2].ftype.new_type_flag; ; break;} case 379: -#line 1699 "parse.y" +#line 1750 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, chainon (yyvsp[0].ttype, yyvsp[-2].ftype.t)); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 380: -#line 1702 "parse.y" +#line 1753 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, chainon (yyvsp[0].ttype, yyvsp[-2].ftype.t)); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 381: -#line 1705 "parse.y" +#line 1756 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-2].ftype.t, chainon (yyvsp[-1].ttype, chainon (yyvsp[0].ttype, yyvsp[-3].ftype.t))); yyval.ftype.new_type_flag = yyvsp[-2].ftype.new_type_flag; ; break;} case 382: -#line 1712 "parse.y" +#line 1763 "parse.y" { if (extra_warnings) warning ("`%s' is not at beginning of declaration", IDENTIFIER_POINTER (yyval.ttype)); yyval.ttype = build_decl_list (NULL_TREE, yyval.ttype); ; break;} case 383: -#line 1717 "parse.y" +#line 1768 "parse.y" { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyval.ttype); ; break;} case 384: -#line 1719 "parse.y" +#line 1770 "parse.y" { if (extra_warnings) warning ("`%s' is not at beginning of declaration", IDENTIFIER_POINTER (yyvsp[0].ttype)); yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ; break;} case 385: -#line 1724 "parse.y" +#line 1775 "parse.y" { yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ; break;} case 386: -#line 1726 "parse.y" +#line 1777 "parse.y" { yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); ; break;} case 387: -#line 1745 "parse.y" +#line 1796 "parse.y" { yyval.ftype.lookups = NULL_TREE; TREE_STATIC (yyval.ftype.t) = 1; ; break;} case 388: -#line 1747 "parse.y" +#line 1798 "parse.y" { yyval.ftype.t = hash_tree_cons (NULL_TREE, yyvsp[0].ttype, NULL_TREE); yyval.ftype.new_type_flag = 0; yyval.ftype.lookups = NULL_TREE; ; break;} case 389: -#line 1752 "parse.y" +#line 1803 "parse.y" { yyval.ftype.t = hash_tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ftype.t); TREE_STATIC (yyval.ftype.t) = 1; ; break;} case 390: -#line 1757 "parse.y" +#line 1808 "parse.y" { if (extra_warnings && TREE_STATIC (yyval.ftype.t)) warning ("`%s' is not at beginning of declaration", @@ -6076,68 +6127,68 @@ case 390: ; break;} case 391: -#line 1765 "parse.y" +#line 1816 "parse.y" { yyval.ftype.t = hash_tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ftype.t); ; break;} case 392: -#line 1767 "parse.y" +#line 1818 "parse.y" { yyval.ftype.t = hash_tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); yyval.ftype.new_type_flag = 0; yyval.ftype.lookups = NULL_TREE; ; break;} case 393: -#line 1781 "parse.y" +#line 1832 "parse.y" { yyval.ftype.t = build_decl_list (NULL_TREE, yyvsp[0].ftype.t); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 394: -#line 1784 "parse.y" +#line 1835 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 395: -#line 1787 "parse.y" +#line 1838 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 396: -#line 1790 "parse.y" +#line 1841 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, chainon (yyvsp[0].ttype, yyvsp[-2].ftype.t)); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 397: -#line 1796 "parse.y" +#line 1847 "parse.y" { yyval.ttype = build_decl_list (NULL_TREE, yyvsp[0].ftype.t); ; break;} case 398: -#line 1798 "parse.y" +#line 1849 "parse.y" { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ttype); ; break;} case 399: -#line 1807 "parse.y" +#line 1858 "parse.y" { yyval.ftype.lookups = NULL_TREE; ; break;} case 400: -#line 1809 "parse.y" +#line 1860 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; yyval.ftype.lookups = NULL_TREE; ; break;} case 401: -#line 1811 "parse.y" +#line 1862 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; yyval.ftype.lookups = NULL_TREE; ; break;} case 402: -#line 1813 "parse.y" +#line 1864 "parse.y" { yyval.ftype.t = finish_typeof (yyvsp[-1].ttype); yyval.ftype.new_type_flag = 0; yyval.ftype.lookups = NULL_TREE; ; break;} case 403: -#line 1816 "parse.y" +#line 1867 "parse.y" { yyval.ftype.t = groktypename (yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = 0; yyval.ftype.lookups = NULL_TREE; ; break;} case 404: -#line 1819 "parse.y" +#line 1870 "parse.y" { tree type = TREE_TYPE (yyvsp[-1].ttype); yyval.ftype.new_type_flag = 0; yyval.ftype.lookups = NULL_TREE; @@ -6154,7 +6205,7 @@ case 404: ; break;} case 405: -#line 1834 "parse.y" +#line 1885 "parse.y" { tree type = groktypename (yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = 0; yyval.ftype.lookups = NULL_TREE; @@ -6171,288 +6222,279 @@ case 405: ; break;} case 406: -#line 1854 "parse.y" +#line 1905 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 407: -#line 1856 "parse.y" +#line 1907 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 410: -#line 1863 "parse.y" +#line 1914 "parse.y" { check_multiple_declarators (); ; break;} case 412: -#line 1869 "parse.y" +#line 1920 "parse.y" { check_multiple_declarators (); ; break;} case 414: -#line 1875 "parse.y" +#line 1926 "parse.y" { check_multiple_declarators (); ; break;} case 415: -#line 1880 "parse.y" +#line 1931 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 416: -#line 1882 "parse.y" +#line 1933 "parse.y" { if (TREE_CHAIN (yyvsp[-1].ttype)) yyvsp[-1].ttype = combine_strings (yyvsp[-1].ttype); yyval.ttype = yyvsp[-1].ttype; ; break;} case 417: -#line 1887 "parse.y" -{ - deferred_type_access_control (); - yyval.ttype = start_decl (yyvsp[-3].ttype, current_declspecs, 1, - yyvsp[-1].ttype, prefix_attributes); - ; +#line 1938 "parse.y" +{ yyval.ttype = parse_decl (yyvsp[-3].ttype, yyvsp[-1].ttype, 1); ; break;} case 418: -#line 1894 "parse.y" -{ cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype, LOOKUP_ONLYCONVERTING); ; +#line 1941 "parse.y" +{ parse_end_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype); ; break;} case 419: -#line 1896 "parse.y" +#line 1943 "parse.y" { - deferred_type_access_control (); - yyval.ttype = start_decl (yyvsp[-2].ttype, current_declspecs, 0, - yyvsp[0].ttype, prefix_attributes); - cp_finish_decl (yyval.ttype, NULL_TREE, yyvsp[-1].ttype, 0); + yyval.ttype = parse_decl (yyvsp[-2].ttype, yyvsp[0].ttype, 0); + parse_end_decl (yyval.ttype, NULL_TREE, yyvsp[-1].ttype); ; break;} case 420: -#line 1912 "parse.y" -{ parse_decl (yyvsp[-3].ttype, yyvsp[-4].ftype.t, yyvsp[-4].ftype.lookups, - yyvsp[-1].ttype, 1, &yyval.ttype); ; +#line 1957 "parse.y" +{ yyval.ttype = parse_decl0 (yyvsp[-3].ttype, yyvsp[-4].ftype.t, + yyvsp[-4].ftype.lookups, yyvsp[-1].ttype, 1); ; break;} case 421: -#line 1917 "parse.y" -{ cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype, - LOOKUP_ONLYCONVERTING); ; +#line 1962 "parse.y" +{ parse_end_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype); ; break;} case 422: -#line 1920 "parse.y" -{ tree d; - parse_decl (yyvsp[-2].ttype, yyvsp[-3].ftype.t, yyvsp[-3].ftype.lookups, - yyvsp[0].ttype, 0, &d); - cp_finish_decl (d, NULL_TREE, yyvsp[-1].ttype, 0); ; +#line 1964 "parse.y" +{ tree d = parse_decl0 (yyvsp[-2].ttype, yyvsp[-3].ftype.t, + yyvsp[-3].ftype.lookups, yyvsp[0].ttype, 0); + parse_end_decl (d, NULL_TREE, yyvsp[-1].ttype); ; break;} case 423: -#line 1928 "parse.y" +#line 1971 "parse.y" {; break;} case 424: -#line 1933 "parse.y" +#line 1976 "parse.y" {; break;} case 425: -#line 1938 "parse.y" +#line 1981 "parse.y" { /* Set things up as initdcl0_innards expects. */ yyvsp[0].ttype = yyvsp[-1].ttype; yyvsp[-1].ttype = NULL_TREE; ; break;} case 426: -#line 1942 "parse.y" +#line 1985 "parse.y" {; break;} case 427: -#line 1944 "parse.y" -{ tree d; - parse_decl (yyvsp[-2].ttype, NULL_TREE, NULL_TREE, yyvsp[0].ttype, 0, &d); - cp_finish_decl (d, NULL_TREE, yyvsp[-1].ttype, 0); ; +#line 1987 "parse.y" +{ tree d = parse_decl0 (yyvsp[-2].ttype, NULL_TREE, NULL_TREE, yyvsp[0].ttype, 0); + parse_end_decl (d, NULL_TREE, yyvsp[-1].ttype); ; break;} case 428: -#line 1953 "parse.y" +#line 1995 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 429: -#line 1955 "parse.y" +#line 1997 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 430: -#line 1960 "parse.y" +#line 2002 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 431: -#line 1962 "parse.y" +#line 2004 "parse.y" { yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 432: -#line 1967 "parse.y" +#line 2009 "parse.y" { yyval.ttype = yyvsp[-2].ttype; ; break;} case 433: -#line 1972 "parse.y" +#line 2014 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 434: -#line 1974 "parse.y" +#line 2016 "parse.y" { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 435: -#line 1979 "parse.y" +#line 2021 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 436: -#line 1981 "parse.y" +#line 2023 "parse.y" { yyval.ttype = build_tree_list (yyvsp[0].ttype, NULL_TREE); ; break;} case 437: -#line 1983 "parse.y" +#line 2025 "parse.y" { yyval.ttype = build_tree_list (yyvsp[-3].ttype, build_tree_list (NULL_TREE, yyvsp[-1].ttype)); ; break;} case 438: -#line 1985 "parse.y" +#line 2027 "parse.y" { yyval.ttype = build_tree_list (yyvsp[-5].ttype, tree_cons (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype)); ; break;} case 439: -#line 1987 "parse.y" +#line 2029 "parse.y" { yyval.ttype = build_tree_list (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 444: -#line 2003 "parse.y" +#line 2045 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ; break;} case 445: -#line 2005 "parse.y" +#line 2047 "parse.y" { yyval.ttype = chainon (yyvsp[-2].ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 446: -#line 2010 "parse.y" +#line 2052 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 447: -#line 2012 "parse.y" +#line 2054 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 449: -#line 2020 "parse.y" +#line 2062 "parse.y" { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, NULL_TREE); TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ; break;} case 450: -#line 2023 "parse.y" +#line 2065 "parse.y" { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-1].ttype)); TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ; break;} case 451: -#line 2026 "parse.y" +#line 2068 "parse.y" { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-2].ttype)); TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ; break;} case 452: -#line 2029 "parse.y" +#line 2071 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 453: -#line 2036 "parse.y" +#line 2078 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ; break;} case 454: -#line 2038 "parse.y" +#line 2080 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ; break;} case 455: -#line 2041 "parse.y" +#line 2083 "parse.y" { yyval.ttype = build_tree_list (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 456: -#line 2043 "parse.y" +#line 2085 "parse.y" { yyval.ttype = build_tree_list (yyval.ttype, yyvsp[0].ttype); ; break;} case 457: -#line 2045 "parse.y" +#line 2087 "parse.y" { yyval.ttype = tree_cons (yyvsp[-2].ttype, yyvsp[0].ttype, yyval.ttype); ; break;} case 458: -#line 2050 "parse.y" +#line 2092 "parse.y" { start_function (NULL_TREE, yyvsp[0].pi->fndecl, NULL_TREE, (SF_DEFAULT | SF_PRE_PARSED | SF_INCLASS_INLINE)); reinit_parse_for_function (); ; break;} case 459: -#line 2057 "parse.y" +#line 2099 "parse.y" { expand_body (finish_function (lineno, (int)yyvsp[-1].itype | 2)); process_next_inline (yyvsp[-3].pi); ; break;} case 460: -#line 2062 "parse.y" +#line 2104 "parse.y" { expand_body (finish_function (lineno, (int)yyvsp[0].itype | 2)); process_next_inline (yyvsp[-2].pi); ; break;} case 461: -#line 2067 "parse.y" +#line 2109 "parse.y" { finish_function (lineno, 2); process_next_inline (yyvsp[-2].pi); ; break;} case 464: -#line 2081 "parse.y" +#line 2123 "parse.y" { replace_defarg (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 465: -#line 2083 "parse.y" +#line 2125 "parse.y" { replace_defarg (yyvsp[-2].ttype, error_mark_node); ; break;} case 467: -#line 2088 "parse.y" +#line 2130 "parse.y" { do_pending_defargs (); ; break;} case 468: -#line 2090 "parse.y" +#line 2132 "parse.y" { do_pending_defargs (); ; break;} case 469: -#line 2095 "parse.y" +#line 2137 "parse.y" { yyval.ttype = current_enum_type; current_enum_type = start_enum (yyvsp[-1].ttype); ; break;} case 470: -#line 2098 "parse.y" +#line 2140 "parse.y" { yyval.ftype.t = finish_enum (current_enum_type); yyval.ftype.new_type_flag = 1; current_enum_type = yyvsp[-2].ttype; check_for_missing_semicolon (yyval.ftype.t); ; break;} case 471: -#line 2103 "parse.y" +#line 2145 "parse.y" { yyval.ttype = current_enum_type; current_enum_type = start_enum (make_anon_name ()); ; break;} case 472: -#line 2106 "parse.y" +#line 2148 "parse.y" { yyval.ftype.t = finish_enum (current_enum_type); yyval.ftype.new_type_flag = 1; current_enum_type = yyvsp[-2].ttype; check_for_missing_semicolon (yyval.ftype.t); ; break;} case 473: -#line 2111 "parse.y" +#line 2153 "parse.y" { yyval.ftype.t = xref_tag (enum_type_node, yyvsp[0].ttype, 1); yyval.ftype.new_type_flag = 0; ; break;} case 474: -#line 2114 "parse.y" +#line 2156 "parse.y" { yyval.ftype.t = xref_tag (enum_type_node, yyvsp[0].ttype, 1); yyval.ftype.new_type_flag = 0; ; break;} case 475: -#line 2117 "parse.y" +#line 2159 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; if (!processing_template_decl) cp_pedwarn ("using `typename' outside of template"); ; break;} case 476: -#line 2123 "parse.y" +#line 2165 "parse.y" { yyvsp[-1].ftype.t = begin_class_definition (yyvsp[-1].ftype.t); ; break;} case 477: -#line 2125 "parse.y" +#line 2167 "parse.y" { int semi; @@ -6465,13 +6507,13 @@ case 477: ; break;} case 478: -#line 2136 "parse.y" +#line 2178 "parse.y" { begin_inline_definitions (); ; break;} case 479: -#line 2140 "parse.y" +#line 2182 "parse.y" { finish_inline_definitions (); yyval.ftype.t = yyvsp[-3].ttype; @@ -6479,7 +6521,7 @@ case 479: ; break;} case 480: -#line 2146 "parse.y" +#line 2188 "parse.y" { if (yyvsp[0].ftype.new_type_flag && yyvsp[0].ftype.t != error_mark_node) pop_scope (CP_DECL_CONTEXT (TYPE_MAIN_DECL (yyvsp[0].ftype.t))); @@ -6505,51 +6547,51 @@ case 480: ; break;} case 484: -#line 2179 "parse.y" +#line 2221 "parse.y" { if (pedantic && !in_system_header) pedwarn ("comma at end of enumerator list"); ; break;} case 486: -#line 2186 "parse.y" +#line 2228 "parse.y" { error ("storage class specifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ; break;} case 487: -#line 2188 "parse.y" +#line 2230 "parse.y" { error ("type specifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ; break;} case 488: -#line 2190 "parse.y" +#line 2232 "parse.y" { error ("type qualifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ; break;} case 489: -#line 2192 "parse.y" +#line 2234 "parse.y" { error ("no body nor ';' separates two class, struct or union declarations"); ; break;} case 490: -#line 2194 "parse.y" +#line 2236 "parse.y" { yyval.ttype = build_decl_list (yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 491: -#line 2199 "parse.y" +#line 2241 "parse.y" { current_aggr = yyvsp[-1].ttype; yyval.ttype = yyvsp[0].ttype; ; break;} case 492: -#line 2207 "parse.y" +#line 2249 "parse.y" { current_aggr = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ; break;} case 493: -#line 2209 "parse.y" +#line 2251 "parse.y" { yyungetc ('{', 1); ; break;} case 494: -#line 2211 "parse.y" +#line 2253 "parse.y" { yyungetc (':', 1); ; break;} case 495: -#line 2216 "parse.y" +#line 2258 "parse.y" { current_aggr = yyvsp[-2].ttype; yyval.ftype.t = handle_class_head (yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); @@ -6557,7 +6599,7 @@ case 495: ; break;} case 496: -#line 2222 "parse.y" +#line 2264 "parse.y" { current_aggr = yyvsp[-3].ttype; yyval.ftype.t = handle_class_head (yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); @@ -6565,7 +6607,7 @@ case 496: ; break;} case 497: -#line 2228 "parse.y" +#line 2270 "parse.y" { current_aggr = yyvsp[-2].ttype; yyval.ftype.t = handle_class_head (yyvsp[-2].ttype, NULL_TREE, yyvsp[0].ttype); @@ -6573,7 +6615,7 @@ case 497: ; break;} case 498: -#line 2234 "parse.y" +#line 2276 "parse.y" { current_aggr = yyvsp[-1].ttype; yyval.ftype.t = yyvsp[0].ttype; @@ -6581,7 +6623,7 @@ case 498: ; break;} case 499: -#line 2240 "parse.y" +#line 2282 "parse.y" { current_aggr = yyvsp[-2].ttype; yyval.ftype.t = yyvsp[0].ttype; @@ -6591,18 +6633,18 @@ case 499: ; break;} case 500: -#line 2251 "parse.y" +#line 2293 "parse.y" { yyval.ftype.t = xref_tag (current_aggr, yyvsp[0].ttype, 1); yyval.ftype.new_type_flag = 0; ; break;} case 501: -#line 2256 "parse.y" +#line 2298 "parse.y" { yyval.ttype = xref_tag (current_aggr, yyvsp[0].ttype, 0); ; break;} case 502: -#line 2260 "parse.y" +#line 2302 "parse.y" { yyval.ftype.t = yyvsp[-1].ttype; yyval.ftype.new_type_flag = 0; @@ -6611,7 +6653,7 @@ case 502: ; break;} case 503: -#line 2268 "parse.y" +#line 2310 "parse.y" { if (yyvsp[-1].ftype.t != error_mark_node) { @@ -6638,43 +6680,43 @@ case 503: ; break;} case 504: -#line 2296 "parse.y" +#line 2338 "parse.y" { yyval.ttype = xref_tag (yyval.ttype, make_anon_name (), 0); yyungetc ('{', 1); ; break;} case 505: -#line 2306 "parse.y" +#line 2348 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 507: -#line 2315 "parse.y" +#line 2357 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 508: -#line 2317 "parse.y" +#line 2359 "parse.y" { yyungetc(':', 1); yyval.ttype = NULL_TREE; ; break;} case 509: -#line 2319 "parse.y" +#line 2361 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 511: -#line 2325 "parse.y" +#line 2367 "parse.y" { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ; break;} case 512: -#line 2330 "parse.y" +#line 2372 "parse.y" { yyval.ttype = finish_base_specifier (access_default_node, yyvsp[0].ttype); ; break;} case 513: -#line 2332 "parse.y" +#line 2374 "parse.y" { yyval.ttype = finish_base_specifier (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 514: -#line 2337 "parse.y" +#line 2379 "parse.y" { if (yyval.ttype == error_mark_node) ; else if (!TYPE_P (yyval.ttype)) @@ -6683,13 +6725,13 @@ case 514: yyval.ttype = TYPE_MAIN_DECL (yyvsp[0].ttype); ; break;} case 517: -#line 2349 "parse.y" +#line 2391 "parse.y" { if (yyvsp[-1].ttype != ridpointers[(int)RID_VIRTUAL]) cp_error ("`%D' access", yyvsp[-1].ttype); yyval.ttype = access_default_virtual_node; ; break;} case 518: -#line 2353 "parse.y" +#line 2395 "parse.y" { if (yyvsp[-2].ttype != access_default_virtual_node) error ("multiple access specifiers"); @@ -6702,7 +6744,7 @@ case 518: ; break;} case 519: -#line 2364 "parse.y" +#line 2406 "parse.y" { if (yyvsp[-1].ttype != ridpointers[(int)RID_VIRTUAL]) cp_error ("`%D' access", yyvsp[-1].ttype); else if (yyval.ttype == access_public_node) @@ -6716,55 +6758,55 @@ case 519: ; break;} case 524: -#line 2385 "parse.y" +#line 2427 "parse.y" { current_access_specifier = yyvsp[-1].ttype; ; break;} case 525: -#line 2394 "parse.y" +#line 2436 "parse.y" { finish_member_declaration (yyvsp[0].ttype); ; break;} case 526: -#line 2398 "parse.y" +#line 2440 "parse.y" { finish_member_declaration (yyvsp[0].ttype); ; break;} case 528: -#line 2406 "parse.y" +#line 2448 "parse.y" { error ("missing ';' before right brace"); yyungetc ('}', 0); ; break;} case 529: -#line 2411 "parse.y" +#line 2453 "parse.y" { yyval.ttype = finish_method (yyval.ttype); ; break;} case 530: -#line 2413 "parse.y" +#line 2455 "parse.y" { yyval.ttype = finish_method (yyval.ttype); ; break;} case 531: -#line 2415 "parse.y" +#line 2457 "parse.y" { yyval.ttype = finish_method (yyval.ttype); ; break;} case 532: -#line 2417 "parse.y" +#line 2459 "parse.y" { yyval.ttype = finish_method (yyval.ttype); ; break;} case 533: -#line 2419 "parse.y" +#line 2461 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 534: -#line 2421 "parse.y" +#line 2463 "parse.y" { yyval.ttype = yyvsp[0].ttype; pedantic = yyvsp[-1].itype; ; break;} case 535: -#line 2424 "parse.y" +#line 2466 "parse.y" { if (yyvsp[0].ttype) yyval.ttype = finish_member_template_decl (yyvsp[0].ttype); @@ -6776,14 +6818,14 @@ case 535: ; break;} case 536: -#line 2434 "parse.y" +#line 2476 "parse.y" { yyval.ttype = finish_member_class_template (yyvsp[-1].ftype.t); finish_template_decl (yyvsp[-2].ttype); ; break;} case 537: -#line 2445 "parse.y" +#line 2487 "parse.y" { /* Most of the productions for component_decl only allow the creation of one new member, so we call @@ -6806,7 +6848,7 @@ case 537: ; break;} case 538: -#line 2466 "parse.y" +#line 2508 "parse.y" { if (!yyvsp[0].itype) grok_x_components (yyvsp[-1].ftype.t); @@ -6814,45 +6856,45 @@ case 538: ; break;} case 539: -#line 2472 "parse.y" +#line 2514 "parse.y" { yyval.ttype = grokfield (yyval.ttype, NULL_TREE, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, NULL_TREE)); ; break;} case 540: -#line 2475 "parse.y" +#line 2517 "parse.y" { yyval.ttype = grokfield (yyval.ttype, NULL_TREE, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, NULL_TREE)); ; break;} case 541: -#line 2478 "parse.y" +#line 2520 "parse.y" { yyval.ttype = grokbitfield (NULL_TREE, NULL_TREE, yyvsp[0].ttype); ; break;} case 542: -#line 2480 "parse.y" +#line 2522 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 543: -#line 2491 "parse.y" +#line 2533 "parse.y" { tree specs, attrs; split_specs_attrs (yyvsp[-4].ftype.t, &specs, &attrs); yyval.ttype = grokfield (yyvsp[-3].ttype, specs, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, attrs)); ; break;} case 544: -#line 2496 "parse.y" +#line 2538 "parse.y" { yyval.ttype = grokfield (yyval.ttype, NULL_TREE, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, NULL_TREE)); ; break;} case 545: -#line 2499 "parse.y" +#line 2541 "parse.y" { yyval.ttype = do_class_using_decl (yyvsp[0].ttype); ; break;} case 546: -#line 2505 "parse.y" +#line 2547 "parse.y" { yyval.itype = 0; ; break;} case 547: -#line 2507 "parse.y" +#line 2549 "parse.y" { if (PROCESSING_REAL_TEMPLATE_DECL_P ()) yyvsp[0].ttype = finish_member_template_decl (yyvsp[0].ttype); @@ -6861,7 +6903,7 @@ case 547: ; break;} case 548: -#line 2514 "parse.y" +#line 2556 "parse.y" { check_multiple_declarators (); if (PROCESSING_REAL_TEMPLATE_DECL_P ()) @@ -6871,11 +6913,11 @@ case 548: ; break;} case 549: -#line 2525 "parse.y" +#line 2567 "parse.y" { yyval.itype = 0; ; break;} case 550: -#line 2527 "parse.y" +#line 2569 "parse.y" { if (PROCESSING_REAL_TEMPLATE_DECL_P ()) yyvsp[0].ttype = finish_member_template_decl (yyvsp[0].ttype); @@ -6884,7 +6926,7 @@ case 550: ; break;} case 551: -#line 2534 "parse.y" +#line 2576 "parse.y" { check_multiple_declarators (); if (PROCESSING_REAL_TEMPLATE_DECL_P ()) @@ -6894,86 +6936,75 @@ case 551: ; break;} case 556: -#line 2555 "parse.y" -{ frob_specs (yyvsp[-4].ftype.t, yyvsp[-4].ftype.lookups); - yyval.ttype = grokfield (yyval.ttype, current_declspecs, yyvsp[0].ttype, yyvsp[-2].ttype, - build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; +#line 2597 "parse.y" +{ yyval.ttype = parse_field0 (yyvsp[-3].ttype, yyvsp[-4].ftype.t, yyvsp[-4].ftype.lookups, + yyvsp[-1].ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 557: -#line 2559 "parse.y" -{ frob_specs (yyvsp[-4].ftype.t, yyvsp[-4].ftype.lookups); - yyval.ttype = grokbitfield (yyval.ttype, current_declspecs, yyvsp[-1].ttype); - cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; +#line 2600 "parse.y" +{ yyval.ttype = parse_bitfield0 (yyvsp[-3].ttype, yyvsp[-4].ftype.t, yyvsp[-4].ftype.lookups, + yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 558: -#line 2566 "parse.y" -{ frob_specs (yyvsp[-4].ftype.t, yyvsp[-4].ftype.lookups); - yyval.ttype = grokfield (yyval.ttype, current_declspecs, yyvsp[0].ttype, yyvsp[-2].ttype, - build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; +#line 2606 "parse.y" +{ yyval.ttype = parse_field0 (yyvsp[-3].ttype, yyvsp[-4].ftype.t, yyvsp[-4].ftype.lookups, + yyvsp[-1].ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 559: -#line 2570 "parse.y" -{ frob_specs (yyvsp[-4].ftype.t, yyvsp[-4].ftype.lookups); - yyval.ttype = grokfield (yyval.ttype, current_declspecs, yyvsp[0].ttype, yyvsp[-2].ttype, - build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; +#line 2609 "parse.y" +{ yyval.ttype = parse_field0 (yyvsp[-3].ttype, yyvsp[-4].ftype.t, yyvsp[-4].ftype.lookups, + yyvsp[-1].ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 560: -#line 2574 "parse.y" -{ frob_specs (yyvsp[-4].ftype.t, yyvsp[-4].ftype.lookups); - yyval.ttype = grokbitfield (yyval.ttype, current_declspecs, yyvsp[-1].ttype); - cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; +#line 2612 "parse.y" +{ yyval.ttype = parse_bitfield0 (yyvsp[-3].ttype, yyvsp[-4].ftype.t, yyvsp[-4].ftype.lookups, + yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 561: -#line 2578 "parse.y" -{ frob_specs (yyvsp[-3].ftype.t, yyvsp[-3].ftype.lookups); - yyval.ttype = grokbitfield (NULL_TREE, current_declspecs, yyvsp[-1].ttype); - cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; +#line 2615 "parse.y" +{ yyval.ttype = parse_bitfield0 (NULL_TREE, yyvsp[-3].ftype.t, + yyvsp[-3].ftype.lookups, yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 562: -#line 2585 "parse.y" -{ yyval.ttype = grokfield (yyval.ttype, current_declspecs, yyvsp[0].ttype, yyvsp[-2].ttype, - build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; +#line 2621 "parse.y" +{ yyval.ttype = parse_field (yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 563: -#line 2588 "parse.y" -{ yyval.ttype = grokbitfield (yyval.ttype, current_declspecs, yyvsp[-1].ttype); - cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; +#line 2623 "parse.y" +{ yyval.ttype = parse_bitfield (yyvsp[-3].ttype, yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 564: -#line 2594 "parse.y" -{ yyval.ttype = grokfield (yyval.ttype, current_declspecs, yyvsp[0].ttype, yyvsp[-2].ttype, - build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; +#line 2628 "parse.y" +{ yyval.ttype = parse_field (yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 565: -#line 2597 "parse.y" -{ yyval.ttype = grokbitfield (yyval.ttype, current_declspecs, yyvsp[-1].ttype); - cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; +#line 2630 "parse.y" +{ yyval.ttype = parse_bitfield (yyvsp[-3].ttype, yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 566: -#line 2600 "parse.y" -{ yyval.ttype = grokbitfield (NULL_TREE, current_declspecs, yyvsp[-1].ttype); - cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; +#line 2632 "parse.y" +{ yyval.ttype = parse_bitfield (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 571: -#line 2620 "parse.y" +#line 2651 "parse.y" { build_enumerator (yyvsp[0].ttype, NULL_TREE, current_enum_type); ; break;} case 572: -#line 2622 "parse.y" +#line 2653 "parse.y" { build_enumerator (yyvsp[-2].ttype, yyvsp[0].ttype, current_enum_type); ; break;} case 573: -#line 2628 "parse.y" +#line 2659 "parse.y" { yyval.ftype.t = build_decl_list (yyvsp[-1].ftype.t, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 574: -#line 2631 "parse.y" +#line 2662 "parse.y" { yyval.ftype.t = build_decl_list (yyvsp[0].ftype.t, NULL_TREE); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 575: -#line 2636 "parse.y" +#line 2667 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids array dimensions with parenthesized type in new"); @@ -6983,41 +7014,41 @@ case 575: ; break;} case 576: -#line 2647 "parse.y" +#line 2678 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 577: -#line 2649 "parse.y" +#line 2680 "parse.y" { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ; break;} case 578: -#line 2654 "parse.y" +#line 2685 "parse.y" { yyval.ftype.t = hash_tree_cons (NULL_TREE, yyvsp[0].ttype, NULL_TREE); yyval.ftype.new_type_flag = 0; ; break;} case 579: -#line 2657 "parse.y" +#line 2688 "parse.y" { yyval.ftype.t = hash_tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 580: -#line 2667 "parse.y" +#line 2698 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 581: -#line 2669 "parse.y" +#line 2700 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 582: -#line 2671 "parse.y" +#line 2702 "parse.y" { yyval.ttype = empty_parms (); ; break;} case 583: -#line 2673 "parse.y" +#line 2704 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 585: -#line 2681 "parse.y" +#line 2712 "parse.y" { /* Provide support for '(' attributes '*' declarator ')' etc */ @@ -7025,51 +7056,51 @@ case 585: ; break;} case 586: -#line 2691 "parse.y" +#line 2722 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 587: -#line 2693 "parse.y" +#line 2724 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 588: -#line 2695 "parse.y" +#line 2726 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 589: -#line 2697 "parse.y" +#line 2728 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 590: -#line 2699 "parse.y" +#line 2730 "parse.y" { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg); ; break;} case 592: -#line 2707 "parse.y" +#line 2738 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 593: -#line 2709 "parse.y" +#line 2740 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ; break;} case 594: -#line 2711 "parse.y" +#line 2742 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ; break;} case 595: -#line 2713 "parse.y" +#line 2744 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 596: -#line 2715 "parse.y" +#line 2746 "parse.y" { push_nested_class (yyvsp[-1].ttype, 3); yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); TREE_COMPLEXITY (yyval.ttype) = current_class_depth; ; break;} case 598: -#line 2723 "parse.y" +#line 2754 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) { @@ -7081,7 +7112,7 @@ case 598: ; break;} case 599: -#line 2733 "parse.y" +#line 2764 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) yyval.ttype = IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype); @@ -7091,15 +7122,15 @@ case 599: ; break;} case 602: -#line 2746 "parse.y" +#line 2777 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 603: -#line 2751 "parse.y" +#line 2782 "parse.y" { yyval.ttype = get_type_decl (yyvsp[0].ttype); ; break;} case 605: -#line 2760 "parse.y" +#line 2791 "parse.y" { /* Provide support for '(' attributes '*' declarator ')' etc */ @@ -7107,123 +7138,123 @@ case 605: ; break;} case 606: -#line 2769 "parse.y" +#line 2800 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 607: -#line 2771 "parse.y" +#line 2802 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 608: -#line 2773 "parse.y" +#line 2804 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 609: -#line 2775 "parse.y" +#line 2806 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 610: -#line 2777 "parse.y" +#line 2808 "parse.y" { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg); ; break;} case 612: -#line 2785 "parse.y" +#line 2816 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 613: -#line 2787 "parse.y" +#line 2818 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 614: -#line 2789 "parse.y" +#line 2820 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 615: -#line 2791 "parse.y" +#line 2822 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 616: -#line 2793 "parse.y" +#line 2824 "parse.y" { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg); ; break;} case 618: -#line 2801 "parse.y" +#line 2832 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 619: -#line 2803 "parse.y" +#line 2834 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 620: -#line 2805 "parse.y" +#line 2836 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ; break;} case 621: -#line 2807 "parse.y" +#line 2838 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ; break;} case 622: -#line 2809 "parse.y" +#line 2840 "parse.y" { enter_scope_of (yyvsp[0].ttype); ; break;} case 623: -#line 2811 "parse.y" +#line 2842 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); enter_scope_of (yyval.ttype); ; break;} case 624: -#line 2819 "parse.y" +#line 2850 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); ; break;} case 625: -#line 2822 "parse.y" +#line 2853 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 626: -#line 2828 "parse.y" +#line 2859 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); ; break;} case 627: -#line 2831 "parse.y" +#line 2862 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 629: -#line 2838 "parse.y" +#line 2869 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 630: -#line 2843 "parse.y" +#line 2874 "parse.y" { yyval.ttype = build_functional_cast (yyvsp[-3].ftype.t, yyvsp[-1].ttype); ; break;} case 631: -#line 2845 "parse.y" +#line 2876 "parse.y" { yyval.ttype = reparse_decl_as_expr (yyvsp[-3].ftype.t, yyvsp[-1].ttype); ; break;} case 632: -#line 2847 "parse.y" +#line 2878 "parse.y" { yyval.ttype = reparse_absdcl_as_expr (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 637: -#line 2859 "parse.y" +#line 2890 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 638: -#line 2861 "parse.y" +#line 2892 "parse.y" { got_scope = yyval.ttype = make_typename_type (yyvsp[-3].ttype, yyvsp[-1].ttype, /*complain=*/1); ; break;} case 639: -#line 2869 "parse.y" +#line 2900 "parse.y" { if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE) { @@ -7235,7 +7266,7 @@ case 639: ; break;} case 640: -#line 2879 "parse.y" +#line 2910 "parse.y" { if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -7243,7 +7274,7 @@ case 640: ; break;} case 641: -#line 2885 "parse.y" +#line 2916 "parse.y" { if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -7251,15 +7282,15 @@ case 641: ; break;} case 642: -#line 2891 "parse.y" +#line 2922 "parse.y" { got_scope = yyval.ttype = complete_type (TREE_TYPE (yyvsp[-1].ttype)); ; break;} case 644: -#line 2907 "parse.y" +#line 2938 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 645: -#line 2912 "parse.y" +#line 2943 "parse.y" { if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-1].ttype)) == 't') yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype, /*complain=*/1); @@ -7274,26 +7305,26 @@ case 645: ; break;} case 646: -#line 2925 "parse.y" +#line 2956 "parse.y" { yyval.ttype = TREE_TYPE (yyvsp[0].ttype); ; break;} case 647: -#line 2927 "parse.y" +#line 2958 "parse.y" { yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype, /*complain=*/1); ; break;} case 648: -#line 2929 "parse.y" +#line 2960 "parse.y" { yyval.ttype = make_typename_type (yyvsp[-2].ttype, yyvsp[0].ttype, /*complain=*/1); ; break;} case 649: -#line 2934 "parse.y" +#line 2965 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) cp_error ("`%T' is not a class or namespace", yyvsp[0].ttype); ; break;} case 650: -#line 2939 "parse.y" +#line 2970 "parse.y" { if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-1].ttype)) == 't') yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype, /*complain=*/1); @@ -7308,17 +7339,17 @@ case 650: ; break;} case 651: -#line 2952 "parse.y" +#line 2983 "parse.y" { got_scope = yyval.ttype = make_typename_type (yyvsp[-2].ttype, yyvsp[-1].ttype, /*complain=*/1); ; break;} case 652: -#line 2955 "parse.y" +#line 2986 "parse.y" { got_scope = yyval.ttype = make_typename_type (yyvsp[-3].ttype, yyvsp[-1].ttype, /*complain=*/1); ; break;} case 653: -#line 2961 "parse.y" +#line 2992 "parse.y" { if (TREE_CODE (yyvsp[-1].ttype) != IDENTIFIER_NODE) yyvsp[-1].ttype = lastiddecl; @@ -7332,7 +7363,7 @@ case 653: ; break;} case 654: -#line 2973 "parse.y" +#line 3004 "parse.y" { if (TREE_CODE (yyvsp[-1].ttype) != IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -7340,11 +7371,11 @@ case 654: ; break;} case 655: -#line 2979 "parse.y" +#line 3010 "parse.y" { got_scope = yyval.ttype = complete_type (TREE_TYPE (yyval.ttype)); ; break;} case 658: -#line 2983 "parse.y" +#line 3014 "parse.y" { if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -7352,11 +7383,11 @@ case 658: ; break;} case 659: -#line 2992 "parse.y" +#line 3023 "parse.y" { yyval.ttype = build_min_nt (TEMPLATE_ID_EXPR, yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 660: -#line 2997 "parse.y" +#line 3028 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) yyval.ttype = IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype); @@ -7366,59 +7397,59 @@ case 660: ; break;} case 662: -#line 3006 "parse.y" +#line 3037 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 663: -#line 3011 "parse.y" +#line 3042 "parse.y" { got_scope = NULL_TREE; ; break;} case 664: -#line 3013 "parse.y" +#line 3044 "parse.y" { yyval.ttype = yyvsp[-1].ttype; got_scope = NULL_TREE; ; break;} case 665: -#line 3020 "parse.y" +#line 3051 "parse.y" { got_scope = void_type_node; ; break;} case 666: -#line 3026 "parse.y" +#line 3057 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 667: -#line 3028 "parse.y" +#line 3059 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE); ; break;} case 668: -#line 3030 "parse.y" +#line 3061 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 669: -#line 3032 "parse.y" +#line 3063 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[0].ttype, NULL_TREE); ; break;} case 670: -#line 3034 "parse.y" +#line 3065 "parse.y" { tree arg = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, arg); ; break;} case 671: -#line 3038 "parse.y" +#line 3069 "parse.y" { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg); ; break;} case 673: -#line 3047 "parse.y" +#line 3078 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ; break;} case 674: -#line 3049 "parse.y" +#line 3080 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ; break;} case 676: -#line 3055 "parse.y" +#line 3086 "parse.y" { /* Provide support for '(' attributes '*' declarator ')' etc */ @@ -7426,96 +7457,96 @@ case 676: ; break;} case 677: -#line 3065 "parse.y" +#line 3096 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 678: -#line 3067 "parse.y" +#line 3098 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 679: -#line 3069 "parse.y" +#line 3100 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[0].ftype.t, NULL_TREE); ; break;} case 680: -#line 3071 "parse.y" +#line 3102 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, NULL_TREE); ; break;} case 681: -#line 3073 "parse.y" +#line 3104 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 682: -#line 3075 "parse.y" +#line 3106 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 683: -#line 3077 "parse.y" +#line 3108 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[0].ftype.t, NULL_TREE); ; break;} case 684: -#line 3079 "parse.y" +#line 3110 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, NULL_TREE); ; break;} case 685: -#line 3081 "parse.y" +#line 3112 "parse.y" { tree arg = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, arg); ; break;} case 686: -#line 3085 "parse.y" +#line 3116 "parse.y" { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg); ; break;} case 688: -#line 3094 "parse.y" +#line 3125 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 689: -#line 3097 "parse.y" +#line 3128 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 690: -#line 3099 "parse.y" +#line 3130 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 691: -#line 3101 "parse.y" +#line 3132 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ; break;} case 692: -#line 3103 "parse.y" +#line 3134 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ; break;} case 693: -#line 3105 "parse.y" +#line 3136 "parse.y" { yyval.ttype = make_call_declarator (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 694: -#line 3107 "parse.y" +#line 3138 "parse.y" { set_quals_and_spec (yyval.ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 695: -#line 3109 "parse.y" +#line 3140 "parse.y" { set_quals_and_spec (yyval.ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 696: -#line 3111 "parse.y" +#line 3142 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ; break;} case 697: -#line 3113 "parse.y" +#line 3144 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, NULL_TREE); ; break;} case 704: -#line 3136 "parse.y" +#line 3167 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids label declarations"); ; break;} case 707: -#line 3147 "parse.y" +#line 3178 "parse.y" { while (yyvsp[-1].ttype) { @@ -7525,193 +7556,193 @@ case 707: ; break;} case 708: -#line 3160 "parse.y" +#line 3191 "parse.y" {; break;} case 710: -#line 3166 "parse.y" +#line 3197 "parse.y" { yyval.ttype = begin_compound_stmt (0); ; break;} case 711: -#line 3168 "parse.y" +#line 3199 "parse.y" { yyval.ttype = finish_compound_stmt (0, yyvsp[-1].ttype); ; break;} case 712: -#line 3173 "parse.y" +#line 3204 "parse.y" { yyval.ttype = begin_if_stmt (); cond_stmt_keyword = "if"; ; break;} case 713: -#line 3178 "parse.y" +#line 3209 "parse.y" { finish_if_stmt_cond (yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 714: -#line 3180 "parse.y" +#line 3211 "parse.y" { yyval.ttype = finish_then_clause (yyvsp[-3].ttype); ; break;} case 716: -#line 3185 "parse.y" +#line 3216 "parse.y" { yyval.ttype = begin_compound_stmt (0); ; break;} case 717: -#line 3187 "parse.y" +#line 3218 "parse.y" { yyval.ttype = finish_compound_stmt (0, yyvsp[-1].ttype); ; break;} case 718: -#line 3192 "parse.y" +#line 3223 "parse.y" {; break;} case 720: -#line 3198 "parse.y" +#line 3229 "parse.y" { finish_stmt (); ; break;} case 721: -#line 3200 "parse.y" +#line 3231 "parse.y" { finish_expr_stmt (yyvsp[-1].ttype); ; break;} case 722: -#line 3202 "parse.y" +#line 3233 "parse.y" { begin_else_clause (); ; break;} case 723: -#line 3204 "parse.y" +#line 3235 "parse.y" { finish_else_clause (yyvsp[-3].ttype); finish_if_stmt (); ; break;} case 724: -#line 3209 "parse.y" +#line 3240 "parse.y" { finish_if_stmt (); ; break;} case 725: -#line 3211 "parse.y" +#line 3242 "parse.y" { yyval.ttype = begin_while_stmt (); cond_stmt_keyword = "while"; ; break;} case 726: -#line 3216 "parse.y" +#line 3247 "parse.y" { finish_while_stmt_cond (yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 727: -#line 3218 "parse.y" +#line 3249 "parse.y" { finish_while_stmt (yyvsp[-3].ttype); ; break;} case 728: -#line 3220 "parse.y" +#line 3251 "parse.y" { yyval.ttype = begin_do_stmt (); ; break;} case 729: -#line 3222 "parse.y" +#line 3253 "parse.y" { finish_do_body (yyvsp[-2].ttype); cond_stmt_keyword = "do"; ; break;} case 730: -#line 3227 "parse.y" +#line 3258 "parse.y" { finish_do_stmt (yyvsp[-1].ttype, yyvsp[-5].ttype); ; break;} case 731: -#line 3229 "parse.y" +#line 3260 "parse.y" { yyval.ttype = begin_for_stmt (); ; break;} case 732: -#line 3231 "parse.y" +#line 3262 "parse.y" { finish_for_init_stmt (yyvsp[-2].ttype); ; break;} case 733: -#line 3233 "parse.y" +#line 3264 "parse.y" { finish_for_cond (yyvsp[-1].ttype, yyvsp[-5].ttype); ; break;} case 734: -#line 3235 "parse.y" +#line 3266 "parse.y" { finish_for_expr (yyvsp[-1].ttype, yyvsp[-8].ttype); ; break;} case 735: -#line 3237 "parse.y" +#line 3268 "parse.y" { finish_for_stmt (yyvsp[-3].ttype, yyvsp[-10].ttype); ; break;} case 736: -#line 3239 "parse.y" +#line 3270 "parse.y" { yyval.ttype = begin_switch_stmt (); ; break;} case 737: -#line 3241 "parse.y" +#line 3272 "parse.y" { finish_switch_cond (yyvsp[-1].ttype, yyvsp[-3].ttype); ; break;} case 738: -#line 3243 "parse.y" +#line 3274 "parse.y" { finish_switch_stmt (yyvsp[-3].ttype, yyvsp[-5].ttype); ; break;} case 739: -#line 3245 "parse.y" +#line 3276 "parse.y" { finish_case_label (yyvsp[-1].ttype, NULL_TREE); ; break;} case 741: -#line 3248 "parse.y" +#line 3279 "parse.y" { finish_case_label (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 743: -#line 3251 "parse.y" +#line 3282 "parse.y" { finish_case_label (NULL_TREE, NULL_TREE); ; break;} case 745: -#line 3254 "parse.y" +#line 3285 "parse.y" { finish_break_stmt (); ; break;} case 746: -#line 3256 "parse.y" +#line 3287 "parse.y" { finish_continue_stmt (); ; break;} case 747: -#line 3258 "parse.y" +#line 3289 "parse.y" { finish_return_stmt (NULL_TREE); ; break;} case 748: -#line 3260 "parse.y" +#line 3291 "parse.y" { finish_return_stmt (yyvsp[-1].ttype); ; break;} case 749: -#line 3262 "parse.y" +#line 3293 "parse.y" { finish_asm_stmt (yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE, NULL_TREE, NULL_TREE); ; break;} case 750: -#line 3268 "parse.y" +#line 3299 "parse.y" { finish_asm_stmt (yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE, NULL_TREE); ; break;} case 751: -#line 3274 "parse.y" +#line 3305 "parse.y" { finish_asm_stmt (yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE); ; break;} case 752: -#line 3276 "parse.y" +#line 3307 "parse.y" { finish_asm_stmt (yyvsp[-6].ttype, yyvsp[-4].ttype, NULL_TREE, yyvsp[-2].ttype, NULL_TREE); ; break;} case 753: -#line 3280 "parse.y" +#line 3311 "parse.y" { finish_asm_stmt (yyvsp[-10].ttype, yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype); ; break;} case 754: -#line 3283 "parse.y" +#line 3314 "parse.y" { finish_asm_stmt (yyvsp[-8].ttype, yyvsp[-6].ttype, NULL_TREE, yyvsp[-4].ttype, yyvsp[-2].ttype); ; break;} case 755: -#line 3286 "parse.y" +#line 3317 "parse.y" { finish_asm_stmt (yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, NULL_TREE, yyvsp[-2].ttype); ; break;} case 756: -#line 3288 "parse.y" +#line 3319 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids computed gotos"); @@ -7719,67 +7750,67 @@ case 756: ; break;} case 757: -#line 3294 "parse.y" +#line 3325 "parse.y" { finish_goto_stmt (yyvsp[-1].ttype); ; break;} case 759: -#line 3297 "parse.y" +#line 3328 "parse.y" { error ("label must be followed by statement"); yyungetc ('}', 0); ; break;} case 760: -#line 3300 "parse.y" +#line 3331 "parse.y" { finish_stmt (); ; break;} case 763: -#line 3304 "parse.y" +#line 3335 "parse.y" { do_local_using_decl (yyvsp[0].ttype); ; break;} case 765: -#line 3310 "parse.y" +#line 3341 "parse.y" { yyval.ttype = begin_function_try_block (); ; break;} case 766: -#line 3312 "parse.y" +#line 3343 "parse.y" { finish_function_try_block (yyvsp[-2].ttype); ; break;} case 767: -#line 3314 "parse.y" +#line 3345 "parse.y" { finish_function_handler_sequence (yyvsp[-4].ttype); yyval.itype = yyvsp[-3].itype; ; break;} case 768: -#line 3322 "parse.y" +#line 3353 "parse.y" { yyval.ttype = begin_try_block (); ; break;} case 769: -#line 3324 "parse.y" +#line 3355 "parse.y" { finish_try_block (yyvsp[-1].ttype); ; break;} case 770: -#line 3326 "parse.y" +#line 3357 "parse.y" { finish_handler_sequence (yyvsp[-3].ttype); ; break;} case 773: -#line 3336 "parse.y" +#line 3367 "parse.y" { yyval.ttype = begin_handler(); ; break;} case 774: -#line 3338 "parse.y" +#line 3369 "parse.y" { yyval.ttype = finish_handler_parms (yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 775: -#line 3340 "parse.y" +#line 3371 "parse.y" { finish_handler (yyvsp[-1].ttype, yyvsp[-3].ttype); ; break;} case 778: -#line 3350 "parse.y" +#line 3381 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 779: -#line 3366 "parse.y" +#line 3397 "parse.y" { check_for_new_type ("inside exception declarations", yyvsp[-1].ftype); yyval.ttype = start_handler_parms (TREE_PURPOSE (yyvsp[-1].ftype.t), @@ -7787,102 +7818,102 @@ case 779: ; break;} case 780: -#line 3375 "parse.y" +#line 3406 "parse.y" { finish_label_stmt (yyvsp[-1].ttype); ; break;} case 781: -#line 3377 "parse.y" +#line 3408 "parse.y" { finish_label_stmt (yyvsp[-1].ttype); ; break;} case 782: -#line 3379 "parse.y" +#line 3410 "parse.y" { finish_label_stmt (yyvsp[-1].ttype); ; break;} case 783: -#line 3381 "parse.y" +#line 3412 "parse.y" { finish_label_stmt (yyvsp[-1].ttype); ; break;} case 784: -#line 3386 "parse.y" +#line 3417 "parse.y" { finish_expr_stmt (yyvsp[-1].ttype); ; break;} case 786: -#line 3389 "parse.y" +#line 3420 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids compound statements inside for initializations"); ; break;} case 787: -#line 3398 "parse.y" +#line 3429 "parse.y" { emit_line_note (input_filename, lineno); yyval.ttype = NULL_TREE; ; break;} case 788: -#line 3401 "parse.y" +#line 3432 "parse.y" { emit_line_note (input_filename, lineno); ; break;} case 789: -#line 3406 "parse.y" +#line 3437 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 791: -#line 3409 "parse.y" +#line 3440 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 792: -#line 3416 "parse.y" +#line 3447 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 795: -#line 3423 "parse.y" +#line 3454 "parse.y" { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ; break;} case 796: -#line 3428 "parse.y" +#line 3459 "parse.y" { yyval.ttype = build_tree_list (yyval.ttype, yyvsp[-1].ttype); ; break;} case 797: -#line 3433 "parse.y" +#line 3464 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, NULL_TREE); ; break;} case 798: -#line 3435 "parse.y" +#line 3466 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ; break;} case 799: -#line 3446 "parse.y" +#line 3477 "parse.y" { yyval.ttype = empty_parms(); ; break;} case 801: -#line 3451 "parse.y" +#line 3482 "parse.y" { yyval.ttype = finish_parmlist (build_tree_list (NULL_TREE, yyvsp[0].ftype.t), 0); check_for_new_type ("inside parameter list", yyvsp[0].ftype); ; break;} case 802: -#line 3459 "parse.y" +#line 3490 "parse.y" { yyval.ttype = finish_parmlist (yyval.ttype, 0); ; break;} case 803: -#line 3461 "parse.y" +#line 3492 "parse.y" { yyval.ttype = finish_parmlist (yyvsp[-1].ttype, 1); ; break;} case 804: -#line 3464 "parse.y" +#line 3495 "parse.y" { yyval.ttype = finish_parmlist (yyvsp[-1].ttype, 1); ; break;} case 805: -#line 3466 "parse.y" +#line 3497 "parse.y" { yyval.ttype = finish_parmlist (build_tree_list (NULL_TREE, yyvsp[-1].ftype.t), 1); ; break;} case 806: -#line 3469 "parse.y" +#line 3500 "parse.y" { yyval.ttype = finish_parmlist (NULL_TREE, 1); ; break;} case 807: -#line 3471 "parse.y" +#line 3502 "parse.y" { /* This helps us recover from really nasty parse errors, for example, a missing right @@ -7894,7 +7925,7 @@ case 807: ; break;} case 808: -#line 3481 "parse.y" +#line 3512 "parse.y" { /* This helps us recover from really nasty parse errors, for example, a missing right @@ -7907,99 +7938,99 @@ case 808: ; break;} case 809: -#line 3496 "parse.y" +#line 3527 "parse.y" { maybe_snarf_defarg (); ; break;} case 810: -#line 3498 "parse.y" +#line 3529 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 813: -#line 3509 "parse.y" +#line 3540 "parse.y" { check_for_new_type ("in a parameter list", yyvsp[0].ftype); yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ftype.t); ; break;} case 814: -#line 3512 "parse.y" +#line 3543 "parse.y" { check_for_new_type ("in a parameter list", yyvsp[-1].ftype); yyval.ttype = build_tree_list (yyvsp[0].ttype, yyvsp[-1].ftype.t); ; break;} case 815: -#line 3515 "parse.y" +#line 3546 "parse.y" { check_for_new_type ("in a parameter list", yyvsp[0].ftype); yyval.ttype = chainon (yyval.ttype, yyvsp[0].ftype.t); ; break;} case 816: -#line 3518 "parse.y" +#line 3549 "parse.y" { yyval.ttype = chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 817: -#line 3520 "parse.y" +#line 3551 "parse.y" { yyval.ttype = chainon (yyval.ttype, build_tree_list (yyvsp[0].ttype, yyvsp[-2].ttype)); ; break;} case 819: -#line 3526 "parse.y" +#line 3557 "parse.y" { check_for_new_type ("in a parameter list", yyvsp[-1].ftype); yyval.ttype = build_tree_list (NULL_TREE, yyvsp[-1].ftype.t); ; break;} case 820: -#line 3536 "parse.y" +#line 3567 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; yyval.ftype.t = build_tree_list (specs, yyvsp[0].ttype); ; break;} case 821: -#line 3540 "parse.y" +#line 3571 "parse.y" { yyval.ftype.t = build_tree_list (yyvsp[-1].ftype.t, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 822: -#line 3543 "parse.y" +#line 3574 "parse.y" { yyval.ftype.t = build_tree_list (build_decl_list (NULL_TREE, yyvsp[-1].ftype.t), yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 823: -#line 3547 "parse.y" +#line 3578 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ftype.t); yyval.ftype.t = build_tree_list (specs, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 824: -#line 3551 "parse.y" +#line 3582 "parse.y" { tree specs = strip_attrs (yyvsp[0].ftype.t); yyval.ftype.t = build_tree_list (specs, NULL_TREE); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 825: -#line 3555 "parse.y" +#line 3586 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ftype.t); yyval.ftype.t = build_tree_list (specs, yyvsp[0].ttype); yyval.ftype.new_type_flag = 0; ; break;} case 826: -#line 3562 "parse.y" +#line 3593 "parse.y" { yyval.ftype.t = build_tree_list (NULL_TREE, yyvsp[0].ftype.t); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 827: -#line 3565 "parse.y" +#line 3596 "parse.y" { yyval.ftype.t = build_tree_list (yyvsp[0].ttype, yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 830: -#line 3576 "parse.y" +#line 3607 "parse.y" { see_typename (); ; break;} case 831: -#line 3581 "parse.y" +#line 3612 "parse.y" { error ("type specifier omitted for parameter"); yyval.ttype = build_tree_list (integer_type_node, NULL_TREE); ; break;} case 832: -#line 3586 "parse.y" +#line 3617 "parse.y" { error ("type specifier omitted for parameter"); if (TREE_CODE (yyval.ttype) == SCOPE_REF @@ -8010,192 +8041,192 @@ case 832: ; break;} case 833: -#line 3598 "parse.y" +#line 3629 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 834: -#line 3600 "parse.y" +#line 3631 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 835: -#line 3602 "parse.y" +#line 3633 "parse.y" { yyval.ttype = empty_except_spec; ; break;} case 836: -#line 3607 "parse.y" +#line 3638 "parse.y" { check_for_new_type ("exception specifier", yyvsp[0].ftype); yyval.ttype = groktypename (yyvsp[0].ftype.t); ; break;} case 837: -#line 3615 "parse.y" +#line 3646 "parse.y" { yyval.ttype = add_exception_specifier (NULL_TREE, yyvsp[0].ttype, 1); ; break;} case 838: -#line 3617 "parse.y" +#line 3648 "parse.y" { yyval.ttype = add_exception_specifier (yyvsp[-2].ttype, yyvsp[0].ttype, 1); ; break;} case 839: -#line 3622 "parse.y" +#line 3653 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 840: -#line 3624 "parse.y" +#line 3655 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 841: -#line 3626 "parse.y" +#line 3657 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 842: -#line 3628 "parse.y" +#line 3659 "parse.y" { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg); ; break;} case 843: -#line 3635 "parse.y" +#line 3666 "parse.y" { got_scope = NULL_TREE; ; break;} case 844: -#line 3640 "parse.y" +#line 3671 "parse.y" { yyval.ttype = ansi_opname[MULT_EXPR]; ; break;} case 845: -#line 3642 "parse.y" +#line 3673 "parse.y" { yyval.ttype = ansi_opname[TRUNC_DIV_EXPR]; ; break;} case 846: -#line 3644 "parse.y" +#line 3675 "parse.y" { yyval.ttype = ansi_opname[TRUNC_MOD_EXPR]; ; break;} case 847: -#line 3646 "parse.y" +#line 3677 "parse.y" { yyval.ttype = ansi_opname[PLUS_EXPR]; ; break;} case 848: -#line 3648 "parse.y" +#line 3679 "parse.y" { yyval.ttype = ansi_opname[MINUS_EXPR]; ; break;} case 849: -#line 3650 "parse.y" +#line 3681 "parse.y" { yyval.ttype = ansi_opname[BIT_AND_EXPR]; ; break;} case 850: -#line 3652 "parse.y" +#line 3683 "parse.y" { yyval.ttype = ansi_opname[BIT_IOR_EXPR]; ; break;} case 851: -#line 3654 "parse.y" +#line 3685 "parse.y" { yyval.ttype = ansi_opname[BIT_XOR_EXPR]; ; break;} case 852: -#line 3656 "parse.y" +#line 3687 "parse.y" { yyval.ttype = ansi_opname[BIT_NOT_EXPR]; ; break;} case 853: -#line 3658 "parse.y" +#line 3689 "parse.y" { yyval.ttype = ansi_opname[COMPOUND_EXPR]; ; break;} case 854: -#line 3660 "parse.y" +#line 3691 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 855: -#line 3662 "parse.y" +#line 3693 "parse.y" { yyval.ttype = ansi_opname[LT_EXPR]; ; break;} case 856: -#line 3664 "parse.y" +#line 3695 "parse.y" { yyval.ttype = ansi_opname[GT_EXPR]; ; break;} case 857: -#line 3666 "parse.y" +#line 3697 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 858: -#line 3668 "parse.y" +#line 3699 "parse.y" { yyval.ttype = ansi_assopname[yyvsp[0].code]; ; break;} case 859: -#line 3670 "parse.y" +#line 3701 "parse.y" { yyval.ttype = ansi_opname [MODIFY_EXPR]; ; break;} case 860: -#line 3672 "parse.y" +#line 3703 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 861: -#line 3674 "parse.y" +#line 3705 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 862: -#line 3676 "parse.y" +#line 3707 "parse.y" { yyval.ttype = ansi_opname[POSTINCREMENT_EXPR]; ; break;} case 863: -#line 3678 "parse.y" +#line 3709 "parse.y" { yyval.ttype = ansi_opname[PREDECREMENT_EXPR]; ; break;} case 864: -#line 3680 "parse.y" +#line 3711 "parse.y" { yyval.ttype = ansi_opname[TRUTH_ANDIF_EXPR]; ; break;} case 865: -#line 3682 "parse.y" +#line 3713 "parse.y" { yyval.ttype = ansi_opname[TRUTH_ORIF_EXPR]; ; break;} case 866: -#line 3684 "parse.y" +#line 3715 "parse.y" { yyval.ttype = ansi_opname[TRUTH_NOT_EXPR]; ; break;} case 867: -#line 3686 "parse.y" +#line 3717 "parse.y" { yyval.ttype = ansi_opname[COND_EXPR]; ; break;} case 868: -#line 3688 "parse.y" +#line 3719 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 869: -#line 3690 "parse.y" +#line 3721 "parse.y" { yyval.ttype = ansi_opname[COMPONENT_REF]; ; break;} case 870: -#line 3692 "parse.y" +#line 3723 "parse.y" { yyval.ttype = ansi_opname[MEMBER_REF]; ; break;} case 871: -#line 3694 "parse.y" +#line 3725 "parse.y" { yyval.ttype = ansi_opname[CALL_EXPR]; ; break;} case 872: -#line 3696 "parse.y" +#line 3727 "parse.y" { yyval.ttype = ansi_opname[ARRAY_REF]; ; break;} case 873: -#line 3698 "parse.y" +#line 3729 "parse.y" { yyval.ttype = ansi_opname[NEW_EXPR]; ; break;} case 874: -#line 3700 "parse.y" +#line 3731 "parse.y" { yyval.ttype = ansi_opname[DELETE_EXPR]; ; break;} case 875: -#line 3702 "parse.y" +#line 3733 "parse.y" { yyval.ttype = ansi_opname[VEC_NEW_EXPR]; ; break;} case 876: -#line 3704 "parse.y" +#line 3735 "parse.y" { yyval.ttype = ansi_opname[VEC_DELETE_EXPR]; ; break;} case 877: -#line 3707 "parse.y" +#line 3738 "parse.y" { yyval.ttype = grokoptypename (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 878: -#line 3709 "parse.y" +#line 3740 "parse.y" { yyval.ttype = ansi_opname[ERROR_MARK]; ; break;} } @@ -8420,7 +8451,7 @@ yyerrhandle: } return 1; } -#line 3712 "parse.y" +#line 3743 "parse.y" #ifdef SPEW_DEBUG |