aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2000-06-16 15:35:10 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>2000-06-16 15:35:10 +0000
commitbf3428d0b60d92b52699e4def461ad33f5ae0ce6 (patch)
tree20ff6c673647b5b53fc1f7c318e25ca02c88d2d7
parent22c40c28b39c88652b3f25a51dfbf6b044f157d6 (diff)
downloadgcc-bf3428d0b60d92b52699e4def461ad33f5ae0ce6.zip
gcc-bf3428d0b60d92b52699e4def461ad33f5ae0ce6.tar.gz
gcc-bf3428d0b60d92b52699e4def461ad33f5ae0ce6.tar.bz2
cp-tree.h (finish_mem_initializers): Declare.
* cp-tree.h (finish_mem_initializers): Declare. (count_trees): Likewise. * parse.y (base_init): Use finish_mem_initializers. * semantics.c (finish_mem_initializers): New function. * tree.c (count_trees_r): Prototype. Use DATA parameter to store the number of trees. (n_trees): Remove. (count_trees): Don't use it. From-SVN: r34574
Diffstat
-rw-r--r--gcc/cp/ChangeLog12
-rw-r--r--gcc/cp/cp-tree.h2
-rw-r--r--gcc/cp/parse.c1408
-rw-r--r--gcc/cp/parse.y32
-rw-r--r--gcc/cp/semantics.c59
-rw-r--r--gcc/cp/tree.c11
6 files changed, 769 insertions, 755 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a6452ac..72e0172 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,15 @@
+2000-06-16 Mark Mitchell <mark@codesourcery.com>
+
+ * cp-tree.h (finish_mem_initializers): Declare.
+ (count_trees): Likewise.
+ * parse.y (base_init): Use finish_mem_initializers.
+ * semantics.c (finish_mem_initializers): New function.
+
+ * tree.c (count_trees_r): Prototype. Use DATA parameter to store
+ the number of trees.
+ (n_trees): Remove.
+ (count_trees): Don't use it.
+
2000-06-15 Jason Merrill <jason@redhat.com>
* tree.c (count_trees): New debugging function.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 79441dc..b73e873 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -4479,6 +4479,7 @@ extern void prep_stmt PARAMS ((tree));
extern tree add_scope_stmt PARAMS ((int, int));
extern void do_pushlevel PARAMS ((void));
extern tree do_poplevel PARAMS ((void));
+extern void finish_mem_initializers PARAMS ((tree));
/* in spew.c */
extern void init_spew PARAMS ((void));
@@ -4556,6 +4557,7 @@ extern void remap_save_expr PARAMS ((tree *, splay_tree, tre
cp_build_qualified_type_real ((TYPE), (QUALS), /*complain=*/1)
extern tree build_shared_int_cst PARAMS ((int));
extern special_function_kind special_function_p PARAMS ((tree));
+extern int count_trees PARAMS ((tree));
/* in typeck.c */
extern int string_conv_p PARAMS ((tree, tree, int));
diff --git a/gcc/cp/parse.c b/gcc/cp/parse.c
index 3a063f1..b9f5fb1 100644
--- a/gcc/cp/parse.c
+++ b/gcc/cp/parse.c
@@ -744,82 +744,82 @@ static const short yyrline[] = { 0,
734, 737, 739, 743, 746, 748, 752, 754, 756, 760,
762, 764, 768, 770, 772, 778, 783, 786, 789, 792,
797, 800, 802, 804, 810, 819, 822, 824, 826, 829,
- 831, 836, 845, 848, 850, 854, 894, 910, 916, 921,
- 932, 935, 942, 950, 952, 955, 957, 960, 964, 968,
- 972, 974, 975, 976, 977, 980, 982, 983, 986, 988,
- 989, 992, 997, 997, 1001, 1001, 1004, 1004, 1007, 1007,
- 1011, 1011, 1016, 1016, 1019, 1019, 1022, 1024, 1027, 1034,
- 1038, 1041, 1044, 1046, 1050, 1056, 1065, 1067, 1075, 1078,
- 1081, 1084, 1088, 1091, 1093, 1096, 1099, 1101, 1103, 1105,
- 1109, 1112, 1115, 1120, 1124, 1129, 1133, 1136, 1137, 1141,
- 1158, 1164, 1167, 1169, 1170, 1171, 1174, 1178, 1179, 1183,
- 1187, 1190, 1192, 1196, 1199, 1202, 1206, 1209, 1211, 1213,
- 1215, 1218, 1222, 1224, 1227, 1229, 1235, 1238, 1241, 1244,
- 1247, 1252, 1255, 1258, 1262, 1264, 1268, 1272, 1274, 1276,
- 1281, 1284, 1289, 1292, 1294, 1302, 1315, 1320, 1326, 1328,
- 1330, 1343, 1346, 1348, 1350, 1352, 1354, 1356, 1358, 1360,
- 1362, 1364, 1366, 1368, 1370, 1372, 1374, 1376, 1378, 1380,
- 1382, 1384, 1386, 1390, 1392, 1394, 1411, 1414, 1416, 1417,
- 1418, 1419, 1420, 1423, 1435, 1438, 1442, 1445, 1447, 1452,
- 1454, 1455, 1458, 1460, 1468, 1470, 1472, 1474, 1478, 1481,
- 1485, 1489, 1490, 1491, 1495, 1503, 1504, 1505, 1515, 1517,
- 1520, 1522, 1533, 1538, 1540, 1542, 1544, 1546, 1548, 1550,
- 1553, 1555, 1566, 1567, 1571, 1575, 1579, 1583, 1585, 1589,
- 1591, 1593, 1601, 1603, 1605, 1607, 1611, 1613, 1615, 1617,
- 1622, 1624, 1626, 1628, 1631, 1633, 1635, 1679, 1682, 1686,
- 1689, 1693, 1696, 1701, 1703, 1707, 1716, 1719, 1726, 1732,
- 1736, 1738, 1743, 1745, 1752, 1754, 1758, 1762, 1768, 1772,
- 1775, 1779, 1782, 1792, 1795, 1799, 1803, 1806, 1809, 1812,
- 1815, 1821, 1827, 1829, 1834, 1836, 1854, 1857, 1862, 1867,
- 1875, 1877, 1890, 1894, 1897, 1900, 1905, 1908, 1916, 1919,
- 1921, 1923, 1926, 1929, 1944, 1963, 1966, 1968, 1971, 1973,
- 1977, 1979, 1983, 1985, 1989, 1992, 1996, 2001, 2002, 2015,
- 2022, 2023, 2029, 2034, 2039, 2045, 2046, 2053, 2056, 2060,
- 2063, 2067, 2072, 2075, 2079, 2082, 2084, 2086, 2088, 2095,
- 2097, 2098, 2099, 2103, 2106, 2110, 2113, 2119, 2121, 2124,
- 2127, 2130, 2136, 2139, 2142, 2144, 2146, 2150, 2156, 2162,
- 2167, 2173, 2175, 2180, 2183, 2186, 2188, 2190, 2194, 2198,
- 2203, 2206, 2211, 2214, 2217, 2223, 2225, 2237, 2241, 2246,
- 2272, 2274, 2277, 2279, 2284, 2286, 2288, 2290, 2292, 2294,
- 2298, 2306, 2309, 2311, 2315, 2322, 2328, 2334, 2340, 2350,
- 2356, 2360, 2367, 2395, 2405, 2411, 2414, 2417, 2419, 2423,
- 2425, 2429, 2432, 2436, 2444, 2447, 2449, 2453, 2464, 2478,
- 2479, 2480, 2481, 2484, 2493, 2498, 2504, 2506, 2511, 2513,
- 2515, 2517, 2519, 2521, 2524, 2534, 2541, 2566, 2572, 2575,
- 2578, 2580, 2591, 2596, 2599, 2604, 2607, 2614, 2624, 2627,
- 2634, 2644, 2646, 2649, 2651, 2654, 2658, 2663, 2667, 2670,
- 2673, 2678, 2681, 2685, 2688, 2690, 2694, 2696, 2703, 2705,
- 2708, 2711, 2716, 2720, 2725, 2735, 2738, 2742, 2746, 2755,
- 2758, 2760, 2762, 2768, 2770, 2779, 2782, 2784, 2786, 2788,
- 2792, 2795, 2798, 2800, 2802, 2804, 2808, 2811, 2822, 2832,
- 2834, 2835, 2839, 2847, 2849, 2857, 2860, 2862, 2864, 2866,
- 2870, 2873, 2876, 2878, 2880, 2882, 2886, 2889, 2892, 2894,
- 2896, 2898, 2900, 2907, 2911, 2916, 2920, 2925, 2927, 2931,
- 2934, 2936, 2940, 2942, 2943, 2946, 2948, 2950, 2957, 2968,
- 2974, 2980, 2994, 2996, 3000, 3014, 3016, 3018, 3022, 3028,
- 3041, 3044, 3049, 3062, 3068, 3070, 3071, 3072, 3080, 3085,
- 3094, 3095, 3099, 3102, 3108, 3114, 3117, 3119, 3121, 3123,
- 3127, 3131, 3135, 3138, 3142, 3144, 3153, 3156, 3158, 3160,
- 3162, 3164, 3166, 3168, 3170, 3174, 3178, 3182, 3186, 3188,
- 3190, 3192, 3194, 3196, 3198, 3200, 3202, 3210, 3212, 3213,
- 3214, 3217, 3223, 3225, 3230, 3232, 3235, 3248, 3251, 3254,
- 3258, 3261, 3268, 3270, 3273, 3275, 3277, 3280, 3283, 3286,
- 3289, 3291, 3294, 3298, 3300, 3306, 3308, 3309, 3311, 3316,
- 3318, 3320, 3322, 3324, 3327, 3328, 3330, 3333, 3334, 3337,
- 3337, 3340, 3340, 3343, 3343, 3345, 3347, 3349, 3351, 3357,
- 3363, 3365, 3368, 3371, 3374, 3377, 3383, 3385, 3386, 3389,
- 3391, 3392, 3393, 3395, 3398, 3401, 3404, 3410, 3414, 3416,
- 3419, 3421, 3424, 3428, 3430, 3433, 3435, 3438, 3455, 3463,
- 3466, 3468, 3470, 3474, 3477, 3478, 3486, 3489, 3492, 3495,
- 3496, 3502, 3505, 3508, 3510, 3514, 3519, 3522, 3532, 3537,
- 3538, 3545, 3548, 3551, 3553, 3556, 3558, 3568, 3582, 3586,
- 3589, 3591, 3595, 3599, 3602, 3605, 3607, 3611, 3613, 3620,
- 3627, 3630, 3634, 3638, 3642, 3648, 3652, 3657, 3659, 3662,
- 3667, 3673, 3684, 3687, 3689, 3693, 3701, 3704, 3708, 3711,
- 3713, 3715, 3721, 3726, 3729, 3731, 3733, 3735, 3737, 3739,
- 3741, 3743, 3745, 3747, 3749, 3751, 3753, 3755, 3757, 3759,
- 3761, 3763, 3765, 3767, 3769, 3771, 3773, 3775, 3777, 3779,
- 3781, 3783, 3785, 3787, 3789, 3791, 3794, 3796
+ 831, 836, 845, 848, 850, 854, 864, 880, 886, 891,
+ 902, 905, 912, 920, 922, 925, 927, 930, 934, 938,
+ 942, 944, 945, 946, 947, 950, 952, 953, 956, 958,
+ 959, 962, 967, 967, 971, 971, 974, 974, 977, 977,
+ 981, 981, 986, 986, 989, 989, 992, 994, 997, 1004,
+ 1008, 1011, 1014, 1016, 1020, 1026, 1035, 1037, 1045, 1048,
+ 1051, 1054, 1058, 1061, 1063, 1066, 1069, 1071, 1073, 1075,
+ 1079, 1082, 1085, 1090, 1094, 1099, 1103, 1106, 1107, 1111,
+ 1128, 1134, 1137, 1139, 1140, 1141, 1144, 1148, 1149, 1153,
+ 1157, 1160, 1162, 1166, 1169, 1172, 1176, 1179, 1181, 1183,
+ 1185, 1188, 1192, 1194, 1197, 1199, 1205, 1208, 1211, 1214,
+ 1217, 1222, 1225, 1228, 1232, 1234, 1238, 1242, 1244, 1246,
+ 1251, 1254, 1259, 1262, 1264, 1272, 1285, 1290, 1296, 1298,
+ 1300, 1313, 1316, 1318, 1320, 1322, 1324, 1326, 1328, 1330,
+ 1332, 1334, 1336, 1338, 1340, 1342, 1344, 1346, 1348, 1350,
+ 1352, 1354, 1356, 1360, 1362, 1364, 1381, 1384, 1386, 1387,
+ 1388, 1389, 1390, 1393, 1405, 1408, 1412, 1415, 1417, 1422,
+ 1424, 1425, 1428, 1430, 1438, 1440, 1442, 1444, 1448, 1451,
+ 1455, 1459, 1460, 1461, 1465, 1473, 1474, 1475, 1485, 1487,
+ 1490, 1492, 1503, 1508, 1510, 1512, 1514, 1516, 1518, 1520,
+ 1523, 1525, 1536, 1537, 1541, 1545, 1549, 1553, 1555, 1559,
+ 1561, 1563, 1571, 1573, 1575, 1577, 1581, 1583, 1585, 1587,
+ 1592, 1594, 1596, 1598, 1601, 1603, 1605, 1649, 1652, 1656,
+ 1659, 1663, 1666, 1671, 1673, 1677, 1686, 1689, 1696, 1702,
+ 1706, 1708, 1713, 1715, 1722, 1724, 1728, 1732, 1738, 1742,
+ 1745, 1749, 1752, 1762, 1765, 1769, 1773, 1776, 1779, 1782,
+ 1785, 1791, 1797, 1799, 1804, 1806, 1824, 1827, 1832, 1837,
+ 1845, 1847, 1860, 1864, 1867, 1870, 1875, 1878, 1886, 1889,
+ 1891, 1893, 1896, 1899, 1914, 1933, 1936, 1938, 1941, 1943,
+ 1947, 1949, 1953, 1955, 1959, 1962, 1966, 1971, 1972, 1985,
+ 1992, 1993, 1999, 2004, 2009, 2015, 2016, 2023, 2026, 2030,
+ 2033, 2037, 2042, 2045, 2049, 2052, 2054, 2056, 2058, 2065,
+ 2067, 2068, 2069, 2073, 2076, 2080, 2083, 2089, 2091, 2094,
+ 2097, 2100, 2106, 2109, 2112, 2114, 2116, 2120, 2126, 2132,
+ 2137, 2143, 2145, 2150, 2153, 2156, 2158, 2160, 2164, 2168,
+ 2173, 2176, 2181, 2184, 2187, 2193, 2195, 2207, 2211, 2216,
+ 2242, 2244, 2247, 2249, 2254, 2256, 2258, 2260, 2262, 2264,
+ 2268, 2276, 2279, 2281, 2285, 2292, 2298, 2304, 2310, 2320,
+ 2326, 2330, 2337, 2365, 2375, 2381, 2384, 2387, 2389, 2393,
+ 2395, 2399, 2402, 2406, 2414, 2417, 2419, 2423, 2434, 2448,
+ 2449, 2450, 2451, 2454, 2463, 2468, 2474, 2476, 2481, 2483,
+ 2485, 2487, 2489, 2491, 2494, 2504, 2511, 2536, 2542, 2545,
+ 2548, 2550, 2561, 2566, 2569, 2574, 2577, 2584, 2594, 2597,
+ 2604, 2614, 2616, 2619, 2621, 2624, 2628, 2633, 2637, 2640,
+ 2643, 2648, 2651, 2655, 2658, 2660, 2664, 2666, 2673, 2675,
+ 2678, 2681, 2686, 2690, 2695, 2705, 2708, 2712, 2716, 2725,
+ 2728, 2730, 2732, 2738, 2740, 2749, 2752, 2754, 2756, 2758,
+ 2762, 2765, 2768, 2770, 2772, 2774, 2778, 2781, 2792, 2802,
+ 2804, 2805, 2809, 2817, 2819, 2827, 2830, 2832, 2834, 2836,
+ 2840, 2843, 2846, 2848, 2850, 2852, 2856, 2859, 2862, 2864,
+ 2866, 2868, 2870, 2877, 2881, 2886, 2890, 2895, 2897, 2901,
+ 2904, 2906, 2910, 2912, 2913, 2916, 2918, 2920, 2927, 2938,
+ 2944, 2950, 2964, 2966, 2970, 2984, 2986, 2988, 2992, 2998,
+ 3011, 3014, 3019, 3032, 3038, 3040, 3041, 3042, 3050, 3055,
+ 3064, 3065, 3069, 3072, 3078, 3084, 3087, 3089, 3091, 3093,
+ 3097, 3101, 3105, 3108, 3112, 3114, 3123, 3126, 3128, 3130,
+ 3132, 3134, 3136, 3138, 3140, 3144, 3148, 3152, 3156, 3158,
+ 3160, 3162, 3164, 3166, 3168, 3170, 3172, 3180, 3182, 3183,
+ 3184, 3187, 3193, 3195, 3200, 3202, 3205, 3218, 3221, 3224,
+ 3228, 3231, 3238, 3240, 3243, 3245, 3247, 3250, 3253, 3256,
+ 3259, 3261, 3264, 3268, 3270, 3276, 3278, 3279, 3281, 3286,
+ 3288, 3290, 3292, 3294, 3297, 3298, 3300, 3303, 3304, 3307,
+ 3307, 3310, 3310, 3313, 3313, 3315, 3317, 3319, 3321, 3327,
+ 3333, 3335, 3338, 3341, 3344, 3347, 3353, 3355, 3356, 3359,
+ 3361, 3362, 3363, 3365, 3368, 3371, 3374, 3380, 3384, 3386,
+ 3389, 3391, 3394, 3398, 3400, 3403, 3405, 3408, 3425, 3433,
+ 3436, 3438, 3440, 3444, 3447, 3448, 3456, 3459, 3462, 3465,
+ 3466, 3472, 3475, 3478, 3480, 3484, 3489, 3492, 3502, 3507,
+ 3508, 3515, 3518, 3521, 3523, 3526, 3528, 3538, 3552, 3556,
+ 3559, 3561, 3565, 3569, 3572, 3575, 3577, 3581, 3583, 3590,
+ 3597, 3600, 3604, 3608, 3612, 3618, 3622, 3627, 3629, 3632,
+ 3637, 3643, 3654, 3657, 3659, 3663, 3671, 3674, 3678, 3681,
+ 3683, 3685, 3691, 3696, 3699, 3701, 3703, 3705, 3707, 3709,
+ 3711, 3713, 3715, 3717, 3719, 3721, 3723, 3725, 3727, 3729,
+ 3731, 3733, 3735, 3737, 3739, 3741, 3743, 3745, 3747, 3749,
+ 3751, 3753, 3755, 3757, 3759, 3761, 3764, 3766
};
#endif
@@ -5076,44 +5076,14 @@ case 125:
case 126:
#line 856 "parse.y"
{
- tree member_init_list = NULL_TREE;
- tree base_init_list = NULL_TREE;
- tree init;
- tree next;
- int seen_member_init_p;
-
if (yyvsp[0].ftype.new_type_flag == 0)
error ("no base or member initializers given following ':'");
-
- seen_member_init_p = 0;
- for (init = yyvsp[0].ftype.t; init; init = next)
- {
- next = TREE_CHAIN (init);
- if (TREE_CODE (TREE_PURPOSE (init)) == FIELD_DECL)
- {
- TREE_CHAIN (init) = member_init_list;
- member_init_list = init;
- seen_member_init_p = 1;
- }
- else
- {
- if (warn_reorder && seen_member_init_p)
- {
- cp_warning ("base initializer for `%T'",
- TREE_PURPOSE (init));
- warning (" will be re-ordered to precede member initializations");
- }
-
- TREE_CHAIN (init) = base_init_list;
- base_init_list = init;
- }
- }
- setup_vtbl_ptr (member_init_list, base_init_list);
+ finish_mem_initializers (yyvsp[0].ftype.t);
;
break;}
case 127:
-#line 896 "parse.y"
+#line 866 "parse.y"
{
if (! current_function_parms_stored)
store_parm_decls ();
@@ -5128,21 +5098,21 @@ case 127:
;
break;}
case 128:
-#line 912 "parse.y"
+#line 882 "parse.y"
{
yyval.ftype.new_type_flag = 0;
yyval.ftype.t = NULL_TREE;
;
break;}
case 129:
-#line 917 "parse.y"
+#line 887 "parse.y"
{
yyval.ftype.new_type_flag = 1;
yyval.ftype.t = yyvsp[0].ttype;
;
break;}
case 130:
-#line 922 "parse.y"
+#line 892 "parse.y"
{
if (yyvsp[0].ttype)
{
@@ -5155,7 +5125,7 @@ case 130:
;
break;}
case 132:
-#line 937 "parse.y"
+#line 907 "parse.y"
{
if (current_class_name)
pedwarn ("anachronistic old style base class initializer");
@@ -5163,7 +5133,7 @@ case 132:
;
break;}
case 133:
-#line 943 "parse.y"
+#line 913 "parse.y"
{
if (current_class_name)
pedwarn ("anachronistic old style base class initializer");
@@ -5173,101 +5143,101 @@ case 133:
;
break;}
case 134:
-#line 951 "parse.y"
+#line 921 "parse.y"
{ yyval.ttype = expand_member_init (current_class_ref, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
break;}
case 135:
-#line 953 "parse.y"
+#line 923 "parse.y"
{ yyval.ttype = expand_member_init (current_class_ref, yyvsp[-1].ttype,
void_type_node); ;
break;}
case 136:
-#line 956 "parse.y"
+#line 926 "parse.y"
{ yyval.ttype = expand_member_init (current_class_ref, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
break;}
case 137:
-#line 958 "parse.y"
+#line 928 "parse.y"
{ yyval.ttype = expand_member_init (current_class_ref, yyvsp[-1].ttype,
void_type_node); ;
break;}
case 138:
-#line 961 "parse.y"
+#line 931 "parse.y"
{ yyval.ttype = expand_member_init (current_class_ref,
TYPE_MAIN_DECL (yyvsp[-3].ttype),
yyvsp[-1].ttype); ;
break;}
case 139:
-#line 965 "parse.y"
+#line 935 "parse.y"
{ yyval.ttype = expand_member_init (current_class_ref,
TYPE_MAIN_DECL (yyvsp[-1].ttype),
void_type_node); ;
break;}
case 140:
-#line 969 "parse.y"
+#line 939 "parse.y"
{ yyval.ttype = NULL_TREE ;
break;}
case 152:
-#line 994 "parse.y"
+#line 964 "parse.y"
{ do_type_instantiation (yyvsp[-1].ftype.t, NULL_TREE);
yyungetc (';', 1); ;
break;}
case 154:
-#line 998 "parse.y"
+#line 968 "parse.y"
{ tree specs = strip_attrs (yyvsp[-1].ftype.t);
do_decl_instantiation (specs, yyvsp[0].ttype, NULL_TREE); ;
break;}
case 156:
-#line 1002 "parse.y"
+#line 972 "parse.y"
{ do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ;
break;}
case 158:
-#line 1005 "parse.y"
+#line 975 "parse.y"
{ do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ;
break;}
case 160:
-#line 1008 "parse.y"
+#line 978 "parse.y"
{ do_type_instantiation (yyvsp[-1].ftype.t, yyvsp[-4].ttype);
yyungetc (';', 1); ;
break;}
case 162:
-#line 1013 "parse.y"
+#line 983 "parse.y"
{ tree specs = strip_attrs (yyvsp[-1].ftype.t);
do_decl_instantiation (specs, yyvsp[0].ttype, yyvsp[-4].ttype); ;
break;}
case 164:
-#line 1017 "parse.y"
+#line 987 "parse.y"
{ do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, yyvsp[-3].ttype); ;
break;}
case 166:
-#line 1020 "parse.y"
+#line 990 "parse.y"
{ do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, yyvsp[-3].ttype); ;
break;}
case 168:
-#line 1025 "parse.y"
+#line 995 "parse.y"
{ begin_explicit_instantiation(); ;
break;}
case 169:
-#line 1028 "parse.y"
+#line 998 "parse.y"
{ end_explicit_instantiation(); ;
break;}
case 170:
-#line 1037 "parse.y"
+#line 1007 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 171:
-#line 1040 "parse.y"
+#line 1010 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 174:
-#line 1048 "parse.y"
+#line 1018 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 175:
-#line 1053 "parse.y"
+#line 1023 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 176:
-#line 1057 "parse.y"
+#line 1027 "parse.y"
{
if (yychar == YYEMPTY)
yychar = YYLEX;
@@ -5277,7 +5247,7 @@ case 176:
;
break;}
case 178:
-#line 1068 "parse.y"
+#line 1038 "parse.y"
{
/* Handle `Class<Class<Type>>' without space in the `>>' */
pedwarn ("`>>' should be `> >' in template class name");
@@ -5285,79 +5255,79 @@ case 178:
;
break;}
case 179:
-#line 1077 "parse.y"
+#line 1047 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 181:
-#line 1083 "parse.y"
+#line 1053 "parse.y"
{ yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ;
break;}
case 182:
-#line 1085 "parse.y"
+#line 1055 "parse.y"
{ yyval.ttype = chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
break;}
case 183:
-#line 1090 "parse.y"
+#line 1060 "parse.y"
{ yyval.ttype = groktypename (yyvsp[0].ftype.t); ;
break;}
case 184:
-#line 1092 "parse.y"
+#line 1062 "parse.y"
{ yyval.ttype = lastiddecl; ;
break;}
case 186:
-#line 1098 "parse.y"
+#line 1068 "parse.y"
{ yyval.code = NEGATE_EXPR; ;
break;}
case 187:
-#line 1100 "parse.y"
+#line 1070 "parse.y"
{ yyval.code = CONVERT_EXPR; ;
break;}
case 188:
-#line 1102 "parse.y"
+#line 1072 "parse.y"
{ yyval.code = PREINCREMENT_EXPR; ;
break;}
case 189:
-#line 1104 "parse.y"
+#line 1074 "parse.y"
{ yyval.code = PREDECREMENT_EXPR; ;
break;}
case 190:
-#line 1106 "parse.y"
+#line 1076 "parse.y"
{ yyval.code = TRUTH_NOT_EXPR; ;
break;}
case 191:
-#line 1111 "parse.y"
+#line 1081 "parse.y"
{ yyval.ttype = build_x_compound_expr (yyval.ttype); ;
break;}
case 193:
-#line 1117 "parse.y"
+#line 1087 "parse.y"
{ error ("ISO C++ forbids an empty condition for `%s'",
cond_stmt_keyword);
yyval.ttype = integer_zero_node; ;
break;}
case 194:
-#line 1121 "parse.y"
+#line 1091 "parse.y"
{ yyval.ttype = yyvsp[-1].ttype; ;
break;}
case 195:
-#line 1126 "parse.y"
+#line 1096 "parse.y"
{ error ("ISO C++ forbids an empty condition for `%s'",
cond_stmt_keyword);
yyval.ttype = integer_zero_node; ;
break;}
case 196:
-#line 1130 "parse.y"
+#line 1100 "parse.y"
{ yyval.ttype = yyvsp[-1].ttype; ;
break;}
case 197:
-#line 1135 "parse.y"
+#line 1105 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 199:
-#line 1138 "parse.y"
+#line 1108 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 200:
-#line 1143 "parse.y"
+#line 1113 "parse.y"
{ {
tree d;
for (d = getdecls (); d; d = TREE_CHAIN (d))
@@ -5374,7 +5344,7 @@ case 200:
;
break;}
case 201:
-#line 1158 "parse.y"
+#line 1128 "parse.y"
{
parse_end_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-3].ttype);
yyval.ttype = convert_from_reference (yyvsp[-1].ttype);
@@ -5383,180 +5353,180 @@ case 201:
;
break;}
case 207:
-#line 1176 "parse.y"
+#line 1146 "parse.y"
{ yyval.ttype = begin_compound_stmt (1); ;
break;}
case 208:
-#line 1178 "parse.y"
+#line 1148 "parse.y"
{ finish_compound_stmt (1, yyvsp[-1].ttype); ;
break;}
case 210:
-#line 1185 "parse.y"
+#line 1155 "parse.y"
{ yyval.ttype = tree_cons (NULL_TREE, yyval.ttype,
build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
break;}
case 211:
-#line 1188 "parse.y"
+#line 1158 "parse.y"
{ yyval.ttype = tree_cons (NULL_TREE, yyval.ttype,
build_tree_list (NULL_TREE, error_mark_node)); ;
break;}
case 212:
-#line 1191 "parse.y"
+#line 1161 "parse.y"
{ chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
break;}
case 213:
-#line 1193 "parse.y"
+#line 1163 "parse.y"
{ chainon (yyval.ttype, build_tree_list (NULL_TREE, error_mark_node)); ;
break;}
case 214:
-#line 1198 "parse.y"
+#line 1168 "parse.y"
{ yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ;
break;}
case 216:
-#line 1204 "parse.y"
+#line 1174 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 217:
-#line 1207 "parse.y"
+#line 1177 "parse.y"
{ yyval.ttype = yyvsp[0].ttype;
pedantic = yyvsp[-1].itype; ;
break;}
case 218:
-#line 1210 "parse.y"
+#line 1180 "parse.y"
{ yyval.ttype = build_x_indirect_ref (yyvsp[0].ttype, "unary *"); ;
break;}
case 219:
-#line 1212 "parse.y"
+#line 1182 "parse.y"
{ yyval.ttype = build_x_unary_op (ADDR_EXPR, yyvsp[0].ttype); ;
break;}
case 220:
-#line 1214 "parse.y"
+#line 1184 "parse.y"
{ yyval.ttype = build_x_unary_op (BIT_NOT_EXPR, yyvsp[0].ttype); ;
break;}
case 221:
-#line 1216 "parse.y"
+#line 1186 "parse.y"
{ yyval.ttype = finish_unary_op_expr (yyvsp[-1].code, yyvsp[0].ttype); ;
break;}
case 222:
-#line 1219 "parse.y"
+#line 1189 "parse.y"
{ if (pedantic)
pedwarn ("ISO C++ forbids `&&'");
yyval.ttype = finish_label_address_expr (yyvsp[0].ttype); ;
break;}
case 223:
-#line 1223 "parse.y"
+#line 1193 "parse.y"
{ yyval.ttype = expr_sizeof (yyvsp[0].ttype); ;
break;}
case 224:
-#line 1225 "parse.y"
+#line 1195 "parse.y"
{ yyval.ttype = c_sizeof (groktypename (yyvsp[-1].ftype.t));
check_for_new_type ("sizeof", yyvsp[-1].ftype); ;
break;}
case 225:
-#line 1228 "parse.y"
+#line 1198 "parse.y"
{ yyval.ttype = grok_alignof (yyvsp[0].ttype); ;
break;}
case 226:
-#line 1230 "parse.y"
+#line 1200 "parse.y"
{ yyval.ttype = c_alignof (groktypename (yyvsp[-1].ftype.t));
check_for_new_type ("alignof", yyvsp[-1].ftype); ;
break;}
case 227:
-#line 1236 "parse.y"
+#line 1206 "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 1239 "parse.y"
+#line 1209 "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 1242 "parse.y"
+#line 1212 "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 1245 "parse.y"
+#line 1215 "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 1249 "parse.y"
+#line 1219 "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 1253 "parse.y"
+#line 1223 "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 1256 "parse.y"
+#line 1226 "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 1259 "parse.y"
+#line 1229 "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 1263 "parse.y"
+#line 1233 "parse.y"
{ yyval.ttype = delete_sanity (yyvsp[0].ttype, NULL_TREE, 0, yyvsp[-1].itype); ;
break;}
case 236:
-#line 1265 "parse.y"
+#line 1235 "parse.y"
{ yyval.ttype = delete_sanity (yyvsp[0].ttype, NULL_TREE, 1, yyvsp[-3].itype);
if (yychar == YYEMPTY)
yychar = YYLEX; ;
break;}
case 237:
-#line 1269 "parse.y"
+#line 1239 "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 1273 "parse.y"
+#line 1243 "parse.y"
{ yyval.ttype = build_x_unary_op (REALPART_EXPR, yyvsp[0].ttype); ;
break;}
case 239:
-#line 1275 "parse.y"
+#line 1245 "parse.y"
{ yyval.ttype = build_x_unary_op (IMAGPART_EXPR, yyvsp[0].ttype); ;
break;}
case 240:
-#line 1277 "parse.y"
+#line 1247 "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 1283 "parse.y"
+#line 1253 "parse.y"
{ yyval.ttype = yyvsp[-1].ttype; ;
break;}
case 242:
-#line 1285 "parse.y"
+#line 1255 "parse.y"
{ cp_pedwarn ("old style placement syntax, use () instead");
yyval.ttype = yyvsp[-1].ttype; ;
break;}
case 243:
-#line 1291 "parse.y"
+#line 1261 "parse.y"
{ yyval.ttype = yyvsp[-1].ttype; ;
break;}
case 244:
-#line 1293 "parse.y"
+#line 1263 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 245:
-#line 1295 "parse.y"
+#line 1265 "parse.y"
{
cp_error ("`%T' is not a valid expression", yyvsp[-1].ftype.t);
yyval.ttype = error_mark_node;
;
break;}
case 246:
-#line 1303 "parse.y"
+#line 1273 "parse.y"
{
if (pedantic)
pedwarn ("ISO C++ forbids initialization of new expression with `='");
@@ -5568,23 +5538,23 @@ case 246:
;
break;}
case 247:
-#line 1317 "parse.y"
+#line 1287 "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 1321 "parse.y"
+#line 1291 "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 1329 "parse.y"
+#line 1299 "parse.y"
{ yyval.ttype = reparse_absdcl_as_casts (yyval.ttype, yyvsp[0].ttype); ;
break;}
case 251:
-#line 1331 "parse.y"
+#line 1301 "parse.y"
{
tree init = build_nt (CONSTRUCTOR, NULL_TREE,
nreverse (yyvsp[-2].ttype));
@@ -5597,113 +5567,113 @@ case 251:
;
break;}
case 253:
-#line 1347 "parse.y"
+#line 1317 "parse.y"
{ yyval.ttype = build_x_binary_op (MEMBER_REF, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 254:
-#line 1349 "parse.y"
+#line 1319 "parse.y"
{ yyval.ttype = build_m_component_ref (yyval.ttype, yyvsp[0].ttype); ;
break;}
case 255:
-#line 1351 "parse.y"
+#line 1321 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 256:
-#line 1353 "parse.y"
+#line 1323 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 257:
-#line 1355 "parse.y"
+#line 1325 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 258:
-#line 1357 "parse.y"
+#line 1327 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 259:
-#line 1359 "parse.y"
+#line 1329 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 260:
-#line 1361 "parse.y"
+#line 1331 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 261:
-#line 1363 "parse.y"
+#line 1333 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 262:
-#line 1365 "parse.y"
+#line 1335 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 263:
-#line 1367 "parse.y"
+#line 1337 "parse.y"
{ yyval.ttype = build_x_binary_op (LT_EXPR, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 264:
-#line 1369 "parse.y"
+#line 1339 "parse.y"
{ yyval.ttype = build_x_binary_op (GT_EXPR, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 265:
-#line 1371 "parse.y"
+#line 1341 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 266:
-#line 1373 "parse.y"
+#line 1343 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 267:
-#line 1375 "parse.y"
+#line 1345 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 268:
-#line 1377 "parse.y"
+#line 1347 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 269:
-#line 1379 "parse.y"
+#line 1349 "parse.y"
{ yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 270:
-#line 1381 "parse.y"
+#line 1351 "parse.y"
{ yyval.ttype = build_x_binary_op (TRUTH_ANDIF_EXPR, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 271:
-#line 1383 "parse.y"
+#line 1353 "parse.y"
{ yyval.ttype = build_x_binary_op (TRUTH_ORIF_EXPR, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 272:
-#line 1385 "parse.y"
+#line 1355 "parse.y"
{ yyval.ttype = build_x_conditional_expr (yyval.ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ;
break;}
case 273:
-#line 1387 "parse.y"
+#line 1357 "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 1391 "parse.y"
+#line 1361 "parse.y"
{ yyval.ttype = build_x_modify_expr (yyval.ttype, yyvsp[-1].code, yyvsp[0].ttype); ;
break;}
case 275:
-#line 1393 "parse.y"
+#line 1363 "parse.y"
{ yyval.ttype = build_throw (NULL_TREE); ;
break;}
case 276:
-#line 1395 "parse.y"
+#line 1365 "parse.y"
{ yyval.ttype = build_throw (yyvsp[0].ttype); ;
break;}
case 277:
-#line 1413 "parse.y"
+#line 1383 "parse.y"
{ yyval.ttype = build_parse_node (BIT_NOT_EXPR, yyvsp[0].ttype); ;
break;}
case 278:
-#line 1415 "parse.y"
+#line 1385 "parse.y"
{ yyval.ttype = build_parse_node (BIT_NOT_EXPR, yyvsp[0].ttype); ;
break;}
case 284:
-#line 1424 "parse.y"
+#line 1394 "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
@@ -5716,27 +5686,27 @@ case 284:
;
break;}
case 285:
-#line 1437 "parse.y"
+#line 1407 "parse.y"
{ yyval.ttype = lookup_template_function (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
break;}
case 286:
-#line 1439 "parse.y"
+#line 1409 "parse.y"
{ yyval.ttype = lookup_template_function (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
break;}
case 287:
-#line 1444 "parse.y"
+#line 1414 "parse.y"
{ yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
break;}
case 288:
-#line 1446 "parse.y"
+#line 1416 "parse.y"
{ yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
break;}
case 289:
-#line 1449 "parse.y"
+#line 1419 "parse.y"
{ yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
break;}
case 294:
-#line 1461 "parse.y"
+#line 1431 "parse.y"
{
/* Provide support for '(' attributes '*' declarator ')'
etc */
@@ -5744,31 +5714,31 @@ case 294:
;
break;}
case 296:
-#line 1471 "parse.y"
+#line 1441 "parse.y"
{ yyval.ttype = build_parse_node (INDIRECT_REF, yyvsp[0].ttype); ;
break;}
case 297:
-#line 1473 "parse.y"
+#line 1443 "parse.y"
{ yyval.ttype = build_parse_node (ADDR_EXPR, yyvsp[0].ttype); ;
break;}
case 298:
-#line 1475 "parse.y"
+#line 1445 "parse.y"
{ yyval.ttype = yyvsp[-1].ttype; ;
break;}
case 299:
-#line 1480 "parse.y"
+#line 1450 "parse.y"
{ yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
break;}
case 300:
-#line 1482 "parse.y"
+#line 1452 "parse.y"
{ yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
break;}
case 304:
-#line 1492 "parse.y"
+#line 1462 "parse.y"
{ yyval.ttype = finish_decl_parsing (yyvsp[-1].ttype); ;
break;}
case 305:
-#line 1497 "parse.y"
+#line 1467 "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));
@@ -5777,7 +5747,7 @@ case 305:
;
break;}
case 308:
-#line 1506 "parse.y"
+#line 1476 "parse.y"
{
yyval.ttype = combine_strings (yyval.ttype);
/* combine_strings doesn't set up TYPE_MAIN_VARIANT of
@@ -5789,20 +5759,20 @@ case 308:
;
break;}
case 309:
-#line 1516 "parse.y"
+#line 1486 "parse.y"
{ yyval.ttype = finish_parenthesized_expr (yyvsp[-1].ttype); ;
break;}
case 310:
-#line 1518 "parse.y"
+#line 1488 "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 1521 "parse.y"
+#line 1491 "parse.y"
{ yyval.ttype = error_mark_node; ;
break;}
case 312:
-#line 1523 "parse.y"
+#line 1493 "parse.y"
{ tree scope = current_scope ();
if (!scope || TREE_CODE (scope) != FUNCTION_DECL)
{
@@ -5815,43 +5785,43 @@ case 312:
;
break;}
case 313:
-#line 1534 "parse.y"
+#line 1504 "parse.y"
{ yyval.ttype = finish_stmt_expr (yyvsp[-2].ttype); ;
break;}
case 314:
-#line 1539 "parse.y"
+#line 1509 "parse.y"
{ yyval.ttype = finish_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype, 1); ;
break;}
case 315:
-#line 1541 "parse.y"
+#line 1511 "parse.y"
{ yyval.ttype = finish_call_expr (yyvsp[-1].ttype, NULL_TREE, 1); ;
break;}
case 316:
-#line 1543 "parse.y"
+#line 1513 "parse.y"
{ yyval.ttype = finish_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype, 0); ;
break;}
case 317:
-#line 1545 "parse.y"
+#line 1515 "parse.y"
{ yyval.ttype = finish_call_expr (yyvsp[-1].ttype, NULL_TREE, 0); ;
break;}
case 318:
-#line 1547 "parse.y"
+#line 1517 "parse.y"
{ yyval.ttype = grok_array_decl (yyval.ttype, yyvsp[-1].ttype); ;
break;}
case 319:
-#line 1549 "parse.y"
+#line 1519 "parse.y"
{ yyval.ttype = finish_increment_expr (yyvsp[-1].ttype, POSTINCREMENT_EXPR); ;
break;}
case 320:
-#line 1551 "parse.y"
+#line 1521 "parse.y"
{ yyval.ttype = finish_increment_expr (yyvsp[-1].ttype, POSTDECREMENT_EXPR); ;
break;}
case 321:
-#line 1554 "parse.y"
+#line 1524 "parse.y"
{ yyval.ttype = finish_this_expr (); ;
break;}
case 322:
-#line 1556 "parse.y"
+#line 1526 "parse.y"
{
/* This is a C cast in C++'s `functional' notation
using the "implicit int" extension so that:
@@ -5864,49 +5834,49 @@ case 322:
;
break;}
case 324:
-#line 1568 "parse.y"
+#line 1538 "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 1572 "parse.y"
+#line 1542 "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 1576 "parse.y"
+#line 1546 "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 1580 "parse.y"
+#line 1550 "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 1584 "parse.y"
+#line 1554 "parse.y"
{ yyval.ttype = build_typeid (yyvsp[-1].ttype); ;
break;}
case 329:
-#line 1586 "parse.y"
+#line 1556 "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 1590 "parse.y"
+#line 1560 "parse.y"
{ yyval.ttype = do_scoped_id (yyvsp[0].ttype, 1); ;
break;}
case 331:
-#line 1592 "parse.y"
+#line 1562 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 332:
-#line 1594 "parse.y"
+#line 1564 "parse.y"
{
got_scope = NULL_TREE;
if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
@@ -5916,102 +5886,102 @@ case 332:
;
break;}
case 333:
-#line 1602 "parse.y"
+#line 1572 "parse.y"
{ yyval.ttype = build_offset_ref (OP0 (yyval.ttype), OP1 (yyval.ttype)); ;
break;}
case 334:
-#line 1604 "parse.y"
+#line 1574 "parse.y"
{ yyval.ttype = finish_qualified_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
break;}
case 335:
-#line 1606 "parse.y"
+#line 1576 "parse.y"
{ yyval.ttype = finish_qualified_call_expr (yyvsp[-1].ttype, NULL_TREE); ;
break;}
case 336:
-#line 1608 "parse.y"
+#line 1578 "parse.y"
{
yyval.ttype = build_x_component_ref (yyval.ttype, yyvsp[0].ttype, NULL_TREE, 1);
;
break;}
case 337:
-#line 1612 "parse.y"
+#line 1582 "parse.y"
{ yyval.ttype = finish_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ;
break;}
case 338:
-#line 1614 "parse.y"
+#line 1584 "parse.y"
{ yyval.ttype = finish_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ;
break;}
case 339:
-#line 1616 "parse.y"
+#line 1586 "parse.y"
{ yyval.ttype = build_x_component_ref (yyval.ttype, yyvsp[0].ttype, NULL_TREE, 1); ;
break;}
case 340:
-#line 1618 "parse.y"
+#line 1588 "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 1623 "parse.y"
+#line 1593 "parse.y"
{ yyval.ttype = finish_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ;
break;}
case 342:
-#line 1625 "parse.y"
+#line 1595 "parse.y"
{ yyval.ttype = finish_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ;
break;}
case 343:
-#line 1627 "parse.y"
+#line 1597 "parse.y"
{ yyval.ttype = finish_qualified_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ;
break;}
case 344:
-#line 1629 "parse.y"
+#line 1599 "parse.y"
{ yyval.ttype = finish_qualified_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ;
break;}
case 345:
-#line 1632 "parse.y"
+#line 1602 "parse.y"
{ yyval.ttype = finish_pseudo_destructor_call_expr (yyvsp[-3].ttype, NULL_TREE, yyvsp[-1].ttype); ;
break;}
case 346:
-#line 1634 "parse.y"
+#line 1604 "parse.y"
{ yyval.ttype = finish_pseudo_destructor_call_expr (yyvsp[-5].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ;
break;}
case 347:
-#line 1636 "parse.y"
+#line 1606 "parse.y"
{
yyval.ttype = error_mark_node;
;
break;}
case 348:
-#line 1681 "parse.y"
+#line 1651 "parse.y"
{ yyval.itype = 0; ;
break;}
case 349:
-#line 1683 "parse.y"
+#line 1653 "parse.y"
{ got_scope = NULL_TREE; yyval.itype = 1; ;
break;}
case 350:
-#line 1688 "parse.y"
+#line 1658 "parse.y"
{ yyval.itype = 0; ;
break;}
case 351:
-#line 1690 "parse.y"
+#line 1660 "parse.y"
{ got_scope = NULL_TREE; yyval.itype = 1; ;
break;}
case 352:
-#line 1695 "parse.y"
+#line 1665 "parse.y"
{ yyval.ttype = boolean_true_node; ;
break;}
case 353:
-#line 1697 "parse.y"
+#line 1667 "parse.y"
{ yyval.ttype = boolean_false_node; ;
break;}
case 355:
-#line 1704 "parse.y"
+#line 1674 "parse.y"
{ yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ;
break;}
case 356:
-#line 1709 "parse.y"
+#line 1679 "parse.y"
{
if (! current_function_parms_stored)
store_parm_decls ();
@@ -6019,169 +5989,169 @@ case 356:
;
break;}
case 357:
-#line 1718 "parse.y"
+#line 1688 "parse.y"
{ got_object = TREE_TYPE (yyval.ttype); ;
break;}
case 358:
-#line 1720 "parse.y"
+#line 1690 "parse.y"
{
yyval.ttype = build_x_arrow (yyval.ttype);
got_object = TREE_TYPE (yyval.ttype);
;
break;}
case 359:
-#line 1728 "parse.y"
+#line 1698 "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 1733 "parse.y"
+#line 1703 "parse.y"
{
note_list_got_semicolon (yyvsp[-2].ftype.t);
;
break;}
case 361:
-#line 1737 "parse.y"
+#line 1707 "parse.y"
{;
break;}
case 362:
-#line 1739 "parse.y"
+#line 1709 "parse.y"
{
shadow_tag (yyvsp[-1].ftype.t);
note_list_got_semicolon (yyvsp[-1].ftype.t);
;
break;}
case 363:
-#line 1744 "parse.y"
+#line 1714 "parse.y"
{ warning ("empty declaration"); ;
break;}
case 364:
-#line 1746 "parse.y"
+#line 1716 "parse.y"
{ pedantic = yyvsp[-1].itype; ;
break;}
case 367:
-#line 1760 "parse.y"
+#line 1730 "parse.y"
{ yyval.ttype = make_call_declarator (NULL_TREE, empty_parms (),
NULL_TREE, NULL_TREE); ;
break;}
case 368:
-#line 1763 "parse.y"
+#line 1733 "parse.y"
{ yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), NULL_TREE,
NULL_TREE); ;
break;}
case 369:
-#line 1770 "parse.y"
+#line 1740 "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 1773 "parse.y"
+#line 1743 "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 1776 "parse.y"
+#line 1746 "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 1780 "parse.y"
+#line 1750 "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 1783 "parse.y"
+#line 1753 "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 1794 "parse.y"
+#line 1764 "parse.y"
{ yyval.ftype.lookups = type_lookups; ;
break;}
case 375:
-#line 1796 "parse.y"
+#line 1766 "parse.y"
{ yyval.ftype.lookups = type_lookups; ;
break;}
case 376:
-#line 1801 "parse.y"
+#line 1771 "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 1804 "parse.y"
+#line 1774 "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 1807 "parse.y"
+#line 1777 "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 1810 "parse.y"
+#line 1780 "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 1813 "parse.y"
+#line 1783 "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 1816 "parse.y"
+#line 1786 "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 1823 "parse.y"
+#line 1793 "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 1828 "parse.y"
+#line 1798 "parse.y"
{ yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyval.ttype); ;
break;}
case 384:
-#line 1830 "parse.y"
+#line 1800 "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 1835 "parse.y"
+#line 1805 "parse.y"
{ yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ;
break;}
case 386:
-#line 1837 "parse.y"
+#line 1807 "parse.y"
{ yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); ;
break;}
case 387:
-#line 1856 "parse.y"
+#line 1826 "parse.y"
{ yyval.ftype.lookups = NULL_TREE; TREE_STATIC (yyval.ftype.t) = 1; ;
break;}
case 388:
-#line 1858 "parse.y"
+#line 1828 "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 1863 "parse.y"
+#line 1833 "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 1868 "parse.y"
+#line 1838 "parse.y"
{
if (extra_warnings && TREE_STATIC (yyval.ftype.t))
warning ("`%s' is not at beginning of declaration",
@@ -6191,68 +6161,68 @@ case 390:
;
break;}
case 391:
-#line 1876 "parse.y"
+#line 1846 "parse.y"
{ yyval.ftype.t = hash_tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ftype.t); ;
break;}
case 392:
-#line 1878 "parse.y"
+#line 1848 "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 1892 "parse.y"
+#line 1862 "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 1895 "parse.y"
+#line 1865 "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 1898 "parse.y"
+#line 1868 "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 1901 "parse.y"
+#line 1871 "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 1907 "parse.y"
+#line 1877 "parse.y"
{ yyval.ttype = build_decl_list (NULL_TREE, yyvsp[0].ftype.t); ;
break;}
case 398:
-#line 1909 "parse.y"
+#line 1879 "parse.y"
{ yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ttype); ;
break;}
case 399:
-#line 1918 "parse.y"
+#line 1888 "parse.y"
{ yyval.ftype.lookups = NULL_TREE; ;
break;}
case 400:
-#line 1920 "parse.y"
+#line 1890 "parse.y"
{ yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; yyval.ftype.lookups = NULL_TREE; ;
break;}
case 401:
-#line 1922 "parse.y"
+#line 1892 "parse.y"
{ yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; yyval.ftype.lookups = NULL_TREE; ;
break;}
case 402:
-#line 1924 "parse.y"
+#line 1894 "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 1927 "parse.y"
+#line 1897 "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 1930 "parse.y"
+#line 1900 "parse.y"
{ tree type = TREE_TYPE (yyvsp[-1].ttype);
yyval.ftype.new_type_flag = 0; yyval.ftype.lookups = NULL_TREE;
@@ -6269,7 +6239,7 @@ case 404:
;
break;}
case 405:
-#line 1945 "parse.y"
+#line 1915 "parse.y"
{ tree type = groktypename (yyvsp[-1].ftype.t);
yyval.ftype.new_type_flag = 0; yyval.ftype.lookups = NULL_TREE;
@@ -6286,278 +6256,278 @@ case 405:
;
break;}
case 406:
-#line 1965 "parse.y"
+#line 1935 "parse.y"
{ yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ;
break;}
case 407:
-#line 1967 "parse.y"
+#line 1937 "parse.y"
{ yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ;
break;}
case 410:
-#line 1974 "parse.y"
+#line 1944 "parse.y"
{ check_multiple_declarators (); ;
break;}
case 412:
-#line 1980 "parse.y"
+#line 1950 "parse.y"
{ check_multiple_declarators (); ;
break;}
case 414:
-#line 1986 "parse.y"
+#line 1956 "parse.y"
{ check_multiple_declarators (); ;
break;}
case 415:
-#line 1991 "parse.y"
+#line 1961 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 416:
-#line 1993 "parse.y"
+#line 1963 "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 1998 "parse.y"
+#line 1968 "parse.y"
{ yyval.ttype = parse_decl (yyvsp[-3].ttype, yyvsp[-1].ttype, 1); ;
break;}
case 418:
-#line 2001 "parse.y"
+#line 1971 "parse.y"
{ parse_end_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype); ;
break;}
case 419:
-#line 2003 "parse.y"
+#line 1973 "parse.y"
{
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 2017 "parse.y"
+#line 1987 "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 2022 "parse.y"
+#line 1992 "parse.y"
{ parse_end_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype); ;
break;}
case 422:
-#line 2024 "parse.y"
+#line 1994 "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 2031 "parse.y"
+#line 2001 "parse.y"
{;
break;}
case 424:
-#line 2036 "parse.y"
+#line 2006 "parse.y"
{;
break;}
case 425:
-#line 2041 "parse.y"
+#line 2011 "parse.y"
{ /* Set things up as initdcl0_innards expects. */
yyvsp[0].ttype = yyvsp[-1].ttype;
yyvsp[-1].ttype = NULL_TREE; ;
break;}
case 426:
-#line 2045 "parse.y"
+#line 2015 "parse.y"
{;
break;}
case 427:
-#line 2047 "parse.y"
+#line 2017 "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 2055 "parse.y"
+#line 2025 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 429:
-#line 2057 "parse.y"
+#line 2027 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 430:
-#line 2062 "parse.y"
+#line 2032 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 431:
-#line 2064 "parse.y"
+#line 2034 "parse.y"
{ yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 432:
-#line 2069 "parse.y"
+#line 2039 "parse.y"
{ yyval.ttype = yyvsp[-2].ttype; ;
break;}
case 433:
-#line 2074 "parse.y"
+#line 2044 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 434:
-#line 2076 "parse.y"
+#line 2046 "parse.y"
{ yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[0].ttype); ;
break;}
case 435:
-#line 2081 "parse.y"
+#line 2051 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 436:
-#line 2083 "parse.y"
+#line 2053 "parse.y"
{ yyval.ttype = build_tree_list (yyvsp[0].ttype, NULL_TREE); ;
break;}
case 437:
-#line 2085 "parse.y"
+#line 2055 "parse.y"
{ yyval.ttype = build_tree_list (yyvsp[-3].ttype, build_tree_list (NULL_TREE, yyvsp[-1].ttype)); ;
break;}
case 438:
-#line 2087 "parse.y"
+#line 2057 "parse.y"
{ yyval.ttype = build_tree_list (yyvsp[-5].ttype, tree_cons (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype)); ;
break;}
case 439:
-#line 2089 "parse.y"
+#line 2059 "parse.y"
{ yyval.ttype = build_tree_list (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
break;}
case 444:
-#line 2105 "parse.y"
+#line 2075 "parse.y"
{ yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ;
break;}
case 445:
-#line 2107 "parse.y"
+#line 2077 "parse.y"
{ yyval.ttype = chainon (yyvsp[-2].ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
break;}
case 446:
-#line 2112 "parse.y"
+#line 2082 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 447:
-#line 2114 "parse.y"
+#line 2084 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 449:
-#line 2122 "parse.y"
+#line 2092 "parse.y"
{ yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, NULL_TREE);
TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ;
break;}
case 450:
-#line 2125 "parse.y"
+#line 2095 "parse.y"
{ yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-1].ttype));
TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ;
break;}
case 451:
-#line 2128 "parse.y"
+#line 2098 "parse.y"
{ yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-2].ttype));
TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ;
break;}
case 452:
-#line 2131 "parse.y"
+#line 2101 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 453:
-#line 2138 "parse.y"
+#line 2108 "parse.y"
{ yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ;
break;}
case 454:
-#line 2140 "parse.y"
+#line 2110 "parse.y"
{ yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ;
break;}
case 455:
-#line 2143 "parse.y"
+#line 2113 "parse.y"
{ yyval.ttype = build_tree_list (yyvsp[-2].ttype, yyvsp[0].ttype); ;
break;}
case 456:
-#line 2145 "parse.y"
+#line 2115 "parse.y"
{ yyval.ttype = build_tree_list (yyval.ttype, yyvsp[0].ttype); ;
break;}
case 457:
-#line 2147 "parse.y"
+#line 2117 "parse.y"
{ yyval.ttype = tree_cons (yyvsp[-2].ttype, yyvsp[0].ttype, yyval.ttype); ;
break;}
case 458:
-#line 2152 "parse.y"
+#line 2122 "parse.y"
{ start_function (NULL_TREE, yyvsp[0].pi->fndecl, NULL_TREE,
(SF_DEFAULT | SF_PRE_PARSED
| SF_INCLASS_INLINE)); ;
break;}
case 459:
-#line 2158 "parse.y"
+#line 2128 "parse.y"
{
expand_body (finish_function ((int)yyvsp[-1].itype | 2));
process_next_inline (yyvsp[-3].pi);
;
break;}
case 460:
-#line 2163 "parse.y"
+#line 2133 "parse.y"
{
expand_body (finish_function ((int)yyvsp[0].itype | 2));
process_next_inline (yyvsp[-2].pi);
;
break;}
case 461:
-#line 2168 "parse.y"
+#line 2138 "parse.y"
{
finish_function (2);
process_next_inline (yyvsp[-2].pi); ;
break;}
case 464:
-#line 2182 "parse.y"
+#line 2152 "parse.y"
{ replace_defarg (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
break;}
case 465:
-#line 2184 "parse.y"
+#line 2154 "parse.y"
{ replace_defarg (yyvsp[-2].ttype, error_mark_node); ;
break;}
case 467:
-#line 2189 "parse.y"
+#line 2159 "parse.y"
{ do_pending_defargs (); ;
break;}
case 468:
-#line 2191 "parse.y"
+#line 2161 "parse.y"
{ do_pending_defargs (); ;
break;}
case 469:
-#line 2196 "parse.y"
+#line 2166 "parse.y"
{ yyval.ttype = current_enum_type;
current_enum_type = start_enum (yyvsp[-1].ttype); ;
break;}
case 470:
-#line 2199 "parse.y"
+#line 2169 "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 2204 "parse.y"
+#line 2174 "parse.y"
{ yyval.ttype = current_enum_type;
current_enum_type = start_enum (make_anon_name ()); ;
break;}
case 472:
-#line 2207 "parse.y"
+#line 2177 "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 2212 "parse.y"
+#line 2182 "parse.y"
{ yyval.ftype.t = xref_tag (enum_type_node, yyvsp[0].ttype, 1);
yyval.ftype.new_type_flag = 0; ;
break;}
case 474:
-#line 2215 "parse.y"
+#line 2185 "parse.y"
{ yyval.ftype.t = xref_tag (enum_type_node, yyvsp[0].ttype, 1);
yyval.ftype.new_type_flag = 0; ;
break;}
case 475:
-#line 2218 "parse.y"
+#line 2188 "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 2224 "parse.y"
+#line 2194 "parse.y"
{ yyvsp[-1].ftype.t = begin_class_definition (yyvsp[-1].ftype.t); ;
break;}
case 477:
-#line 2226 "parse.y"
+#line 2196 "parse.y"
{
int semi;
@@ -6570,13 +6540,13 @@ case 477:
;
break;}
case 478:
-#line 2237 "parse.y"
+#line 2207 "parse.y"
{
begin_inline_definitions ();
;
break;}
case 479:
-#line 2241 "parse.y"
+#line 2211 "parse.y"
{
finish_inline_definitions ();
yyval.ftype.t = yyvsp[-3].ttype;
@@ -6584,7 +6554,7 @@ case 479:
;
break;}
case 480:
-#line 2247 "parse.y"
+#line 2217 "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)));
@@ -6610,51 +6580,51 @@ case 480:
;
break;}
case 484:
-#line 2280 "parse.y"
+#line 2250 "parse.y"
{ if (pedantic && !in_system_header)
pedwarn ("comma at end of enumerator list"); ;
break;}
case 486:
-#line 2287 "parse.y"
+#line 2257 "parse.y"
{ error ("storage class specifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ;
break;}
case 487:
-#line 2289 "parse.y"
+#line 2259 "parse.y"
{ error ("type specifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ;
break;}
case 488:
-#line 2291 "parse.y"
+#line 2261 "parse.y"
{ error ("type qualifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ;
break;}
case 489:
-#line 2293 "parse.y"
+#line 2263 "parse.y"
{ error ("no body nor ';' separates two class, struct or union declarations"); ;
break;}
case 490:
-#line 2295 "parse.y"
+#line 2265 "parse.y"
{ yyval.ttype = build_decl_list (yyvsp[0].ttype, yyvsp[-1].ttype); ;
break;}
case 491:
-#line 2300 "parse.y"
+#line 2270 "parse.y"
{
current_aggr = yyvsp[-1].ttype;
yyval.ttype = yyvsp[0].ttype;
;
break;}
case 492:
-#line 2308 "parse.y"
+#line 2278 "parse.y"
{ current_aggr = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ;
break;}
case 493:
-#line 2310 "parse.y"
+#line 2280 "parse.y"
{ yyungetc ('{', 1); ;
break;}
case 494:
-#line 2312 "parse.y"
+#line 2282 "parse.y"
{ yyungetc (':', 1); ;
break;}
case 495:
-#line 2317 "parse.y"
+#line 2287 "parse.y"
{
current_aggr = yyvsp[-2].ttype;
yyval.ftype.t = handle_class_head (yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype);
@@ -6662,7 +6632,7 @@ case 495:
;
break;}
case 496:
-#line 2323 "parse.y"
+#line 2293 "parse.y"
{
current_aggr = yyvsp[-3].ttype;
yyval.ftype.t = handle_class_head (yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype);
@@ -6670,7 +6640,7 @@ case 496:
;
break;}
case 497:
-#line 2329 "parse.y"
+#line 2299 "parse.y"
{
current_aggr = yyvsp[-2].ttype;
yyval.ftype.t = handle_class_head (yyvsp[-2].ttype, NULL_TREE, yyvsp[0].ttype);
@@ -6678,7 +6648,7 @@ case 497:
;
break;}
case 498:
-#line 2335 "parse.y"
+#line 2305 "parse.y"
{
current_aggr = yyvsp[-1].ttype;
yyval.ftype.t = yyvsp[0].ttype;
@@ -6686,7 +6656,7 @@ case 498:
;
break;}
case 499:
-#line 2341 "parse.y"
+#line 2311 "parse.y"
{
current_aggr = yyvsp[-2].ttype;
yyval.ftype.t = yyvsp[0].ttype;
@@ -6696,18 +6666,18 @@ case 499:
;
break;}
case 500:
-#line 2352 "parse.y"
+#line 2322 "parse.y"
{
yyval.ftype.t = xref_tag (current_aggr, yyvsp[0].ttype, 1);
yyval.ftype.new_type_flag = 0;
;
break;}
case 501:
-#line 2357 "parse.y"
+#line 2327 "parse.y"
{ yyval.ttype = xref_tag (current_aggr, yyvsp[0].ttype, 0); ;
break;}
case 502:
-#line 2361 "parse.y"
+#line 2331 "parse.y"
{
yyval.ftype.t = yyvsp[-1].ttype;
yyval.ftype.new_type_flag = 0;
@@ -6716,7 +6686,7 @@ case 502:
;
break;}
case 503:
-#line 2369 "parse.y"
+#line 2339 "parse.y"
{
if (yyvsp[-1].ftype.t != error_mark_node)
{
@@ -6743,43 +6713,43 @@ case 503:
;
break;}
case 504:
-#line 2397 "parse.y"
+#line 2367 "parse.y"
{ yyval.ttype = xref_tag (yyval.ttype, make_anon_name (), 0);
yyungetc ('{', 1); ;
break;}
case 505:
-#line 2407 "parse.y"
+#line 2377 "parse.y"
{
yyval.ftype.t = yyvsp[0].ttype;
yyval.ftype.new_type_flag = 0;
;
break;}
case 507:
-#line 2416 "parse.y"
+#line 2386 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 508:
-#line 2418 "parse.y"
+#line 2388 "parse.y"
{ yyungetc(':', 1); yyval.ttype = NULL_TREE; ;
break;}
case 509:
-#line 2420 "parse.y"
+#line 2390 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 511:
-#line 2426 "parse.y"
+#line 2396 "parse.y"
{ yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ;
break;}
case 512:
-#line 2431 "parse.y"
+#line 2401 "parse.y"
{ yyval.ttype = finish_base_specifier (access_default_node, yyvsp[0].ttype); ;
break;}
case 513:
-#line 2433 "parse.y"
+#line 2403 "parse.y"
{ yyval.ttype = finish_base_specifier (yyvsp[-2].ttype, yyvsp[0].ttype); ;
break;}
case 514:
-#line 2438 "parse.y"
+#line 2408 "parse.y"
{ if (yyval.ttype == error_mark_node)
;
else if (!TYPE_P (yyval.ttype))
@@ -6788,13 +6758,13 @@ case 514:
yyval.ttype = TYPE_MAIN_DECL (yyvsp[0].ttype); ;
break;}
case 517:
-#line 2450 "parse.y"
+#line 2420 "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 2454 "parse.y"
+#line 2424 "parse.y"
{
if (yyvsp[-2].ttype != access_default_virtual_node)
error ("multiple access specifiers");
@@ -6807,7 +6777,7 @@ case 518:
;
break;}
case 519:
-#line 2465 "parse.y"
+#line 2435 "parse.y"
{ if (yyvsp[-1].ttype != ridpointers[(int)RID_VIRTUAL])
cp_error ("`%D' access", yyvsp[-1].ttype);
else if (yyval.ttype == access_public_node)
@@ -6821,55 +6791,55 @@ case 519:
;
break;}
case 524:
-#line 2486 "parse.y"
+#line 2456 "parse.y"
{
current_access_specifier = yyvsp[-1].ttype;
;
break;}
case 525:
-#line 2495 "parse.y"
+#line 2465 "parse.y"
{
finish_member_declaration (yyvsp[0].ttype);
;
break;}
case 526:
-#line 2499 "parse.y"
+#line 2469 "parse.y"
{
finish_member_declaration (yyvsp[0].ttype);
;
break;}
case 528:
-#line 2507 "parse.y"
+#line 2477 "parse.y"
{ error ("missing ';' before right brace");
yyungetc ('}', 0); ;
break;}
case 529:
-#line 2512 "parse.y"
+#line 2482 "parse.y"
{ yyval.ttype = finish_method (yyval.ttype); ;
break;}
case 530:
-#line 2514 "parse.y"
+#line 2484 "parse.y"
{ yyval.ttype = finish_method (yyval.ttype); ;
break;}
case 531:
-#line 2516 "parse.y"
+#line 2486 "parse.y"
{ yyval.ttype = finish_method (yyval.ttype); ;
break;}
case 532:
-#line 2518 "parse.y"
+#line 2488 "parse.y"
{ yyval.ttype = finish_method (yyval.ttype); ;
break;}
case 533:
-#line 2520 "parse.y"
+#line 2490 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 534:
-#line 2522 "parse.y"
+#line 2492 "parse.y"
{ yyval.ttype = yyvsp[0].ttype;
pedantic = yyvsp[-1].itype; ;
break;}
case 535:
-#line 2525 "parse.y"
+#line 2495 "parse.y"
{
if (yyvsp[0].ttype)
yyval.ttype = finish_member_template_decl (yyvsp[0].ttype);
@@ -6881,14 +6851,14 @@ case 535:
;
break;}
case 536:
-#line 2535 "parse.y"
+#line 2505 "parse.y"
{
yyval.ttype = finish_member_class_template (yyvsp[-1].ftype.t);
finish_template_decl (yyvsp[-2].ttype);
;
break;}
case 537:
-#line 2546 "parse.y"
+#line 2516 "parse.y"
{
/* Most of the productions for component_decl only
allow the creation of one new member, so we call
@@ -6911,7 +6881,7 @@ case 537:
;
break;}
case 538:
-#line 2567 "parse.y"
+#line 2537 "parse.y"
{
if (!yyvsp[0].itype)
grok_x_components (yyvsp[-1].ftype.t);
@@ -6919,45 +6889,45 @@ case 538:
;
break;}
case 539:
-#line 2573 "parse.y"
+#line 2543 "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 2576 "parse.y"
+#line 2546 "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 2579 "parse.y"
+#line 2549 "parse.y"
{ yyval.ttype = grokbitfield (NULL_TREE, NULL_TREE, yyvsp[0].ttype); ;
break;}
case 542:
-#line 2581 "parse.y"
+#line 2551 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 543:
-#line 2592 "parse.y"
+#line 2562 "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 2597 "parse.y"
+#line 2567 "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 2600 "parse.y"
+#line 2570 "parse.y"
{ yyval.ttype = do_class_using_decl (yyvsp[0].ttype); ;
break;}
case 546:
-#line 2606 "parse.y"
+#line 2576 "parse.y"
{ yyval.itype = 0; ;
break;}
case 547:
-#line 2608 "parse.y"
+#line 2578 "parse.y"
{
if (PROCESSING_REAL_TEMPLATE_DECL_P ())
yyvsp[0].ttype = finish_member_template_decl (yyvsp[0].ttype);
@@ -6966,7 +6936,7 @@ case 547:
;
break;}
case 548:
-#line 2615 "parse.y"
+#line 2585 "parse.y"
{
check_multiple_declarators ();
if (PROCESSING_REAL_TEMPLATE_DECL_P ())
@@ -6976,11 +6946,11 @@ case 548:
;
break;}
case 549:
-#line 2626 "parse.y"
+#line 2596 "parse.y"
{ yyval.itype = 0; ;
break;}
case 550:
-#line 2628 "parse.y"
+#line 2598 "parse.y"
{
if (PROCESSING_REAL_TEMPLATE_DECL_P ())
yyvsp[0].ttype = finish_member_template_decl (yyvsp[0].ttype);
@@ -6989,7 +6959,7 @@ case 550:
;
break;}
case 551:
-#line 2635 "parse.y"
+#line 2605 "parse.y"
{
check_multiple_declarators ();
if (PROCESSING_REAL_TEMPLATE_DECL_P ())
@@ -6999,75 +6969,75 @@ case 551:
;
break;}
case 556:
-#line 2656 "parse.y"
+#line 2626 "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 2659 "parse.y"
+#line 2629 "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 2665 "parse.y"
+#line 2635 "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 2668 "parse.y"
+#line 2638 "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 2671 "parse.y"
+#line 2641 "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 2674 "parse.y"
+#line 2644 "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 2680 "parse.y"
+#line 2650 "parse.y"
{ yyval.ttype = parse_field (yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ;
break;}
case 563:
-#line 2682 "parse.y"
+#line 2652 "parse.y"
{ yyval.ttype = parse_bitfield (yyvsp[-3].ttype, yyvsp[0].ttype, yyvsp[-1].ttype); ;
break;}
case 564:
-#line 2687 "parse.y"
+#line 2657 "parse.y"
{ yyval.ttype = parse_field (yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ;
break;}
case 565:
-#line 2689 "parse.y"
+#line 2659 "parse.y"
{ yyval.ttype = parse_bitfield (yyvsp[-3].ttype, yyvsp[0].ttype, yyvsp[-1].ttype); ;
break;}
case 566:
-#line 2691 "parse.y"
+#line 2661 "parse.y"
{ yyval.ttype = parse_bitfield (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
break;}
case 571:
-#line 2710 "parse.y"
+#line 2680 "parse.y"
{ build_enumerator (yyvsp[0].ttype, NULL_TREE, current_enum_type); ;
break;}
case 572:
-#line 2712 "parse.y"
+#line 2682 "parse.y"
{ build_enumerator (yyvsp[-2].ttype, yyvsp[0].ttype, current_enum_type); ;
break;}
case 573:
-#line 2718 "parse.y"
+#line 2688 "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 2721 "parse.y"
+#line 2691 "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 2726 "parse.y"
+#line 2696 "parse.y"
{
if (pedantic)
pedwarn ("ISO C++ forbids array dimensions with parenthesized type in new");
@@ -7077,41 +7047,41 @@ case 575:
;
break;}
case 576:
-#line 2737 "parse.y"
+#line 2707 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 577:
-#line 2739 "parse.y"
+#line 2709 "parse.y"
{ yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ;
break;}
case 578:
-#line 2744 "parse.y"
+#line 2714 "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 2747 "parse.y"
+#line 2717 "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 2757 "parse.y"
+#line 2727 "parse.y"
{ yyval.ttype = yyvsp[-1].ttype; ;
break;}
case 581:
-#line 2759 "parse.y"
+#line 2729 "parse.y"
{ yyval.ttype = yyvsp[-1].ttype; ;
break;}
case 582:
-#line 2761 "parse.y"
+#line 2731 "parse.y"
{ yyval.ttype = empty_parms (); ;
break;}
case 583:
-#line 2763 "parse.y"
+#line 2733 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 585:
-#line 2771 "parse.y"
+#line 2741 "parse.y"
{
/* Provide support for '(' attributes '*' declarator ')'
etc */
@@ -7119,51 +7089,51 @@ case 585:
;
break;}
case 586:
-#line 2781 "parse.y"
+#line 2751 "parse.y"
{ yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
break;}
case 587:
-#line 2783 "parse.y"
+#line 2753 "parse.y"
{ yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
break;}
case 588:
-#line 2785 "parse.y"
+#line 2755 "parse.y"
{ yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ;
break;}
case 589:
-#line 2787 "parse.y"
+#line 2757 "parse.y"
{ yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ;
break;}
case 590:
-#line 2789 "parse.y"
+#line 2759 "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 2797 "parse.y"
+#line 2767 "parse.y"
{ yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 593:
-#line 2799 "parse.y"
+#line 2769 "parse.y"
{ yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ;
break;}
case 594:
-#line 2801 "parse.y"
+#line 2771 "parse.y"
{ yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ;
break;}
case 595:
-#line 2803 "parse.y"
+#line 2773 "parse.y"
{ yyval.ttype = yyvsp[-1].ttype; ;
break;}
case 596:
-#line 2805 "parse.y"
+#line 2775 "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 2813 "parse.y"
+#line 2783 "parse.y"
{
if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
{
@@ -7175,7 +7145,7 @@ case 598:
;
break;}
case 599:
-#line 2823 "parse.y"
+#line 2793 "parse.y"
{
if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
yyval.ttype = IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype);
@@ -7185,15 +7155,15 @@ case 599:
;
break;}
case 602:
-#line 2836 "parse.y"
+#line 2806 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 603:
-#line 2841 "parse.y"
+#line 2811 "parse.y"
{ yyval.ttype = get_type_decl (yyvsp[0].ttype); ;
break;}
case 605:
-#line 2850 "parse.y"
+#line 2820 "parse.y"
{
/* Provide support for '(' attributes '*' declarator ')'
etc */
@@ -7201,123 +7171,123 @@ case 605:
;
break;}
case 606:
-#line 2859 "parse.y"
+#line 2829 "parse.y"
{ yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
break;}
case 607:
-#line 2861 "parse.y"
+#line 2831 "parse.y"
{ yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
break;}
case 608:
-#line 2863 "parse.y"
+#line 2833 "parse.y"
{ yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ;
break;}
case 609:
-#line 2865 "parse.y"
+#line 2835 "parse.y"
{ yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ;
break;}
case 610:
-#line 2867 "parse.y"
+#line 2837 "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 2875 "parse.y"
+#line 2845 "parse.y"
{ yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
break;}
case 613:
-#line 2877 "parse.y"
+#line 2847 "parse.y"
{ yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
break;}
case 614:
-#line 2879 "parse.y"
+#line 2849 "parse.y"
{ yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ;
break;}
case 615:
-#line 2881 "parse.y"
+#line 2851 "parse.y"
{ yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ;
break;}
case 616:
-#line 2883 "parse.y"
+#line 2853 "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 2891 "parse.y"
+#line 2861 "parse.y"
{ yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 619:
-#line 2893 "parse.y"
+#line 2863 "parse.y"
{ yyval.ttype = yyvsp[-1].ttype; ;
break;}
case 620:
-#line 2895 "parse.y"
+#line 2865 "parse.y"
{ yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ;
break;}
case 621:
-#line 2897 "parse.y"
+#line 2867 "parse.y"
{ yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ;
break;}
case 622:
-#line 2899 "parse.y"
+#line 2869 "parse.y"
{ enter_scope_of (yyvsp[0].ttype); ;
break;}
case 623:
-#line 2901 "parse.y"
+#line 2871 "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 2909 "parse.y"
+#line 2879 "parse.y"
{ got_scope = NULL_TREE;
yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 625:
-#line 2912 "parse.y"
+#line 2882 "parse.y"
{ got_scope = NULL_TREE;
yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 626:
-#line 2918 "parse.y"
+#line 2888 "parse.y"
{ got_scope = NULL_TREE;
yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); ;
break;}
case 627:
-#line 2921 "parse.y"
+#line 2891 "parse.y"
{ got_scope = NULL_TREE;
yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 629:
-#line 2928 "parse.y"
+#line 2898 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 630:
-#line 2933 "parse.y"
+#line 2903 "parse.y"
{ yyval.ttype = build_functional_cast (yyvsp[-3].ftype.t, yyvsp[-1].ttype); ;
break;}
case 631:
-#line 2935 "parse.y"
+#line 2905 "parse.y"
{ yyval.ttype = reparse_decl_as_expr (yyvsp[-3].ftype.t, yyvsp[-1].ttype); ;
break;}
case 632:
-#line 2937 "parse.y"
+#line 2907 "parse.y"
{ yyval.ttype = reparse_absdcl_as_expr (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
break;}
case 637:
-#line 2949 "parse.y"
+#line 2919 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 638:
-#line 2951 "parse.y"
+#line 2921 "parse.y"
{ got_scope = yyval.ttype
= make_typename_type (yyvsp[-3].ttype, yyvsp[-1].ttype, /*complain=*/1); ;
break;}
case 639:
-#line 2959 "parse.y"
+#line 2929 "parse.y"
{
if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE)
{
@@ -7329,7 +7299,7 @@ case 639:
;
break;}
case 640:
-#line 2969 "parse.y"
+#line 2939 "parse.y"
{
if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE)
yyval.ttype = lastiddecl;
@@ -7337,7 +7307,7 @@ case 640:
;
break;}
case 641:
-#line 2975 "parse.y"
+#line 2945 "parse.y"
{
if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE)
yyval.ttype = lastiddecl;
@@ -7345,15 +7315,15 @@ case 641:
;
break;}
case 642:
-#line 2981 "parse.y"
+#line 2951 "parse.y"
{ got_scope = yyval.ttype = complete_type (TREE_TYPE (yyvsp[-1].ttype)); ;
break;}
case 644:
-#line 2997 "parse.y"
+#line 2967 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 645:
-#line 3002 "parse.y"
+#line 2972 "parse.y"
{
if (TYPE_P (yyvsp[-1].ttype))
yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype, /*complain=*/1);
@@ -7368,26 +7338,26 @@ case 645:
;
break;}
case 646:
-#line 3015 "parse.y"
+#line 2985 "parse.y"
{ yyval.ttype = TREE_TYPE (yyvsp[0].ttype); ;
break;}
case 647:
-#line 3017 "parse.y"
+#line 2987 "parse.y"
{ yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype, /*complain=*/1); ;
break;}
case 648:
-#line 3019 "parse.y"
+#line 2989 "parse.y"
{ yyval.ttype = make_typename_type (yyvsp[-2].ttype, yyvsp[0].ttype, /*complain=*/1); ;
break;}
case 649:
-#line 3024 "parse.y"
+#line 2994 "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 3029 "parse.y"
+#line 2999 "parse.y"
{
if (TYPE_P (yyvsp[-1].ttype))
yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype, /*complain=*/1);
@@ -7402,17 +7372,17 @@ case 650:
;
break;}
case 651:
-#line 3042 "parse.y"
+#line 3012 "parse.y"
{ got_scope = yyval.ttype
= make_typename_type (yyvsp[-2].ttype, yyvsp[-1].ttype, /*complain=*/1); ;
break;}
case 652:
-#line 3045 "parse.y"
+#line 3015 "parse.y"
{ got_scope = yyval.ttype
= make_typename_type (yyvsp[-3].ttype, yyvsp[-1].ttype, /*complain=*/1); ;
break;}
case 653:
-#line 3051 "parse.y"
+#line 3021 "parse.y"
{
if (TREE_CODE (yyvsp[-1].ttype) != IDENTIFIER_NODE)
yyvsp[-1].ttype = lastiddecl;
@@ -7426,7 +7396,7 @@ case 653:
;
break;}
case 654:
-#line 3063 "parse.y"
+#line 3033 "parse.y"
{
if (TREE_CODE (yyvsp[-1].ttype) != IDENTIFIER_NODE)
yyval.ttype = lastiddecl;
@@ -7434,11 +7404,11 @@ case 654:
;
break;}
case 655:
-#line 3069 "parse.y"
+#line 3039 "parse.y"
{ got_scope = yyval.ttype = complete_type (TREE_TYPE (yyval.ttype)); ;
break;}
case 658:
-#line 3073 "parse.y"
+#line 3043 "parse.y"
{
if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE)
yyval.ttype = lastiddecl;
@@ -7446,11 +7416,11 @@ case 658:
;
break;}
case 659:
-#line 3082 "parse.y"
+#line 3052 "parse.y"
{ yyval.ttype = build_min_nt (TEMPLATE_ID_EXPR, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
break;}
case 660:
-#line 3087 "parse.y"
+#line 3057 "parse.y"
{
if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
yyval.ttype = IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype);
@@ -7460,59 +7430,59 @@ case 660:
;
break;}
case 662:
-#line 3096 "parse.y"
+#line 3066 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 663:
-#line 3101 "parse.y"
+#line 3071 "parse.y"
{ got_scope = NULL_TREE; ;
break;}
case 664:
-#line 3103 "parse.y"
+#line 3073 "parse.y"
{ yyval.ttype = yyvsp[-1].ttype; got_scope = NULL_TREE; ;
break;}
case 665:
-#line 3110 "parse.y"
+#line 3080 "parse.y"
{ got_scope = void_type_node; ;
break;}
case 666:
-#line 3116 "parse.y"
+#line 3086 "parse.y"
{ yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 667:
-#line 3118 "parse.y"
+#line 3088 "parse.y"
{ yyval.ttype = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE); ;
break;}
case 668:
-#line 3120 "parse.y"
+#line 3090 "parse.y"
{ yyval.ttype = make_reference_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 669:
-#line 3122 "parse.y"
+#line 3092 "parse.y"
{ yyval.ttype = make_reference_declarator (yyvsp[0].ttype, NULL_TREE); ;
break;}
case 670:
-#line 3124 "parse.y"
+#line 3094 "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 3128 "parse.y"
+#line 3098 "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 3137 "parse.y"
+#line 3107 "parse.y"
{ yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ;
break;}
case 674:
-#line 3139 "parse.y"
+#line 3109 "parse.y"
{ yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ;
break;}
case 676:
-#line 3145 "parse.y"
+#line 3115 "parse.y"
{
/* Provide support for '(' attributes '*' declarator ')'
etc */
@@ -7520,96 +7490,96 @@ case 676:
;
break;}
case 677:
-#line 3155 "parse.y"
+#line 3125 "parse.y"
{ yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
break;}
case 678:
-#line 3157 "parse.y"
+#line 3127 "parse.y"
{ yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ;
break;}
case 679:
-#line 3159 "parse.y"
+#line 3129 "parse.y"
{ yyval.ttype = make_pointer_declarator (yyvsp[0].ftype.t, NULL_TREE); ;
break;}
case 680:
-#line 3161 "parse.y"
+#line 3131 "parse.y"
{ yyval.ttype = make_pointer_declarator (NULL_TREE, NULL_TREE); ;
break;}
case 681:
-#line 3163 "parse.y"
+#line 3133 "parse.y"
{ yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
break;}
case 682:
-#line 3165 "parse.y"
+#line 3135 "parse.y"
{ yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ;
break;}
case 683:
-#line 3167 "parse.y"
+#line 3137 "parse.y"
{ yyval.ttype = make_reference_declarator (yyvsp[0].ftype.t, NULL_TREE); ;
break;}
case 684:
-#line 3169 "parse.y"
+#line 3139 "parse.y"
{ yyval.ttype = make_reference_declarator (NULL_TREE, NULL_TREE); ;
break;}
case 685:
-#line 3171 "parse.y"
+#line 3141 "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 3175 "parse.y"
+#line 3145 "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 3184 "parse.y"
+#line 3154 "parse.y"
{ yyval.ttype = yyvsp[-1].ttype; ;
break;}
case 689:
-#line 3187 "parse.y"
+#line 3157 "parse.y"
{ yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 690:
-#line 3189 "parse.y"
+#line 3159 "parse.y"
{ yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 691:
-#line 3191 "parse.y"
+#line 3161 "parse.y"
{ yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ;
break;}
case 692:
-#line 3193 "parse.y"
+#line 3163 "parse.y"
{ yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ;
break;}
case 693:
-#line 3195 "parse.y"
+#line 3165 "parse.y"
{ yyval.ttype = make_call_declarator (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 694:
-#line 3197 "parse.y"
+#line 3167 "parse.y"
{ set_quals_and_spec (yyval.ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 695:
-#line 3199 "parse.y"
+#line 3169 "parse.y"
{ set_quals_and_spec (yyval.ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 696:
-#line 3201 "parse.y"
+#line 3171 "parse.y"
{ yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ;
break;}
case 697:
-#line 3203 "parse.y"
+#line 3173 "parse.y"
{ yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, NULL_TREE); ;
break;}
case 704:
-#line 3226 "parse.y"
+#line 3196 "parse.y"
{ if (pedantic)
pedwarn ("ISO C++ forbids label declarations"); ;
break;}
case 707:
-#line 3237 "parse.y"
+#line 3207 "parse.y"
{
while (yyvsp[-1].ttype)
{
@@ -7619,193 +7589,193 @@ case 707:
;
break;}
case 708:
-#line 3250 "parse.y"
+#line 3220 "parse.y"
{;
break;}
case 710:
-#line 3256 "parse.y"
+#line 3226 "parse.y"
{ yyval.ttype = begin_compound_stmt (0); ;
break;}
case 711:
-#line 3258 "parse.y"
+#line 3228 "parse.y"
{ yyval.ttype = finish_compound_stmt (0, yyvsp[-1].ttype); ;
break;}
case 712:
-#line 3263 "parse.y"
+#line 3233 "parse.y"
{
yyval.ttype = begin_if_stmt ();
cond_stmt_keyword = "if";
;
break;}
case 713:
-#line 3268 "parse.y"
+#line 3238 "parse.y"
{ finish_if_stmt_cond (yyvsp[0].ttype, yyvsp[-1].ttype); ;
break;}
case 714:
-#line 3270 "parse.y"
+#line 3240 "parse.y"
{ yyval.ttype = finish_then_clause (yyvsp[-3].ttype); ;
break;}
case 716:
-#line 3275 "parse.y"
+#line 3245 "parse.y"
{ yyval.ttype = begin_compound_stmt (0); ;
break;}
case 717:
-#line 3277 "parse.y"
+#line 3247 "parse.y"
{ yyval.ttype = finish_compound_stmt (0, yyvsp[-1].ttype); ;
break;}
case 718:
-#line 3282 "parse.y"
+#line 3252 "parse.y"
{;
break;}
case 720:
-#line 3288 "parse.y"
+#line 3258 "parse.y"
{ finish_stmt (); ;
break;}
case 721:
-#line 3290 "parse.y"
+#line 3260 "parse.y"
{ finish_expr_stmt (yyvsp[-1].ttype); ;
break;}
case 722:
-#line 3292 "parse.y"
+#line 3262 "parse.y"
{ begin_else_clause (); ;
break;}
case 723:
-#line 3294 "parse.y"
+#line 3264 "parse.y"
{
finish_else_clause (yyvsp[-3].ttype);
finish_if_stmt ();
;
break;}
case 724:
-#line 3299 "parse.y"
+#line 3269 "parse.y"
{ finish_if_stmt (); ;
break;}
case 725:
-#line 3301 "parse.y"
+#line 3271 "parse.y"
{
yyval.ttype = begin_while_stmt ();
cond_stmt_keyword = "while";
;
break;}
case 726:
-#line 3306 "parse.y"
+#line 3276 "parse.y"
{ finish_while_stmt_cond (yyvsp[0].ttype, yyvsp[-1].ttype); ;
break;}
case 727:
-#line 3308 "parse.y"
+#line 3278 "parse.y"
{ finish_while_stmt (yyvsp[-3].ttype); ;
break;}
case 728:
-#line 3310 "parse.y"
+#line 3280 "parse.y"
{ yyval.ttype = begin_do_stmt (); ;
break;}
case 729:
-#line 3312 "parse.y"
+#line 3282 "parse.y"
{
finish_do_body (yyvsp[-2].ttype);
cond_stmt_keyword = "do";
;
break;}
case 730:
-#line 3317 "parse.y"
+#line 3287 "parse.y"
{ finish_do_stmt (yyvsp[-1].ttype, yyvsp[-5].ttype); ;
break;}
case 731:
-#line 3319 "parse.y"
+#line 3289 "parse.y"
{ yyval.ttype = begin_for_stmt (); ;
break;}
case 732:
-#line 3321 "parse.y"
+#line 3291 "parse.y"
{ finish_for_init_stmt (yyvsp[-2].ttype); ;
break;}
case 733:
-#line 3323 "parse.y"
+#line 3293 "parse.y"
{ finish_for_cond (yyvsp[-1].ttype, yyvsp[-5].ttype); ;
break;}
case 734:
-#line 3325 "parse.y"
+#line 3295 "parse.y"
{ finish_for_expr (yyvsp[-1].ttype, yyvsp[-8].ttype); ;
break;}
case 735:
-#line 3327 "parse.y"
+#line 3297 "parse.y"
{ finish_for_stmt (yyvsp[-3].ttype, yyvsp[-10].ttype); ;
break;}
case 736:
-#line 3329 "parse.y"
+#line 3299 "parse.y"
{ yyval.ttype = begin_switch_stmt (); ;
break;}
case 737:
-#line 3331 "parse.y"
+#line 3301 "parse.y"
{ finish_switch_cond (yyvsp[-1].ttype, yyvsp[-3].ttype); ;
break;}
case 738:
-#line 3333 "parse.y"
+#line 3303 "parse.y"
{ finish_switch_stmt (yyvsp[-3].ttype, yyvsp[-5].ttype); ;
break;}
case 739:
-#line 3335 "parse.y"
+#line 3305 "parse.y"
{ finish_case_label (yyvsp[-1].ttype, NULL_TREE); ;
break;}
case 741:
-#line 3338 "parse.y"
+#line 3308 "parse.y"
{ finish_case_label (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
break;}
case 743:
-#line 3341 "parse.y"
+#line 3311 "parse.y"
{ finish_case_label (NULL_TREE, NULL_TREE); ;
break;}
case 745:
-#line 3344 "parse.y"
+#line 3314 "parse.y"
{ finish_break_stmt (); ;
break;}
case 746:
-#line 3346 "parse.y"
+#line 3316 "parse.y"
{ finish_continue_stmt (); ;
break;}
case 747:
-#line 3348 "parse.y"
+#line 3318 "parse.y"
{ finish_return_stmt (NULL_TREE); ;
break;}
case 748:
-#line 3350 "parse.y"
+#line 3320 "parse.y"
{ finish_return_stmt (yyvsp[-1].ttype); ;
break;}
case 749:
-#line 3352 "parse.y"
+#line 3322 "parse.y"
{
finish_asm_stmt (yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE, NULL_TREE,
NULL_TREE);
;
break;}
case 750:
-#line 3358 "parse.y"
+#line 3328 "parse.y"
{
finish_asm_stmt (yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE,
NULL_TREE);
;
break;}
case 751:
-#line 3364 "parse.y"
+#line 3334 "parse.y"
{ finish_asm_stmt (yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE); ;
break;}
case 752:
-#line 3366 "parse.y"
+#line 3336 "parse.y"
{ finish_asm_stmt (yyvsp[-6].ttype, yyvsp[-4].ttype, NULL_TREE, yyvsp[-2].ttype, NULL_TREE); ;
break;}
case 753:
-#line 3370 "parse.y"
+#line 3340 "parse.y"
{ finish_asm_stmt (yyvsp[-10].ttype, yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype); ;
break;}
case 754:
-#line 3373 "parse.y"
+#line 3343 "parse.y"
{ finish_asm_stmt (yyvsp[-8].ttype, yyvsp[-6].ttype, NULL_TREE, yyvsp[-4].ttype, yyvsp[-2].ttype); ;
break;}
case 755:
-#line 3376 "parse.y"
+#line 3346 "parse.y"
{ finish_asm_stmt (yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, NULL_TREE, yyvsp[-2].ttype); ;
break;}
case 756:
-#line 3378 "parse.y"
+#line 3348 "parse.y"
{
if (pedantic)
pedwarn ("ISO C++ forbids computed gotos");
@@ -7813,67 +7783,67 @@ case 756:
;
break;}
case 757:
-#line 3384 "parse.y"
+#line 3354 "parse.y"
{ finish_goto_stmt (yyvsp[-1].ttype); ;
break;}
case 759:
-#line 3387 "parse.y"
+#line 3357 "parse.y"
{ error ("label must be followed by statement");
yyungetc ('}', 0); ;
break;}
case 760:
-#line 3390 "parse.y"
+#line 3360 "parse.y"
{ finish_stmt (); ;
break;}
case 763:
-#line 3394 "parse.y"
+#line 3364 "parse.y"
{ do_local_using_decl (yyvsp[0].ttype); ;
break;}
case 765:
-#line 3400 "parse.y"
+#line 3370 "parse.y"
{ yyval.ttype = begin_function_try_block (); ;
break;}
case 766:
-#line 3402 "parse.y"
+#line 3372 "parse.y"
{ finish_function_try_block (yyvsp[-2].ttype); ;
break;}
case 767:
-#line 3404 "parse.y"
+#line 3374 "parse.y"
{
finish_function_handler_sequence (yyvsp[-4].ttype);
yyval.itype = yyvsp[-3].itype;
;
break;}
case 768:
-#line 3412 "parse.y"
+#line 3382 "parse.y"
{ yyval.ttype = begin_try_block (); ;
break;}
case 769:
-#line 3414 "parse.y"
+#line 3384 "parse.y"
{ finish_try_block (yyvsp[-1].ttype); ;
break;}
case 770:
-#line 3416 "parse.y"
+#line 3386 "parse.y"
{ finish_handler_sequence (yyvsp[-3].ttype); ;
break;}
case 773:
-#line 3426 "parse.y"
+#line 3396 "parse.y"
{ yyval.ttype = begin_handler(); ;
break;}
case 774:
-#line 3428 "parse.y"
+#line 3398 "parse.y"
{ yyval.ttype = finish_handler_parms (yyvsp[0].ttype, yyvsp[-1].ttype); ;
break;}
case 775:
-#line 3430 "parse.y"
+#line 3400 "parse.y"
{ finish_handler (yyvsp[-1].ttype, yyvsp[-3].ttype); ;
break;}
case 778:
-#line 3440 "parse.y"
+#line 3410 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 779:
-#line 3456 "parse.y"
+#line 3426 "parse.y"
{
check_for_new_type ("inside exception declarations", yyvsp[-1].ftype);
yyval.ttype = start_handler_parms (TREE_PURPOSE (yyvsp[-1].ftype.t),
@@ -7881,97 +7851,97 @@ case 779:
;
break;}
case 780:
-#line 3465 "parse.y"
+#line 3435 "parse.y"
{ finish_label_stmt (yyvsp[-1].ttype); ;
break;}
case 781:
-#line 3467 "parse.y"
+#line 3437 "parse.y"
{ finish_label_stmt (yyvsp[-1].ttype); ;
break;}
case 782:
-#line 3469 "parse.y"
+#line 3439 "parse.y"
{ finish_label_stmt (yyvsp[-1].ttype); ;
break;}
case 783:
-#line 3471 "parse.y"
+#line 3441 "parse.y"
{ finish_label_stmt (yyvsp[-1].ttype); ;
break;}
case 784:
-#line 3476 "parse.y"
+#line 3446 "parse.y"
{ finish_expr_stmt (yyvsp[-1].ttype); ;
break;}
case 786:
-#line 3479 "parse.y"
+#line 3449 "parse.y"
{ if (pedantic)
pedwarn ("ISO C++ forbids compound statements inside for initializations");
;
break;}
case 787:
-#line 3488 "parse.y"
+#line 3458 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 789:
-#line 3494 "parse.y"
+#line 3464 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 791:
-#line 3497 "parse.y"
+#line 3467 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 792:
-#line 3504 "parse.y"
+#line 3474 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 795:
-#line 3511 "parse.y"
+#line 3481 "parse.y"
{ yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ;
break;}
case 796:
-#line 3516 "parse.y"
+#line 3486 "parse.y"
{ yyval.ttype = build_tree_list (yyval.ttype, yyvsp[-1].ttype); ;
break;}
case 797:
-#line 3521 "parse.y"
+#line 3491 "parse.y"
{ yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, NULL_TREE); ;
break;}
case 798:
-#line 3523 "parse.y"
+#line 3493 "parse.y"
{ yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ;
break;}
case 799:
-#line 3534 "parse.y"
+#line 3504 "parse.y"
{
yyval.ttype = empty_parms();
;
break;}
case 801:
-#line 3539 "parse.y"
+#line 3509 "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 3547 "parse.y"
+#line 3517 "parse.y"
{ yyval.ttype = finish_parmlist (yyval.ttype, 0); ;
break;}
case 803:
-#line 3549 "parse.y"
+#line 3519 "parse.y"
{ yyval.ttype = finish_parmlist (yyvsp[-1].ttype, 1); ;
break;}
case 804:
-#line 3552 "parse.y"
+#line 3522 "parse.y"
{ yyval.ttype = finish_parmlist (yyvsp[-1].ttype, 1); ;
break;}
case 805:
-#line 3554 "parse.y"
+#line 3524 "parse.y"
{ yyval.ttype = finish_parmlist (build_tree_list (NULL_TREE,
yyvsp[-1].ftype.t), 1); ;
break;}
case 806:
-#line 3557 "parse.y"
+#line 3527 "parse.y"
{ yyval.ttype = finish_parmlist (NULL_TREE, 1); ;
break;}
case 807:
-#line 3559 "parse.y"
+#line 3529 "parse.y"
{
/* This helps us recover from really nasty
parse errors, for example, a missing right
@@ -7983,7 +7953,7 @@ case 807:
;
break;}
case 808:
-#line 3569 "parse.y"
+#line 3539 "parse.y"
{
/* This helps us recover from really nasty
parse errors, for example, a missing right
@@ -7996,99 +7966,99 @@ case 808:
;
break;}
case 809:
-#line 3584 "parse.y"
+#line 3554 "parse.y"
{ maybe_snarf_defarg (); ;
break;}
case 810:
-#line 3586 "parse.y"
+#line 3556 "parse.y"
{ yyval.ttype = yyvsp[0].ttype; ;
break;}
case 813:
-#line 3597 "parse.y"
+#line 3567 "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 3600 "parse.y"
+#line 3570 "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 3603 "parse.y"
+#line 3573 "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 3606 "parse.y"
+#line 3576 "parse.y"
{ yyval.ttype = chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
break;}
case 817:
-#line 3608 "parse.y"
+#line 3578 "parse.y"
{ yyval.ttype = chainon (yyval.ttype, build_tree_list (yyvsp[0].ttype, yyvsp[-2].ttype)); ;
break;}
case 819:
-#line 3614 "parse.y"
+#line 3584 "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 3624 "parse.y"
+#line 3594 "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 3628 "parse.y"
+#line 3598 "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 3631 "parse.y"
+#line 3601 "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 3635 "parse.y"
+#line 3605 "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 3639 "parse.y"
+#line 3609 "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 3643 "parse.y"
+#line 3613 "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 3650 "parse.y"
+#line 3620 "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 3653 "parse.y"
+#line 3623 "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 3664 "parse.y"
+#line 3634 "parse.y"
{ see_typename (); ;
break;}
case 831:
-#line 3669 "parse.y"
+#line 3639 "parse.y"
{
error ("type specifier omitted for parameter");
yyval.ttype = build_tree_list (integer_type_node, NULL_TREE);
;
break;}
case 832:
-#line 3674 "parse.y"
+#line 3644 "parse.y"
{
error ("type specifier omitted for parameter");
if (TREE_CODE (yyval.ttype) == SCOPE_REF
@@ -8099,192 +8069,192 @@ case 832:
;
break;}
case 833:
-#line 3686 "parse.y"
+#line 3656 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 834:
-#line 3688 "parse.y"
+#line 3658 "parse.y"
{ yyval.ttype = yyvsp[-1].ttype; ;
break;}
case 835:
-#line 3690 "parse.y"
+#line 3660 "parse.y"
{ yyval.ttype = empty_except_spec; ;
break;}
case 836:
-#line 3695 "parse.y"
+#line 3665 "parse.y"
{
check_for_new_type ("exception specifier", yyvsp[0].ftype);
yyval.ttype = groktypename (yyvsp[0].ftype.t);
;
break;}
case 837:
-#line 3703 "parse.y"
+#line 3673 "parse.y"
{ yyval.ttype = add_exception_specifier (NULL_TREE, yyvsp[0].ttype, 1); ;
break;}
case 838:
-#line 3705 "parse.y"
+#line 3675 "parse.y"
{ yyval.ttype = add_exception_specifier (yyvsp[-2].ttype, yyvsp[0].ttype, 1); ;
break;}
case 839:
-#line 3710 "parse.y"
+#line 3680 "parse.y"
{ yyval.ttype = NULL_TREE; ;
break;}
case 840:
-#line 3712 "parse.y"
+#line 3682 "parse.y"
{ yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 841:
-#line 3714 "parse.y"
+#line 3684 "parse.y"
{ yyval.ttype = make_reference_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
break;}
case 842:
-#line 3716 "parse.y"
+#line 3686 "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 3723 "parse.y"
+#line 3693 "parse.y"
{ got_scope = NULL_TREE; ;
break;}
case 844:
-#line 3728 "parse.y"
+#line 3698 "parse.y"
{ yyval.ttype = ansi_opname (MULT_EXPR); ;
break;}
case 845:
-#line 3730 "parse.y"
+#line 3700 "parse.y"
{ yyval.ttype = ansi_opname (TRUNC_DIV_EXPR); ;
break;}
case 846:
-#line 3732 "parse.y"
+#line 3702 "parse.y"
{ yyval.ttype = ansi_opname (TRUNC_MOD_EXPR); ;
break;}
case 847:
-#line 3734 "parse.y"
+#line 3704 "parse.y"
{ yyval.ttype = ansi_opname (PLUS_EXPR); ;
break;}
case 848:
-#line 3736 "parse.y"
+#line 3706 "parse.y"
{ yyval.ttype = ansi_opname (MINUS_EXPR); ;
break;}
case 849:
-#line 3738 "parse.y"
+#line 3708 "parse.y"
{ yyval.ttype = ansi_opname (BIT_AND_EXPR); ;
break;}
case 850:
-#line 3740 "parse.y"
+#line 3710 "parse.y"
{ yyval.ttype = ansi_opname (BIT_IOR_EXPR); ;
break;}
case 851:
-#line 3742 "parse.y"
+#line 3712 "parse.y"
{ yyval.ttype = ansi_opname (BIT_XOR_EXPR); ;
break;}
case 852:
-#line 3744 "parse.y"
+#line 3714 "parse.y"
{ yyval.ttype = ansi_opname (BIT_NOT_EXPR); ;
break;}
case 853:
-#line 3746 "parse.y"
+#line 3716 "parse.y"
{ yyval.ttype = ansi_opname (COMPOUND_EXPR); ;
break;}
case 854:
-#line 3748 "parse.y"
+#line 3718 "parse.y"
{ yyval.ttype = ansi_opname (yyvsp[0].code); ;
break;}
case 855:
-#line 3750 "parse.y"
+#line 3720 "parse.y"
{ yyval.ttype = ansi_opname (LT_EXPR); ;
break;}
case 856:
-#line 3752 "parse.y"
+#line 3722 "parse.y"
{ yyval.ttype = ansi_opname (GT_EXPR); ;
break;}
case 857:
-#line 3754 "parse.y"
+#line 3724 "parse.y"
{ yyval.ttype = ansi_opname (yyvsp[0].code); ;
break;}
case 858:
-#line 3756 "parse.y"
+#line 3726 "parse.y"
{ yyval.ttype = ansi_assopname (yyvsp[0].code); ;
break;}
case 859:
-#line 3758 "parse.y"
+#line 3728 "parse.y"
{ yyval.ttype = ansi_assopname (NOP_EXPR); ;
break;}
case 860:
-#line 3760 "parse.y"
+#line 3730 "parse.y"
{ yyval.ttype = ansi_opname (yyvsp[0].code); ;
break;}
case 861:
-#line 3762 "parse.y"
+#line 3732 "parse.y"
{ yyval.ttype = ansi_opname (yyvsp[0].code); ;
break;}
case 862:
-#line 3764 "parse.y"
+#line 3734 "parse.y"
{ yyval.ttype = ansi_opname (POSTINCREMENT_EXPR); ;
break;}
case 863:
-#line 3766 "parse.y"
+#line 3736 "parse.y"
{ yyval.ttype = ansi_opname (PREDECREMENT_EXPR); ;
break;}
case 864:
-#line 3768 "parse.y"
+#line 3738 "parse.y"
{ yyval.ttype = ansi_opname (TRUTH_ANDIF_EXPR); ;
break;}
case 865:
-#line 3770 "parse.y"
+#line 3740 "parse.y"
{ yyval.ttype = ansi_opname (TRUTH_ORIF_EXPR); ;
break;}
case 866:
-#line 3772 "parse.y"
+#line 3742 "parse.y"
{ yyval.ttype = ansi_opname (TRUTH_NOT_EXPR); ;
break;}
case 867:
-#line 3774 "parse.y"
+#line 3744 "parse.y"
{ yyval.ttype = ansi_opname (COND_EXPR); ;
break;}
case 868:
-#line 3776 "parse.y"
+#line 3746 "parse.y"
{ yyval.ttype = ansi_opname (yyvsp[0].code); ;
break;}
case 869:
-#line 3778 "parse.y"
+#line 3748 "parse.y"
{ yyval.ttype = ansi_opname (COMPONENT_REF); ;
break;}
case 870:
-#line 3780 "parse.y"
+#line 3750 "parse.y"
{ yyval.ttype = ansi_opname (MEMBER_REF); ;
break;}
case 871:
-#line 3782 "parse.y"
+#line 3752 "parse.y"
{ yyval.ttype = ansi_opname (CALL_EXPR); ;
break;}
case 872:
-#line 3784 "parse.y"
+#line 3754 "parse.y"
{ yyval.ttype = ansi_opname (ARRAY_REF); ;
break;}
case 873:
-#line 3786 "parse.y"
+#line 3756 "parse.y"
{ yyval.ttype = ansi_opname (NEW_EXPR); ;
break;}
case 874:
-#line 3788 "parse.y"
+#line 3758 "parse.y"
{ yyval.ttype = ansi_opname (DELETE_EXPR); ;
break;}
case 875:
-#line 3790 "parse.y"
+#line 3760 "parse.y"
{ yyval.ttype = ansi_opname (VEC_NEW_EXPR); ;
break;}
case 876:
-#line 3792 "parse.y"
+#line 3762 "parse.y"
{ yyval.ttype = ansi_opname (VEC_DELETE_EXPR); ;
break;}
case 877:
-#line 3795 "parse.y"
+#line 3765 "parse.y"
{ yyval.ttype = grokoptypename (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
break;}
case 878:
-#line 3797 "parse.y"
+#line 3767 "parse.y"
{ yyval.ttype = ansi_opname (ERROR_MARK); ;
break;}
}
@@ -8509,7 +8479,7 @@ yyerrhandle:
}
return 1;
}
-#line 3800 "parse.y"
+#line 3770 "parse.y"
#ifdef SPEW_DEBUG
diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y
index 5d0ff07..183def8 100644
--- a/gcc/cp/parse.y
+++ b/gcc/cp/parse.y
@@ -854,40 +854,10 @@ return_init:
base_init:
':' .set_base_init member_init_list
{
- tree member_init_list = NULL_TREE;
- tree base_init_list = NULL_TREE;
- tree init;
- tree next;
- int seen_member_init_p;
-
if ($3.new_type_flag == 0)
error ("no base or member initializers given following ':'");
-
- seen_member_init_p = 0;
- for (init = $3.t; init; init = next)
- {
- next = TREE_CHAIN (init);
- if (TREE_CODE (TREE_PURPOSE (init)) == FIELD_DECL)
- {
- TREE_CHAIN (init) = member_init_list;
- member_init_list = init;
- seen_member_init_p = 1;
- }
- else
- {
- if (warn_reorder && seen_member_init_p)
- {
- cp_warning ("base initializer for `%T'",
- TREE_PURPOSE (init));
- warning (" will be re-ordered to precede member initializations");
- }
-
- TREE_CHAIN (init) = base_init_list;
- base_init_list = init;
- }
- }
- setup_vtbl_ptr (member_init_list, base_init_list);
+ finish_mem_initializers ($3.t);
}
;
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 2621b8b..45a8fe3 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -1230,6 +1230,65 @@ finish_named_return_value (return_id, init)
DECL_UNINLINABLE (current_function_decl) = 1;
}
+/* The INIT_LIST is a list of mem-initializers, in the order they were
+ written by the user. The TREE_VALUE of each node is a list of
+ initializers for a particular subobject. The TREE_PURPOSE is a
+ FIELD_DECL is the initializer is for a non-static data member, and
+ a class type if the initializer is for a base class. */
+
+void
+finish_mem_initializers (init_list)
+ tree init_list;
+{
+ tree member_init_list;
+ tree base_init_list;
+ tree last_base_warned_about;
+ tree next;
+ tree init;
+
+ member_init_list = NULL_TREE;
+ base_init_list = NULL_TREE;
+ last_base_warned_about = NULL_TREE;
+
+ for (init = init_list; init; init = next)
+ {
+ next = TREE_CHAIN (init);
+ if (TREE_CODE (TREE_PURPOSE (init)) == FIELD_DECL)
+ {
+ TREE_CHAIN (init) = member_init_list;
+ member_init_list = init;
+
+ /* We're running through the initializers from right to left
+ as we process them here. So, if we see a data member
+ initializer after we see a base initializer, that
+ actually means that the base initializer preceeded the
+ data member initializer. */
+ if (warn_reorder && last_base_warned_about != base_init_list)
+ {
+ tree base;
+
+ for (base = base_init_list;
+ base != last_base_warned_about;
+ base = TREE_CHAIN (base))
+ {
+ cp_warning ("base initializer for `%T'",
+ TREE_PURPOSE (base));
+ warning (" will be re-ordered to precede member initializations");
+ }
+
+ last_base_warned_about = base_init_list;
+ }
+ }
+ else
+ {
+ TREE_CHAIN (init) = base_init_list;
+ base_init_list = init;
+ }
+ }
+
+ setup_vtbl_ptr (member_init_list, base_init_list);
+}
+
/* Cache the value of this class's main virtual function table pointer
in a register variable. This will save one indirection if a
more than one virtual function call is made this function. */
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index c890c37..cdf0c13 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -47,6 +47,7 @@ static tree mark_local_for_remap_r PARAMS ((tree *, int *, void *));
static tree cp_unsave_r PARAMS ((tree *, int *, void *));
static void cp_unsave PARAMS ((tree *));
static tree build_target_expr PARAMS ((tree, tree));
+static tree count_trees_r PARAMS ((tree *, int *, void *));
/* If REF is an lvalue, returns the kind of lvalue that REF is.
Otherwise, returns clk_none. If TREAT_CLASS_RVALUES_AS_LVALUES is
@@ -1396,15 +1397,15 @@ walk_tree (tp, func, data)
#undef WALK_SUBTREE
}
-int n_trees;
+/* Called from count_trees via walk_tree. */
static tree
count_trees_r (tp, walk_subtrees, data)
tree *tp ATTRIBUTE_UNUSED;
int *walk_subtrees ATTRIBUTE_UNUSED;
- void *data ATTRIBUTE_UNUSED;
+ void *data;
{
- ++n_trees;
+ ++ *((int*) data);
return NULL_TREE;
}
@@ -1415,8 +1416,8 @@ int
count_trees (t)
tree t;
{
- n_trees = 0;
- walk_tree (&t, count_trees_r, NULL);
+ int n_trees = 0;
+ walk_tree (&t, count_trees_r, &n_trees);
return n_trees;
}
generated by cgit v1.1 at 2024-11-03 16:27:36 +0000