From 1d0fdec1b41f695dbff22235de73611e743e0162 Mon Sep 17 00:00:00 2001 From: mmitchel Date: Mon, 25 Oct 1999 06:38:42 +0000 Subject: [PATCH] * decl.c (push_overloaded_decl_1): Use pushdecl. * decl.c (auto_function): Replace #ifdef'd __inline with just plain inline. * lex.c (my_get_run_time): Likeise. (yyprint): Likewise. (identifier_type): Likewise. * method.c (start_squangling): Likewise. (end_squangling): Likewise. (icat): Likewise. (old_backref_index): Likewise. (flush_repeats): Likewise. (issue_ktype): Likewise. * parse.y (empty_parms): Likewise. * parse.c: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30154 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 18 + gcc/cp/decl.c | 7 +- gcc/cp/lex.c | 15 +- gcc/cp/method.c | 16 +- gcc/cp/parse.c | 1621 +++++++++++++++++++++++++++--------------------------- gcc/cp/parse.y | 5 +- 6 files changed, 839 insertions(+), 843 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1a73c9e637a..bdacb7aec23 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,21 @@ +1999-10-24 Mark Mitchell + + * decl.c (push_overloaded_decl_1): Use pushdecl. + + * decl.c (auto_function): Replace #ifdef'd __inline with just + plain inline. + * lex.c (my_get_run_time): Likeise. + (yyprint): Likewise. + (identifier_type): Likewise. + * method.c (start_squangling): Likewise. + (end_squangling): Likewise. + (icat): Likewise. + (old_backref_index): Likewise. + (flush_repeats): Likewise. + (issue_ktype): Likewise. + * parse.y (empty_parms): Likewise. + * parse.c: Regenerated. + 1999-10-21 Mark Mitchell * dump.c (dequeue_and_dump): Replace several uses of diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 746e498e212..53578720f63 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -5947,13 +5947,10 @@ static void push_overloaded_decl_1 (x) tree x; { - push_overloaded_decl (x, PUSH_GLOBAL); + pushdecl (x); } -#ifdef __GNUC__ -__inline -#endif -tree +inline tree auto_function (name, type) tree name, type; { diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index 474e305686d..b4d973ab606 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -390,10 +390,7 @@ get_time_identifier (name) return time_identifier; } -#ifdef __GNUC__ -__inline -#endif -static int +static inline int my_get_run_time () { int old_quiet_flag = quiet_flag; @@ -954,10 +951,7 @@ reinit_parse_for_function () current_member_init_list = NULL_TREE; } -#ifdef __GNUC__ -__inline -#endif -void +inline void yyprint (file, yychar, yylval) FILE *file; int yychar; @@ -2983,10 +2977,7 @@ yyerror (string) Value is 0 if we treat this name in a default fashion. */ int looking_for_typename; -#ifdef __GNUC__ -__inline -#endif -int +inline int identifier_type (decl) tree decl; { diff --git a/gcc/cp/method.c b/gcc/cp/method.c index b1882816fa2..805cf15d797 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -21,10 +21,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __GNUC__ -#define __inline -#endif - /* Handle method declarations. */ #include "config.h" #include "system.h" @@ -216,7 +212,7 @@ static int nofold; mangled name currently being built. */ static int numeric_output_need_bar; -static __inline void +static inline void start_squangling () { if (flag_do_squangling) @@ -229,7 +225,7 @@ start_squangling () } } -static __inline void +static inline void end_squangling () { if (flag_do_squangling) @@ -243,7 +239,7 @@ end_squangling () /* Code to concatenate an asciified integer to a string. */ -static __inline void +static inline void icat (i) HOST_WIDE_INT i; { @@ -310,7 +306,7 @@ dicat (lo, hi) /* Returns the index of TYPE in the typevec, or -1 if it's not there. */ -static __inline int +static inline int old_backref_index (type) tree type; { @@ -338,7 +334,7 @@ old_backref_index (type) this is the first time we've seen it and we're just looking to see if it had been used before. */ -static __inline int +static inline int flush_repeats (nrepeats, type) int nrepeats; tree type; @@ -463,7 +459,7 @@ check_ktype (node, add) } -static __inline int +static inline int issue_ktype (decl) tree decl; { diff --git a/gcc/cp/parse.c b/gcc/cp/parse.c index 0ab090cec99..2076c384257 100644 --- a/gcc/cp/parse.c +++ b/gcc/cp/parse.c @@ -136,10 +136,7 @@ int have_extern_spec; int used_extern_spec; /* Cons up an empty parameter list. */ -#ifdef __GNUC__ -__inline -#endif -static tree +static inline tree empty_parms () { tree parms; @@ -153,7 +150,7 @@ empty_parms () } -#line 93 "parse.y" +#line 90 "parse.y" typedef union { long itype; tree ttype; @@ -162,7 +159,7 @@ typedef union { flagged_type_tree ftype; struct pending_inline *pi; } YYSTYPE; -#line 298 "parse.y" +#line 295 "parse.y" /* List of types and structure classes of the current declaration. */ static tree current_declspecs; @@ -660,94 +657,94 @@ static const short yyrhs[] = { -1, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 360, 362, 370, 373, 374, 378, 380, 383, 388, 392, - 398, 402, 405, 409, 412, 414, 416, 419, 421, 424, - 427, 429, 431, 433, 435, 436, 438, 439, 443, 446, - 455, 458, 460, 464, 467, 469, 473, 476, 488, 495, - 503, 505, 506, 508, 512, 515, 521, 524, 526, 531, - 534, 538, 541, 544, 547, 551, 556, 566, 568, 570, - 572, 574, 587, 590, 594, 597, 599, 601, 604, 607, - 611, 613, 615, 617, 622, 624, 626, 628, 630, 631, - 638, 639, 640, 643, 646, 650, 652, 653, 656, 658, - 661, 664, 666, 670, 673, 675, 679, 681, 683, 687, - 689, 691, 695, 697, 699, 705, 709, 712, 715, 718, - 723, 726, 728, 730, 736, 748, 751, 756, 761, 764, - 769, 774, 783, 786, 788, 792, 801, 817, 820, 822, - 823, 826, 833, 839, 841, 843, 845, 847, 850, 853, - 856, 858, 859, 860, 861, 864, 866, 867, 870, 872, - 873, 876, 881, 881, 885, 885, 888, 888, 891, 891, - 895, 895, 900, 900, 903, 903, 906, 908, 911, 918, - 922, 925, 928, 930, 934, 940, 949, 951, 959, 962, - 965, 968, 972, 975, 977, 980, 983, 985, 987, 989, - 993, 996, 999, 1004, 1008, 1013, 1017, 1020, 1021, 1025, - 1044, 1051, 1054, 1056, 1057, 1058, 1061, 1065, 1066, 1070, - 1074, 1077, 1079, 1083, 1086, 1089, 1093, 1096, 1098, 1100, - 1102, 1105, 1109, 1111, 1114, 1116, 1122, 1125, 1128, 1131, - 1143, 1148, 1152, 1156, 1161, 1163, 1167, 1171, 1173, 1175, - 1185, 1189, 1192, 1195, 1200, 1203, 1205, 1213, 1226, 1231, - 1237, 1239, 1241, 1254, 1257, 1259, 1261, 1263, 1265, 1267, - 1269, 1271, 1273, 1275, 1277, 1279, 1281, 1283, 1285, 1287, - 1289, 1291, 1293, 1295, 1297, 1301, 1303, 1305, 1322, 1325, - 1327, 1328, 1329, 1330, 1331, 1334, 1346, 1349, 1353, 1356, - 1358, 1363, 1365, 1366, 1369, 1371, 1379, 1381, 1383, 1385, - 1389, 1392, 1396, 1400, 1401, 1402, 1406, 1414, 1415, 1416, - 1430, 1432, 1435, 1437, 1448, 1453, 1455, 1457, 1459, 1461, - 1463, 1465, 1468, 1470, 1481, 1482, 1486, 1490, 1494, 1498, - 1500, 1504, 1506, 1508, 1516, 1518, 1520, 1522, 1526, 1528, - 1530, 1532, 1537, 1539, 1541, 1543, 1546, 1548, 1550, 1594, - 1597, 1601, 1604, 1608, 1611, 1616, 1618, 1622, 1631, 1634, - 1641, 1648, 1653, 1655, 1660, 1662, 1669, 1671, 1675, 1679, - 1685, 1689, 1692, 1696, 1699, 1709, 1711, 1714, 1718, 1721, - 1724, 1727, 1730, 1736, 1742, 1744, 1749, 1751, 1769, 1772, - 1774, 1777, 1783, 1785, 1795, 1799, 1802, 1805, 1810, 1813, - 1821, 1823, 1825, 1827, 1830, 1833, 1848, 1867, 1870, 1872, - 1875, 1877, 1881, 1883, 1887, 1889, 1893, 1896, 1900, 1906, - 1907, 1919, 1926, 1929, 1935, 1939, 1944, 1950, 1951, 1959, - 1962, 1966, 1969, 1973, 1978, 1981, 1985, 1988, 1990, 1992, - 1994, 2001, 2003, 2004, 2005, 2009, 2012, 2016, 2019, 2025, - 2027, 2030, 2033, 2036, 2042, 2045, 2048, 2050, 2052, 2056, - 2063, 2069, 2074, 2080, 2082, 2087, 2090, 2093, 2095, 2097, - 2101, 2106, 2113, 2117, 2124, 2127, 2130, 2136, 2138, 2150, - 2154, 2159, 2183, 2185, 2188, 2190, 2195, 2197, 2199, 2201, - 2203, 2205, 2209, 2217, 2220, 2222, 2226, 2233, 2239, 2245, - 2251, 2261, 2267, 2271, 2278, 2306, 2316, 2322, 2325, 2328, - 2330, 2334, 2336, 2340, 2343, 2347, 2350, 2353, 2355, 2359, - 2370, 2384, 2385, 2386, 2387, 2390, 2399, 2404, 2410, 2412, - 2417, 2419, 2421, 2423, 2425, 2427, 2430, 2440, 2447, 2472, - 2478, 2481, 2484, 2486, 2497, 2502, 2505, 2510, 2513, 2520, - 2530, 2533, 2540, 2550, 2552, 2555, 2557, 2560, 2567, 2575, - 2582, 2588, 2594, 2602, 2606, 2611, 2615, 2618, 2623, 2625, - 2633, 2635, 2639, 2642, 2647, 2651, 2657, 2668, 2671, 2675, - 2679, 2687, 2692, 2698, 2701, 2703, 2705, 2711, 2713, 2722, - 2725, 2727, 2729, 2731, 2735, 2738, 2741, 2743, 2745, 2747, - 2751, 2754, 2765, 2775, 2777, 2778, 2782, 2790, 2792, 2800, - 2803, 2805, 2807, 2809, 2813, 2816, 2819, 2821, 2823, 2825, - 2829, 2832, 2835, 2837, 2839, 2841, 2843, 2850, 2854, 2859, - 2863, 2868, 2870, 2874, 2877, 2879, 2882, 2884, 2885, 2888, - 2890, 2892, 2898, 2909, 2915, 2921, 2935, 2937, 2941, 2955, - 2957, 2959, 2963, 2969, 2982, 2984, 2988, 3001, 3007, 3009, - 3010, 3011, 3019, 3024, 3033, 3034, 3038, 3041, 3047, 3053, - 3056, 3058, 3060, 3062, 3066, 3070, 3074, 3077, 3081, 3083, - 3092, 3095, 3097, 3099, 3101, 3103, 3105, 3107, 3109, 3113, - 3117, 3121, 3125, 3127, 3129, 3131, 3133, 3135, 3137, 3139, - 3141, 3149, 3151, 3152, 3153, 3156, 3162, 3164, 3169, 3171, - 3174, 3187, 3190, 3193, 3197, 3200, 3207, 3209, 3212, 3214, - 3216, 3219, 3222, 3225, 3228, 3230, 3233, 3237, 3239, 3245, - 3247, 3248, 3250, 3255, 3257, 3259, 3261, 3263, 3266, 3267, - 3269, 3272, 3273, 3276, 3276, 3279, 3279, 3282, 3282, 3284, - 3286, 3288, 3290, 3296, 3302, 3305, 3308, 3314, 3316, 3317, - 3320, 3322, 3323, 3324, 3326, 3329, 3332, 3335, 3341, 3345, - 3347, 3350, 3352, 3355, 3359, 3361, 3364, 3366, 3369, 3386, - 3394, 3397, 3399, 3401, 3405, 3408, 3409, 3417, 3421, 3425, - 3428, 3429, 3435, 3438, 3441, 3443, 3447, 3452, 3455, 3465, - 3470, 3471, 3478, 3481, 3484, 3486, 3489, 3491, 3501, 3515, - 3519, 3522, 3524, 3528, 3532, 3535, 3538, 3540, 3544, 3546, - 3553, 3560, 3563, 3567, 3571, 3575, 3581, 3585, 3590, 3592, - 3595, 3600, 3606, 3617, 3620, 3622, 3626, 3634, 3637, 3641, - 3644, 3646, 3648, 3654, 3659, 3662, 3664, 3666, 3668, 3670, - 3672, 3674, 3676, 3678, 3680, 3682, 3684, 3686, 3688, 3690, - 3692, 3694, 3696, 3698, 3700, 3702, 3704, 3706, 3708, 3710, - 3712, 3714, 3716, 3718, 3720, 3722, 3724, 3727, 3729 + 357, 359, 367, 370, 371, 375, 377, 380, 385, 389, + 395, 399, 402, 406, 409, 411, 413, 416, 418, 421, + 424, 426, 428, 430, 432, 433, 435, 436, 440, 443, + 452, 455, 457, 461, 464, 466, 470, 473, 485, 492, + 500, 502, 503, 505, 509, 512, 518, 521, 523, 528, + 531, 535, 538, 541, 544, 548, 553, 563, 565, 567, + 569, 571, 584, 587, 591, 594, 596, 598, 601, 604, + 608, 610, 612, 614, 619, 621, 623, 625, 627, 628, + 635, 636, 637, 640, 643, 647, 649, 650, 653, 655, + 658, 661, 663, 667, 670, 672, 676, 678, 680, 684, + 686, 688, 692, 694, 696, 702, 706, 709, 712, 715, + 720, 723, 725, 727, 733, 745, 748, 753, 758, 761, + 766, 771, 780, 783, 785, 789, 798, 814, 817, 819, + 820, 823, 830, 836, 838, 840, 842, 844, 847, 850, + 853, 855, 856, 857, 858, 861, 863, 864, 867, 869, + 870, 873, 878, 878, 882, 882, 885, 885, 888, 888, + 892, 892, 897, 897, 900, 900, 903, 905, 908, 915, + 919, 922, 925, 927, 931, 937, 946, 948, 956, 959, + 962, 965, 969, 972, 974, 977, 980, 982, 984, 986, + 990, 993, 996, 1001, 1005, 1010, 1014, 1017, 1018, 1022, + 1041, 1048, 1051, 1053, 1054, 1055, 1058, 1062, 1063, 1067, + 1071, 1074, 1076, 1080, 1083, 1086, 1090, 1093, 1095, 1097, + 1099, 1102, 1106, 1108, 1111, 1113, 1119, 1122, 1125, 1128, + 1140, 1145, 1149, 1153, 1158, 1160, 1164, 1168, 1170, 1172, + 1182, 1186, 1189, 1192, 1197, 1200, 1202, 1210, 1223, 1228, + 1234, 1236, 1238, 1251, 1254, 1256, 1258, 1260, 1262, 1264, + 1266, 1268, 1270, 1272, 1274, 1276, 1278, 1280, 1282, 1284, + 1286, 1288, 1290, 1292, 1294, 1298, 1300, 1302, 1319, 1322, + 1324, 1325, 1326, 1327, 1328, 1331, 1343, 1346, 1350, 1353, + 1355, 1360, 1362, 1363, 1366, 1368, 1376, 1378, 1380, 1382, + 1386, 1389, 1393, 1397, 1398, 1399, 1403, 1411, 1412, 1413, + 1427, 1429, 1432, 1434, 1445, 1450, 1452, 1454, 1456, 1458, + 1460, 1462, 1465, 1467, 1478, 1479, 1483, 1487, 1491, 1495, + 1497, 1501, 1503, 1505, 1513, 1515, 1517, 1519, 1523, 1525, + 1527, 1529, 1534, 1536, 1538, 1540, 1543, 1545, 1547, 1591, + 1594, 1598, 1601, 1605, 1608, 1613, 1615, 1619, 1628, 1631, + 1638, 1645, 1650, 1652, 1657, 1659, 1666, 1668, 1672, 1676, + 1682, 1686, 1689, 1693, 1696, 1706, 1708, 1711, 1715, 1718, + 1721, 1724, 1727, 1733, 1739, 1741, 1746, 1748, 1766, 1769, + 1771, 1774, 1780, 1782, 1792, 1796, 1799, 1802, 1807, 1810, + 1818, 1820, 1822, 1824, 1827, 1830, 1845, 1864, 1867, 1869, + 1872, 1874, 1878, 1880, 1884, 1886, 1890, 1893, 1897, 1903, + 1904, 1916, 1923, 1926, 1932, 1936, 1941, 1947, 1948, 1956, + 1959, 1963, 1966, 1970, 1975, 1978, 1982, 1985, 1987, 1989, + 1991, 1998, 2000, 2001, 2002, 2006, 2009, 2013, 2016, 2022, + 2024, 2027, 2030, 2033, 2039, 2042, 2045, 2047, 2049, 2053, + 2060, 2066, 2071, 2077, 2079, 2084, 2087, 2090, 2092, 2094, + 2098, 2103, 2110, 2114, 2121, 2124, 2127, 2133, 2135, 2147, + 2151, 2156, 2180, 2182, 2185, 2187, 2192, 2194, 2196, 2198, + 2200, 2202, 2206, 2214, 2217, 2219, 2223, 2230, 2236, 2242, + 2248, 2258, 2264, 2268, 2275, 2303, 2313, 2319, 2322, 2325, + 2327, 2331, 2333, 2337, 2340, 2344, 2347, 2350, 2352, 2356, + 2367, 2381, 2382, 2383, 2384, 2387, 2396, 2401, 2407, 2409, + 2414, 2416, 2418, 2420, 2422, 2424, 2427, 2437, 2444, 2469, + 2475, 2478, 2481, 2483, 2494, 2499, 2502, 2507, 2510, 2517, + 2527, 2530, 2537, 2547, 2549, 2552, 2554, 2557, 2564, 2572, + 2579, 2585, 2591, 2599, 2603, 2608, 2612, 2615, 2620, 2622, + 2630, 2632, 2636, 2639, 2644, 2648, 2654, 2665, 2668, 2672, + 2676, 2684, 2689, 2695, 2698, 2700, 2702, 2708, 2710, 2719, + 2722, 2724, 2726, 2728, 2732, 2735, 2738, 2740, 2742, 2744, + 2748, 2751, 2762, 2772, 2774, 2775, 2779, 2787, 2789, 2797, + 2800, 2802, 2804, 2806, 2810, 2813, 2816, 2818, 2820, 2822, + 2826, 2829, 2832, 2834, 2836, 2838, 2840, 2847, 2851, 2856, + 2860, 2865, 2867, 2871, 2874, 2876, 2879, 2881, 2882, 2885, + 2887, 2889, 2895, 2906, 2912, 2918, 2932, 2934, 2938, 2952, + 2954, 2956, 2960, 2966, 2979, 2981, 2985, 2998, 3004, 3006, + 3007, 3008, 3016, 3021, 3030, 3031, 3035, 3038, 3044, 3050, + 3053, 3055, 3057, 3059, 3063, 3067, 3071, 3074, 3078, 3080, + 3089, 3092, 3094, 3096, 3098, 3100, 3102, 3104, 3106, 3110, + 3114, 3118, 3122, 3124, 3126, 3128, 3130, 3132, 3134, 3136, + 3138, 3146, 3148, 3149, 3150, 3153, 3159, 3161, 3166, 3168, + 3171, 3184, 3187, 3190, 3194, 3197, 3204, 3206, 3209, 3211, + 3213, 3216, 3219, 3222, 3225, 3227, 3230, 3234, 3236, 3242, + 3244, 3245, 3247, 3252, 3254, 3256, 3258, 3260, 3263, 3264, + 3266, 3269, 3270, 3273, 3273, 3276, 3276, 3279, 3279, 3281, + 3283, 3285, 3287, 3293, 3299, 3302, 3305, 3311, 3313, 3314, + 3317, 3319, 3320, 3321, 3323, 3326, 3329, 3332, 3338, 3342, + 3344, 3347, 3349, 3352, 3356, 3358, 3361, 3363, 3366, 3383, + 3391, 3394, 3396, 3398, 3402, 3405, 3406, 3414, 3418, 3422, + 3425, 3426, 3432, 3435, 3438, 3440, 3444, 3449, 3452, 3462, + 3467, 3468, 3475, 3478, 3481, 3483, 3486, 3488, 3498, 3512, + 3516, 3519, 3521, 3525, 3529, 3532, 3535, 3537, 3541, 3543, + 3550, 3557, 3560, 3564, 3568, 3572, 3578, 3582, 3587, 3589, + 3592, 3597, 3603, 3614, 3617, 3619, 3623, 3631, 3634, 3638, + 3641, 3643, 3645, 3651, 3656, 3659, 3661, 3663, 3665, 3667, + 3669, 3671, 3673, 3675, 3677, 3679, 3681, 3683, 3685, 3687, + 3689, 3691, 3693, 3695, 3697, 3699, 3701, 3703, 3705, 3707, + 3709, 3711, 3713, 3715, 3717, 3719, 3721, 3724, 3726 }; #endif @@ -4458,106 +4455,106 @@ yyreduce: switch (yyn) { case 2: -#line 363 "parse.y" +#line 360 "parse.y" { finish_translation_unit (); ; break;} case 3: -#line 371 "parse.y" +#line 368 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 4: -#line 373 "parse.y" +#line 370 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 5: -#line 375 "parse.y" +#line 372 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 8: -#line 384 "parse.y" +#line 381 "parse.y" { have_extern_spec = 1; used_extern_spec = 0; yyval.ttype = NULL_TREE; ; break;} case 9: -#line 389 "parse.y" +#line 386 "parse.y" { have_extern_spec = 0; ; break;} case 10: -#line 394 "parse.y" +#line 391 "parse.y" { yyval.itype = pedantic; pedantic = 0; ; break;} case 12: -#line 403 "parse.y" +#line 400 "parse.y" { if (pending_lang_change) do_pending_lang_change(); ; break;} case 13: -#line 405 "parse.y" +#line 402 "parse.y" { if (! toplevel_bindings_p ()) pop_everything (); ; break;} case 14: -#line 411 "parse.y" +#line 408 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 15: -#line 413 "parse.y" +#line 410 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 16: -#line 415 "parse.y" +#line 412 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 17: -#line 417 "parse.y" +#line 414 "parse.y" { if (TREE_CHAIN (yyvsp[-2].ttype)) yyvsp[-2].ttype = combine_strings (yyvsp[-2].ttype); assemble_asm (yyvsp[-2].ttype); ; break;} case 18: -#line 420 "parse.y" +#line 417 "parse.y" { pop_lang_context (); ; break;} case 19: -#line 422 "parse.y" +#line 419 "parse.y" { if (pending_inlines) do_pending_inlines (); pop_lang_context (); ; break;} case 20: -#line 425 "parse.y" +#line 422 "parse.y" { if (pending_inlines) do_pending_inlines (); pop_lang_context (); ; break;} case 21: -#line 428 "parse.y" +#line 425 "parse.y" { push_namespace (yyvsp[-1].ttype); ; break;} case 22: -#line 430 "parse.y" +#line 427 "parse.y" { pop_namespace (); ; break;} case 23: -#line 432 "parse.y" +#line 429 "parse.y" { push_namespace (NULL_TREE); ; break;} case 24: -#line 434 "parse.y" +#line 431 "parse.y" { pop_namespace (); ; break;} case 26: -#line 437 "parse.y" +#line 434 "parse.y" { do_toplevel_using_decl (yyvsp[-1].ttype); ; break;} case 28: -#line 440 "parse.y" +#line 437 "parse.y" { pedantic = yyvsp[-1].itype; ; break;} case 29: -#line 445 "parse.y" +#line 442 "parse.y" { begin_only_namespace_names (); ; break;} case 30: -#line 447 "parse.y" +#line 444 "parse.y" { end_only_namespace_names (); if (lastiddecl) @@ -4566,35 +4563,35 @@ case 30: ; break;} case 31: -#line 457 "parse.y" +#line 454 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 32: -#line 459 "parse.y" +#line 456 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 33: -#line 461 "parse.y" +#line 458 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 34: -#line 466 "parse.y" +#line 463 "parse.y" { yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 35: -#line 468 "parse.y" +#line 465 "parse.y" { yyval.ttype = build_parse_node (SCOPE_REF, global_namespace, yyvsp[0].ttype); ; break;} case 36: -#line 470 "parse.y" +#line 467 "parse.y" { yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 37: -#line 475 "parse.y" +#line 472 "parse.y" { begin_only_namespace_names (); ; break;} case 38: -#line 477 "parse.y" +#line 474 "parse.y" { end_only_namespace_names (); /* If no declaration was found, the using-directive is @@ -4606,7 +4603,7 @@ case 38: ; break;} case 39: -#line 490 "parse.y" +#line 487 "parse.y" { if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -4614,7 +4611,7 @@ case 39: ; break;} case 40: -#line 496 "parse.y" +#line 493 "parse.y" { yyval.ttype = yyvsp[-1].ttype; if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE) @@ -4623,86 +4620,86 @@ case 40: ; break;} case 43: -#line 507 "parse.y" +#line 504 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 44: -#line 509 "parse.y" +#line 506 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 45: -#line 514 "parse.y" +#line 511 "parse.y" { push_lang_context (yyvsp[0].ttype); ; break;} case 46: -#line 516 "parse.y" +#line 513 "parse.y" { if (current_lang_name != yyvsp[0].ttype) cp_error ("use of linkage spec `%D' is different from previous spec `%D'", yyvsp[0].ttype, current_lang_name); pop_lang_context (); push_lang_context (yyvsp[0].ttype); ; break;} case 47: -#line 523 "parse.y" +#line 520 "parse.y" { begin_template_parm_list (); ; break;} case 48: -#line 525 "parse.y" +#line 522 "parse.y" { yyval.ttype = end_template_parm_list (yyvsp[-1].ttype); ; break;} case 49: -#line 527 "parse.y" +#line 524 "parse.y" { begin_specialization(); yyval.ttype = NULL_TREE; ; break;} case 50: -#line 533 "parse.y" +#line 530 "parse.y" { yyval.ttype = process_template_parm (NULL_TREE, yyvsp[0].ttype); ; break;} case 51: -#line 535 "parse.y" +#line 532 "parse.y" { yyval.ttype = process_template_parm (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 52: -#line 540 "parse.y" +#line 537 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 53: -#line 542 "parse.y" +#line 539 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 54: -#line 546 "parse.y" +#line 543 "parse.y" { yyval.ttype = finish_template_type_parm (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 55: -#line 548 "parse.y" +#line 545 "parse.y" { yyval.ttype = finish_template_type_parm (class_type_node, yyvsp[0].ttype); ; break;} case 56: -#line 553 "parse.y" +#line 550 "parse.y" { yyval.ttype = finish_template_template_parm (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 57: -#line 565 "parse.y" +#line 562 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ; break;} case 58: -#line 567 "parse.y" +#line 564 "parse.y" { yyval.ttype = build_tree_list (groktypename (yyvsp[0].ftype.t), yyvsp[-2].ttype); ; break;} case 59: -#line 569 "parse.y" +#line 566 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ftype.t); ; break;} case 60: -#line 571 "parse.y" +#line 568 "parse.y" { yyval.ttype = build_tree_list (yyvsp[0].ttype, yyvsp[-2].ftype.t); ; break;} case 61: -#line 573 "parse.y" +#line 570 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ; break;} case 62: -#line 575 "parse.y" +#line 572 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) != TEMPLATE_DECL && TREE_CODE (yyvsp[0].ttype) != TEMPLATE_TEMPLATE_PARM @@ -4715,66 +4712,66 @@ case 62: ; break;} case 63: -#line 589 "parse.y" +#line 586 "parse.y" { finish_template_decl (yyvsp[-1].ttype); ; break;} case 64: -#line 591 "parse.y" +#line 588 "parse.y" { finish_template_decl (yyvsp[-1].ttype); ; break;} case 65: -#line 596 "parse.y" +#line 593 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 66: -#line 598 "parse.y" +#line 595 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 67: -#line 600 "parse.y" +#line 597 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 68: -#line 602 "parse.y" +#line 599 "parse.y" { if (pending_inlines) do_pending_inlines (); pop_lang_context (); ; break;} case 69: -#line 605 "parse.y" +#line 602 "parse.y" { if (pending_inlines) do_pending_inlines (); pop_lang_context (); ; break;} case 70: -#line 608 "parse.y" +#line 605 "parse.y" { pedantic = yyvsp[-1].itype; ; break;} case 72: -#line 614 "parse.y" +#line 611 "parse.y" {; break;} case 73: -#line 616 "parse.y" +#line 613 "parse.y" { note_list_got_semicolon (yyvsp[-2].ftype.t); ; break;} case 74: -#line 618 "parse.y" +#line 615 "parse.y" { maybe_process_partial_specialization (yyvsp[-1].ftype.t); note_got_semicolon (yyvsp[-1].ftype.t); ; break;} case 76: -#line 625 "parse.y" +#line 622 "parse.y" {; break;} case 77: -#line 627 "parse.y" +#line 624 "parse.y" { note_list_got_semicolon (yyvsp[-2].ftype.t); ; break;} case 78: -#line 629 "parse.y" +#line 626 "parse.y" { pedwarn ("empty declaration"); ; break;} case 80: -#line 632 "parse.y" +#line 629 "parse.y" { tree t, attrs; split_specs_attrs (yyvsp[-1].ftype.t, &t, &attrs); @@ -4783,124 +4780,124 @@ case 80: ; break;} case 84: -#line 645 "parse.y" +#line 642 "parse.y" { yyval.itype = 0; ; break;} case 85: -#line 647 "parse.y" +#line 644 "parse.y" { yyval.itype = 1; ; break;} case 91: -#line 663 "parse.y" +#line 660 "parse.y" { expand_body (finish_function (lineno, (int)yyvsp[-1].itype)); ; break;} case 92: -#line 665 "parse.y" +#line 662 "parse.y" { expand_body (finish_function (lineno, (int)yyvsp[0].itype)); ; break;} case 93: -#line 667 "parse.y" +#line 664 "parse.y" { ; break;} case 94: -#line 672 "parse.y" +#line 669 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 95: -#line 674 "parse.y" +#line 671 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 96: -#line 676 "parse.y" +#line 673 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 97: -#line 680 "parse.y" +#line 677 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 98: -#line 682 "parse.y" +#line 679 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 99: -#line 684 "parse.y" +#line 681 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 100: -#line 688 "parse.y" +#line 685 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 101: -#line 690 "parse.y" +#line 687 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 102: -#line 692 "parse.y" +#line 689 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 103: -#line 696 "parse.y" +#line 693 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 104: -#line 698 "parse.y" +#line 695 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 105: -#line 700 "parse.y" +#line 697 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 106: -#line 707 "parse.y" +#line 704 "parse.y" { if (!begin_function_definition (yyvsp[-1].ftype.t, yyvsp[0].ttype)) YYERROR1; ; break;} case 107: -#line 710 "parse.y" +#line 707 "parse.y" { if (!begin_function_definition (yyvsp[-1].ttype, yyvsp[0].ttype)) YYERROR1; ; break;} case 108: -#line 713 "parse.y" +#line 710 "parse.y" { if (!begin_function_definition (NULL_TREE, yyvsp[0].ttype)) YYERROR1; ; break;} case 109: -#line 716 "parse.y" +#line 713 "parse.y" { if (!begin_function_definition (yyvsp[-1].ttype, yyvsp[0].ttype)) YYERROR1; ; break;} case 110: -#line 719 "parse.y" +#line 716 "parse.y" { if (!begin_function_definition (NULL_TREE, yyvsp[0].ttype)) YYERROR1; ; break;} case 111: -#line 725 "parse.y" +#line 722 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-5].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 112: -#line 727 "parse.y" +#line 724 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-3].ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 113: -#line 729 "parse.y" +#line 726 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-5].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 114: -#line 731 "parse.y" +#line 728 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-3].ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 115: -#line 738 "parse.y" +#line 735 "parse.y" { tree specs, attrs; split_specs_attrs (yyvsp[-1].ttype, &specs, &attrs); attrs = build_tree_list (attrs, NULL_TREE); @@ -4913,43 +4910,43 @@ case 115: reinit_parse_for_method (yychar, yyval.ttype); ; break;} case 116: -#line 749 "parse.y" +#line 746 "parse.y" { yyval.ttype = start_method (NULL_TREE, yyvsp[0].ttype, NULL_TREE); goto rest_of_mdef; ; break;} case 117: -#line 752 "parse.y" +#line 749 "parse.y" { tree specs, attrs; split_specs_attrs (yyvsp[-1].ftype.t, &specs, &attrs); attrs = build_tree_list (attrs, NULL_TREE); yyval.ttype = start_method (specs, yyvsp[0].ttype, attrs); goto rest_of_mdef; ; break;} case 118: -#line 757 "parse.y" +#line 754 "parse.y" { tree specs, attrs; split_specs_attrs (yyvsp[-1].ttype, &specs, &attrs); attrs = build_tree_list (attrs, NULL_TREE); yyval.ttype = start_method (specs, yyvsp[0].ttype, attrs); goto rest_of_mdef; ; break;} case 119: -#line 762 "parse.y" +#line 759 "parse.y" { yyval.ttype = start_method (NULL_TREE, yyval.ttype, NULL_TREE); goto rest_of_mdef; ; break;} case 120: -#line 765 "parse.y" +#line 762 "parse.y" { tree specs, attrs; split_specs_attrs (yyvsp[-1].ttype, &specs, &attrs); attrs = build_tree_list (attrs, NULL_TREE); yyval.ttype = start_method (specs, yyvsp[0].ttype, attrs); goto rest_of_mdef; ; break;} case 121: -#line 770 "parse.y" +#line 767 "parse.y" { yyval.ttype = start_method (NULL_TREE, yyval.ttype, NULL_TREE); goto rest_of_mdef; ; break;} case 122: -#line 776 "parse.y" +#line 773 "parse.y" { if (! current_function_parms_stored) store_parm_decls (); @@ -4957,19 +4954,19 @@ case 122: ; break;} case 123: -#line 785 "parse.y" +#line 782 "parse.y" { finish_named_return_value (yyval.ttype, yyvsp[0].ttype); ; break;} case 124: -#line 787 "parse.y" +#line 784 "parse.y" { finish_named_return_value (yyval.ttype, yyvsp[-1].ttype); ; break;} case 125: -#line 789 "parse.y" +#line 786 "parse.y" { finish_named_return_value (yyval.ttype, NULL_TREE); ; break;} case 126: -#line 794 "parse.y" +#line 791 "parse.y" { if (yyvsp[0].itype == 0) error ("no base initializers given following ':'"); @@ -4977,7 +4974,7 @@ case 126: ; break;} case 127: -#line 803 "parse.y" +#line 800 "parse.y" { if (! current_function_parms_stored) store_parm_decls (); @@ -4992,15 +4989,15 @@ case 127: ; break;} case 128: -#line 819 "parse.y" +#line 816 "parse.y" { yyval.itype = 0; ; break;} case 129: -#line 821 "parse.y" +#line 818 "parse.y" { yyval.itype = 1; ; break;} case 132: -#line 828 "parse.y" +#line 825 "parse.y" { if (current_class_name) pedwarn ("anachronistic old style base class initializer"); @@ -5008,7 +5005,7 @@ case 132: ; break;} case 133: -#line 834 "parse.y" +#line 831 "parse.y" { if (current_class_name) pedwarn ("anachronistic old style base class initializer"); @@ -5016,93 +5013,93 @@ case 133: ; break;} case 134: -#line 840 "parse.y" +#line 837 "parse.y" { expand_member_init (current_class_ref, yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 135: -#line 842 "parse.y" +#line 839 "parse.y" { expand_member_init (current_class_ref, yyvsp[-1].ttype, void_type_node); ; break;} case 136: -#line 844 "parse.y" +#line 841 "parse.y" { expand_member_init (current_class_ref, yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 137: -#line 846 "parse.y" +#line 843 "parse.y" { expand_member_init (current_class_ref, yyvsp[-1].ttype, void_type_node); ; break;} case 138: -#line 848 "parse.y" +#line 845 "parse.y" { expand_member_init (current_class_ref, TYPE_MAIN_DECL (yyvsp[-3].ttype), yyvsp[-1].ttype); ; break;} case 139: -#line 851 "parse.y" +#line 848 "parse.y" { expand_member_init (current_class_ref, TYPE_MAIN_DECL (yyvsp[-1].ttype), void_type_node); ; break;} case 152: -#line 878 "parse.y" +#line 875 "parse.y" { do_type_instantiation (yyvsp[-1].ftype.t, NULL_TREE); yyungetc (';', 1); ; break;} case 154: -#line 882 "parse.y" +#line 879 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ftype.t); do_decl_instantiation (specs, yyvsp[0].ttype, NULL_TREE); ; break;} case 156: -#line 886 "parse.y" +#line 883 "parse.y" { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ; break;} case 158: -#line 889 "parse.y" +#line 886 "parse.y" { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ; break;} case 160: -#line 892 "parse.y" +#line 889 "parse.y" { do_type_instantiation (yyvsp[-1].ftype.t, yyvsp[-4].ttype); yyungetc (';', 1); ; break;} case 162: -#line 897 "parse.y" +#line 894 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ftype.t); do_decl_instantiation (specs, yyvsp[0].ttype, yyvsp[-4].ttype); ; break;} case 164: -#line 901 "parse.y" +#line 898 "parse.y" { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, yyvsp[-3].ttype); ; break;} case 166: -#line 904 "parse.y" +#line 901 "parse.y" { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, yyvsp[-3].ttype); ; break;} case 168: -#line 909 "parse.y" +#line 906 "parse.y" { begin_explicit_instantiation(); ; break;} case 169: -#line 912 "parse.y" +#line 909 "parse.y" { end_explicit_instantiation(); ; break;} case 170: -#line 921 "parse.y" +#line 918 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 171: -#line 924 "parse.y" +#line 921 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 174: -#line 932 "parse.y" +#line 929 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 175: -#line 937 "parse.y" +#line 934 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 176: -#line 941 "parse.y" +#line 938 "parse.y" { if (yychar == YYEMPTY) yychar = YYLEX; @@ -5112,7 +5109,7 @@ case 176: ; break;} case 178: -#line 952 "parse.y" +#line 949 "parse.y" { /* Handle `Class>' without space in the `>>' */ pedwarn ("`>>' should be `> >' in template class name"); @@ -5120,79 +5117,79 @@ case 178: ; break;} case 179: -#line 961 "parse.y" +#line 958 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 181: -#line 967 "parse.y" +#line 964 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ; break;} case 182: -#line 969 "parse.y" +#line 966 "parse.y" { yyval.ttype = chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 183: -#line 974 "parse.y" +#line 971 "parse.y" { yyval.ttype = groktypename (yyvsp[0].ftype.t); ; break;} case 184: -#line 976 "parse.y" +#line 973 "parse.y" { yyval.ttype = lastiddecl; ; break;} case 186: -#line 982 "parse.y" +#line 979 "parse.y" { yyval.code = NEGATE_EXPR; ; break;} case 187: -#line 984 "parse.y" +#line 981 "parse.y" { yyval.code = CONVERT_EXPR; ; break;} case 188: -#line 986 "parse.y" +#line 983 "parse.y" { yyval.code = PREINCREMENT_EXPR; ; break;} case 189: -#line 988 "parse.y" +#line 985 "parse.y" { yyval.code = PREDECREMENT_EXPR; ; break;} case 190: -#line 990 "parse.y" +#line 987 "parse.y" { yyval.code = TRUTH_NOT_EXPR; ; break;} case 191: -#line 995 "parse.y" +#line 992 "parse.y" { yyval.ttype = build_x_compound_expr (yyval.ttype); ; break;} case 193: -#line 1001 "parse.y" +#line 998 "parse.y" { error ("ANSI C++ forbids an empty condition for `%s'", cond_stmt_keyword); yyval.ttype = integer_zero_node; ; break;} case 194: -#line 1005 "parse.y" +#line 1002 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 195: -#line 1010 "parse.y" +#line 1007 "parse.y" { error ("ANSI C++ forbids an empty condition for `%s'", cond_stmt_keyword); yyval.ttype = integer_zero_node; ; break;} case 196: -#line 1014 "parse.y" +#line 1011 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 197: -#line 1019 "parse.y" +#line 1016 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 199: -#line 1022 "parse.y" +#line 1019 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 200: -#line 1027 "parse.y" +#line 1024 "parse.y" { { tree d; for (d = getdecls (); d; d = TREE_CHAIN (d)) @@ -5211,7 +5208,7 @@ case 200: ; break;} case 201: -#line 1044 "parse.y" +#line 1041 "parse.y" { cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-3].ttype, 1, LOOKUP_ONLYCONVERTING); resume_momentary (yyvsp[-2].itype); @@ -5221,188 +5218,188 @@ case 201: ; break;} case 207: -#line 1063 "parse.y" +#line 1060 "parse.y" { yyval.ttype = begin_compound_stmt (1); ; break;} case 208: -#line 1065 "parse.y" +#line 1062 "parse.y" { finish_compound_stmt (1, yyvsp[-1].ttype); ; break;} case 210: -#line 1072 "parse.y" +#line 1069 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, build_expr_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 211: -#line 1075 "parse.y" +#line 1072 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, build_expr_list (NULL_TREE, error_mark_node)); ; break;} case 212: -#line 1078 "parse.y" +#line 1075 "parse.y" { chainon (yyval.ttype, build_expr_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 213: -#line 1080 "parse.y" +#line 1077 "parse.y" { chainon (yyval.ttype, build_expr_list (NULL_TREE, error_mark_node)); ; break;} case 214: -#line 1085 "parse.y" +#line 1082 "parse.y" { yyval.ttype = build_expr_list (NULL_TREE, yyval.ttype); ; break;} case 216: -#line 1091 "parse.y" +#line 1088 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 217: -#line 1094 "parse.y" +#line 1091 "parse.y" { yyval.ttype = yyvsp[0].ttype; pedantic = yyvsp[-1].itype; ; break;} case 218: -#line 1097 "parse.y" +#line 1094 "parse.y" { yyval.ttype = build_x_indirect_ref (yyvsp[0].ttype, "unary *"); ; break;} case 219: -#line 1099 "parse.y" +#line 1096 "parse.y" { yyval.ttype = build_x_unary_op (ADDR_EXPR, yyvsp[0].ttype); ; break;} case 220: -#line 1101 "parse.y" +#line 1098 "parse.y" { yyval.ttype = build_x_unary_op (BIT_NOT_EXPR, yyvsp[0].ttype); ; break;} case 221: -#line 1103 "parse.y" +#line 1100 "parse.y" { yyval.ttype = finish_unary_op_expr (yyvsp[-1].code, yyvsp[0].ttype); ; break;} case 222: -#line 1106 "parse.y" +#line 1103 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids `&&'"); yyval.ttype = finish_label_address_expr (yyvsp[0].ttype); ; break;} case 223: -#line 1110 "parse.y" +#line 1107 "parse.y" { yyval.ttype = expr_sizeof (yyvsp[0].ttype); ; break;} case 224: -#line 1112 "parse.y" +#line 1109 "parse.y" { yyval.ttype = c_sizeof (groktypename (yyvsp[-1].ftype.t)); check_for_new_type ("sizeof", yyvsp[-1].ftype); ; break;} case 225: -#line 1115 "parse.y" +#line 1112 "parse.y" { yyval.ttype = grok_alignof (yyvsp[0].ttype); ; break;} case 226: -#line 1117 "parse.y" +#line 1114 "parse.y" { yyval.ttype = c_alignof (groktypename (yyvsp[-1].ftype.t)); check_for_new_type ("alignof", yyvsp[-1].ftype); ; break;} case 227: -#line 1123 "parse.y" +#line 1120 "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 1126 "parse.y" +#line 1123 "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 1129 "parse.y" +#line 1126 "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 1132 "parse.y" +#line 1129 "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 1145 "parse.y" +#line 1142 "parse.y" { yyval.ttype = build_new (NULL_TREE, groktypename(yyvsp[-1].ftype.t), NULL_TREE, yyvsp[-4].itype); check_for_new_type ("new", yyvsp[-1].ftype); ; break;} case 232: -#line 1150 "parse.y" +#line 1147 "parse.y" { yyval.ttype = build_new (NULL_TREE, groktypename(yyvsp[-2].ftype.t), yyvsp[0].ttype, yyvsp[-5].itype); check_for_new_type ("new", yyvsp[-2].ftype); ; break;} case 233: -#line 1154 "parse.y" +#line 1151 "parse.y" { yyval.ttype = build_new (yyvsp[-4].ttype, groktypename(yyvsp[-1].ftype.t), NULL_TREE, yyvsp[-5].itype); check_for_new_type ("new", yyvsp[-1].ftype); ; break;} case 234: -#line 1158 "parse.y" +#line 1155 "parse.y" { yyval.ttype = build_new (yyvsp[-5].ttype, groktypename(yyvsp[-2].ftype.t), yyvsp[0].ttype, yyvsp[-6].itype); check_for_new_type ("new", yyvsp[-2].ftype); ; break;} case 235: -#line 1162 "parse.y" +#line 1159 "parse.y" { yyval.ttype = delete_sanity (yyvsp[0].ttype, NULL_TREE, 0, yyvsp[-1].itype); ; break;} case 236: -#line 1164 "parse.y" +#line 1161 "parse.y" { yyval.ttype = delete_sanity (yyvsp[0].ttype, NULL_TREE, 1, yyvsp[-3].itype); if (yychar == YYEMPTY) yychar = YYLEX; ; break;} case 237: -#line 1168 "parse.y" +#line 1165 "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 1172 "parse.y" +#line 1169 "parse.y" { yyval.ttype = build_x_unary_op (REALPART_EXPR, yyvsp[0].ttype); ; break;} case 239: -#line 1174 "parse.y" +#line 1171 "parse.y" { yyval.ttype = build_x_unary_op (IMAGPART_EXPR, yyvsp[0].ttype); ; break;} case 240: -#line 1176 "parse.y" +#line 1173 "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 1187 "parse.y" +#line 1184 "parse.y" { finish_new_placement (NULL_TREE, yyvsp[-2].itype); ; break;} case 242: -#line 1190 "parse.y" +#line 1187 "parse.y" { yyval.itype = begin_new_placement (); ; break;} case 243: -#line 1194 "parse.y" +#line 1191 "parse.y" { yyval.ttype = finish_new_placement (yyvsp[-1].ttype, yyvsp[-2].itype); ; break;} case 244: -#line 1196 "parse.y" +#line 1193 "parse.y" { cp_pedwarn ("old style placement syntax, use () instead"); yyval.ttype = finish_new_placement (yyvsp[-1].ttype, yyvsp[-2].itype); ; break;} case 245: -#line 1202 "parse.y" +#line 1199 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 246: -#line 1204 "parse.y" +#line 1201 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 247: -#line 1206 "parse.y" +#line 1203 "parse.y" { cp_error ("`%T' is not a valid expression", yyvsp[-1].ftype.t); yyval.ttype = error_mark_node; ; break;} case 248: -#line 1214 "parse.y" +#line 1211 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids initialization of new expression with `='"); @@ -5414,23 +5411,23 @@ case 248: ; break;} case 249: -#line 1228 "parse.y" +#line 1225 "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 250: -#line 1232 "parse.y" +#line 1229 "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 252: -#line 1240 "parse.y" +#line 1237 "parse.y" { yyval.ttype = reparse_absdcl_as_casts (yyval.ttype, yyvsp[0].ttype); ; break;} case 253: -#line 1242 "parse.y" +#line 1239 "parse.y" { tree init = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-2].ttype)); @@ -5443,113 +5440,113 @@ case 253: ; break;} case 255: -#line 1258 "parse.y" +#line 1255 "parse.y" { yyval.ttype = build_x_binary_op (MEMBER_REF, yyval.ttype, yyvsp[0].ttype); ; break;} case 256: -#line 1260 "parse.y" +#line 1257 "parse.y" { yyval.ttype = build_m_component_ref (yyval.ttype, yyvsp[0].ttype); ; break;} case 257: -#line 1262 "parse.y" +#line 1259 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 258: -#line 1264 "parse.y" +#line 1261 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 259: -#line 1266 "parse.y" +#line 1263 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 260: -#line 1268 "parse.y" +#line 1265 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 261: -#line 1270 "parse.y" +#line 1267 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 262: -#line 1272 "parse.y" +#line 1269 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 263: -#line 1274 "parse.y" +#line 1271 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 264: -#line 1276 "parse.y" +#line 1273 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 265: -#line 1278 "parse.y" +#line 1275 "parse.y" { yyval.ttype = build_x_binary_op (LT_EXPR, yyval.ttype, yyvsp[0].ttype); ; break;} case 266: -#line 1280 "parse.y" +#line 1277 "parse.y" { yyval.ttype = build_x_binary_op (GT_EXPR, yyval.ttype, yyvsp[0].ttype); ; break;} case 267: -#line 1282 "parse.y" +#line 1279 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 268: -#line 1284 "parse.y" +#line 1281 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 269: -#line 1286 "parse.y" +#line 1283 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 270: -#line 1288 "parse.y" +#line 1285 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 271: -#line 1290 "parse.y" +#line 1287 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 272: -#line 1292 "parse.y" +#line 1289 "parse.y" { yyval.ttype = build_x_binary_op (TRUTH_ANDIF_EXPR, yyval.ttype, yyvsp[0].ttype); ; break;} case 273: -#line 1294 "parse.y" +#line 1291 "parse.y" { yyval.ttype = build_x_binary_op (TRUTH_ORIF_EXPR, yyval.ttype, yyvsp[0].ttype); ; break;} case 274: -#line 1296 "parse.y" +#line 1293 "parse.y" { yyval.ttype = build_x_conditional_expr (yyval.ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 275: -#line 1298 "parse.y" +#line 1295 "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 276: -#line 1302 "parse.y" +#line 1299 "parse.y" { yyval.ttype = build_x_modify_expr (yyval.ttype, yyvsp[-1].code, yyvsp[0].ttype); ; break;} case 277: -#line 1304 "parse.y" +#line 1301 "parse.y" { yyval.ttype = build_throw (NULL_TREE); ; break;} case 278: -#line 1306 "parse.y" +#line 1303 "parse.y" { yyval.ttype = build_throw (yyvsp[0].ttype); ; break;} case 279: -#line 1324 "parse.y" +#line 1321 "parse.y" { yyval.ttype = build_parse_node (BIT_NOT_EXPR, yyvsp[0].ttype); ; break;} case 280: -#line 1326 "parse.y" +#line 1323 "parse.y" { yyval.ttype = build_parse_node (BIT_NOT_EXPR, yyvsp[0].ttype); ; break;} case 286: -#line 1335 "parse.y" +#line 1332 "parse.y" { /* If lastiddecl is a TREE_LIST, it's a baselink, which means that we're in an expression like S::f, so @@ -5562,27 +5559,27 @@ case 286: ; break;} case 287: -#line 1348 "parse.y" +#line 1345 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 288: -#line 1350 "parse.y" +#line 1347 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 289: -#line 1355 "parse.y" +#line 1352 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 290: -#line 1357 "parse.y" +#line 1354 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 291: -#line 1360 "parse.y" +#line 1357 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 296: -#line 1372 "parse.y" +#line 1369 "parse.y" { /* Provide support for '(' attributes '*' declarator ')' etc */ @@ -5590,31 +5587,31 @@ case 296: ; break;} case 298: -#line 1382 "parse.y" +#line 1379 "parse.y" { yyval.ttype = build_parse_node (INDIRECT_REF, yyvsp[0].ttype); ; break;} case 299: -#line 1384 "parse.y" +#line 1381 "parse.y" { yyval.ttype = build_parse_node (ADDR_EXPR, yyvsp[0].ttype); ; break;} case 300: -#line 1386 "parse.y" +#line 1383 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 301: -#line 1391 "parse.y" +#line 1388 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 302: -#line 1393 "parse.y" +#line 1390 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 306: -#line 1403 "parse.y" +#line 1400 "parse.y" { yyval.ttype = finish_decl_parsing (yyvsp[-1].ttype); ; break;} case 307: -#line 1408 "parse.y" +#line 1405 "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)); @@ -5623,7 +5620,7 @@ case 307: ; break;} case 310: -#line 1417 "parse.y" +#line 1414 "parse.y" { if (processing_template_decl) push_obstacks (&permanent_obstack, &permanent_obstack); @@ -5639,20 +5636,20 @@ case 310: ; break;} case 311: -#line 1431 "parse.y" +#line 1428 "parse.y" { yyval.ttype = finish_parenthesized_expr (yyvsp[-1].ttype); ; break;} case 312: -#line 1433 "parse.y" +#line 1430 "parse.y" { yyvsp[-1].ttype = reparse_decl_as_expr (NULL_TREE, yyvsp[-1].ttype); yyval.ttype = finish_parenthesized_expr (yyvsp[-1].ttype); ; break;} case 313: -#line 1436 "parse.y" +#line 1433 "parse.y" { yyval.ttype = error_mark_node; ; break;} case 314: -#line 1438 "parse.y" +#line 1435 "parse.y" { tree scope = current_scope (); if (!scope || TREE_CODE (scope) != FUNCTION_DECL) { @@ -5665,43 +5662,43 @@ case 314: ; break;} case 315: -#line 1449 "parse.y" +#line 1446 "parse.y" { yyval.ttype = finish_stmt_expr (yyvsp[-2].ttype); ; break;} case 316: -#line 1454 "parse.y" +#line 1451 "parse.y" { yyval.ttype = finish_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype, 1); ; break;} case 317: -#line 1456 "parse.y" +#line 1453 "parse.y" { yyval.ttype = finish_call_expr (yyvsp[-1].ttype, NULL_TREE, 1); ; break;} case 318: -#line 1458 "parse.y" +#line 1455 "parse.y" { yyval.ttype = finish_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype, 0); ; break;} case 319: -#line 1460 "parse.y" +#line 1457 "parse.y" { yyval.ttype = finish_call_expr (yyvsp[-1].ttype, NULL_TREE, 0); ; break;} case 320: -#line 1462 "parse.y" +#line 1459 "parse.y" { yyval.ttype = grok_array_decl (yyval.ttype, yyvsp[-1].ttype); ; break;} case 321: -#line 1464 "parse.y" +#line 1461 "parse.y" { yyval.ttype = finish_increment_expr (yyvsp[-1].ttype, POSTINCREMENT_EXPR); ; break;} case 322: -#line 1466 "parse.y" +#line 1463 "parse.y" { yyval.ttype = finish_increment_expr (yyvsp[-1].ttype, POSTDECREMENT_EXPR); ; break;} case 323: -#line 1469 "parse.y" +#line 1466 "parse.y" { yyval.ttype = finish_this_expr (); ; break;} case 324: -#line 1471 "parse.y" +#line 1468 "parse.y" { /* This is a C cast in C++'s `functional' notation using the "implicit int" extension so that: @@ -5714,49 +5711,49 @@ case 324: ; break;} case 326: -#line 1483 "parse.y" +#line 1480 "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 327: -#line 1487 "parse.y" +#line 1484 "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 328: -#line 1491 "parse.y" +#line 1488 "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 329: -#line 1495 "parse.y" +#line 1492 "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 330: -#line 1499 "parse.y" +#line 1496 "parse.y" { yyval.ttype = build_x_typeid (yyvsp[-1].ttype); ; break;} case 331: -#line 1501 "parse.y" +#line 1498 "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 332: -#line 1505 "parse.y" +#line 1502 "parse.y" { yyval.ttype = do_scoped_id (yyvsp[0].ttype, 1); ; break;} case 333: -#line 1507 "parse.y" +#line 1504 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 334: -#line 1509 "parse.y" +#line 1506 "parse.y" { got_scope = NULL_TREE; if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) @@ -5766,102 +5763,102 @@ case 334: ; break;} case 335: -#line 1517 "parse.y" +#line 1514 "parse.y" { yyval.ttype = build_offset_ref (OP0 (yyval.ttype), OP1 (yyval.ttype)); ; break;} case 336: -#line 1519 "parse.y" +#line 1516 "parse.y" { yyval.ttype = finish_qualified_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 337: -#line 1521 "parse.y" +#line 1518 "parse.y" { yyval.ttype = finish_qualified_call_expr (yyvsp[-1].ttype, NULL_TREE); ; break;} case 338: -#line 1523 "parse.y" +#line 1520 "parse.y" { yyval.ttype = build_x_component_ref (yyval.ttype, yyvsp[0].ttype, NULL_TREE, 1); ; break;} case 339: -#line 1527 "parse.y" +#line 1524 "parse.y" { yyval.ttype = finish_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ; break;} case 340: -#line 1529 "parse.y" +#line 1526 "parse.y" { yyval.ttype = finish_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ; break;} case 341: -#line 1531 "parse.y" +#line 1528 "parse.y" { yyval.ttype = build_x_component_ref (yyval.ttype, yyvsp[0].ttype, NULL_TREE, 1); ; break;} case 342: -#line 1533 "parse.y" +#line 1530 "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 343: -#line 1538 "parse.y" +#line 1535 "parse.y" { yyval.ttype = finish_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ; break;} case 344: -#line 1540 "parse.y" +#line 1537 "parse.y" { yyval.ttype = finish_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ; break;} case 345: -#line 1542 "parse.y" +#line 1539 "parse.y" { yyval.ttype = finish_qualified_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ; break;} case 346: -#line 1544 "parse.y" +#line 1541 "parse.y" { yyval.ttype = finish_qualified_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ; break;} case 347: -#line 1547 "parse.y" +#line 1544 "parse.y" { yyval.ttype = finish_pseudo_destructor_call_expr (yyvsp[-3].ttype, NULL_TREE, yyvsp[-1].ttype); ; break;} case 348: -#line 1549 "parse.y" +#line 1546 "parse.y" { yyval.ttype = finish_pseudo_destructor_call_expr (yyvsp[-5].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ; break;} case 349: -#line 1551 "parse.y" +#line 1548 "parse.y" { yyval.ttype = error_mark_node; ; break;} case 350: -#line 1596 "parse.y" +#line 1593 "parse.y" { yyval.itype = 0; ; break;} case 351: -#line 1598 "parse.y" +#line 1595 "parse.y" { got_scope = NULL_TREE; yyval.itype = 1; ; break;} case 352: -#line 1603 "parse.y" +#line 1600 "parse.y" { yyval.itype = 0; ; break;} case 353: -#line 1605 "parse.y" +#line 1602 "parse.y" { got_scope = NULL_TREE; yyval.itype = 1; ; break;} case 354: -#line 1610 "parse.y" +#line 1607 "parse.y" { yyval.ttype = boolean_true_node; ; break;} case 355: -#line 1612 "parse.y" +#line 1609 "parse.y" { yyval.ttype = boolean_false_node; ; break;} case 357: -#line 1619 "parse.y" +#line 1616 "parse.y" { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ; break;} case 358: -#line 1624 "parse.y" +#line 1621 "parse.y" { if (! current_function_parms_stored) store_parm_decls (); @@ -5869,18 +5866,18 @@ case 358: ; break;} case 359: -#line 1633 "parse.y" +#line 1630 "parse.y" { got_object = TREE_TYPE (yyval.ttype); ; break;} case 360: -#line 1635 "parse.y" +#line 1632 "parse.y" { yyval.ttype = build_x_arrow (yyval.ttype); got_object = TREE_TYPE (yyval.ttype); ; break;} case 361: -#line 1643 "parse.y" +#line 1640 "parse.y" { resume_momentary (yyvsp[-1].itype); if (yyvsp[-2].ftype.t && IS_AGGR_TYPE_CODE (TREE_CODE (yyvsp[-2].ftype.t))) @@ -5888,139 +5885,139 @@ case 361: ; break;} case 362: -#line 1649 "parse.y" +#line 1646 "parse.y" { resume_momentary (yyvsp[-1].itype); note_list_got_semicolon (yyvsp[-2].ftype.t); ; break;} case 363: -#line 1654 "parse.y" +#line 1651 "parse.y" { resume_momentary (yyvsp[-1].itype); ; break;} case 364: -#line 1656 "parse.y" +#line 1653 "parse.y" { shadow_tag (yyvsp[-1].ftype.t); note_list_got_semicolon (yyvsp[-1].ftype.t); ; break;} case 365: -#line 1661 "parse.y" +#line 1658 "parse.y" { warning ("empty declaration"); ; break;} case 366: -#line 1663 "parse.y" +#line 1660 "parse.y" { pedantic = yyvsp[-1].itype; ; break;} case 369: -#line 1677 "parse.y" +#line 1674 "parse.y" { yyval.ttype = make_call_declarator (NULL_TREE, empty_parms (), NULL_TREE, NULL_TREE); ; break;} case 370: -#line 1680 "parse.y" +#line 1677 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), NULL_TREE, NULL_TREE); ; break;} case 371: -#line 1687 "parse.y" +#line 1684 "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 372: -#line 1690 "parse.y" +#line 1687 "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 373: -#line 1693 "parse.y" +#line 1690 "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 374: -#line 1697 "parse.y" +#line 1694 "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 375: -#line 1700 "parse.y" +#line 1697 "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 378: -#line 1716 "parse.y" +#line 1713 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ttype); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 379: -#line 1719 "parse.y" +#line 1716 "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 380: -#line 1722 "parse.y" +#line 1719 "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 381: -#line 1725 "parse.y" +#line 1722 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, chainon (yyvsp[0].ttype, yyvsp[-2].ttype)); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 382: -#line 1728 "parse.y" +#line 1725 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, chainon (yyvsp[0].ttype, yyvsp[-2].ttype)); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 383: -#line 1731 "parse.y" +#line 1728 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-2].ftype.t, chainon (yyvsp[-1].ttype, chainon (yyvsp[0].ttype, yyvsp[-3].ttype))); yyval.ftype.new_type_flag = yyvsp[-2].ftype.new_type_flag; ; break;} case 384: -#line 1738 "parse.y" +#line 1735 "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 385: -#line 1743 "parse.y" +#line 1740 "parse.y" { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyval.ttype); ; break;} case 386: -#line 1745 "parse.y" +#line 1742 "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 387: -#line 1750 "parse.y" +#line 1747 "parse.y" { yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ; break;} case 388: -#line 1752 "parse.y" +#line 1749 "parse.y" { yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); ; break;} case 389: -#line 1771 "parse.y" +#line 1768 "parse.y" { yyval.ttype = yyvsp[0].ftype.t; TREE_STATIC (yyval.ttype) = 1; ; break;} case 390: -#line 1773 "parse.y" +#line 1770 "parse.y" { yyval.ttype = hash_tree_cons (NULL_TREE, yyval.ttype, NULL_TREE); ; break;} case 391: -#line 1775 "parse.y" +#line 1772 "parse.y" { yyval.ttype = hash_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); TREE_STATIC (yyval.ttype) = 1; ; break;} case 392: -#line 1778 "parse.y" +#line 1775 "parse.y" { if (extra_warnings && TREE_STATIC (yyval.ttype)) warning ("`%s' is not at beginning of declaration", IDENTIFIER_POINTER (yyvsp[0].ttype)); @@ -6028,61 +6025,61 @@ case 392: TREE_STATIC (yyval.ttype) = TREE_STATIC (yyvsp[-1].ttype); ; break;} case 393: -#line 1784 "parse.y" +#line 1781 "parse.y" { yyval.ttype = hash_tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ; break;} case 394: -#line 1786 "parse.y" +#line 1783 "parse.y" { yyval.ttype = hash_tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); ; break;} case 395: -#line 1797 "parse.y" +#line 1794 "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 396: -#line 1800 "parse.y" +#line 1797 "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 397: -#line 1803 "parse.y" +#line 1800 "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 398: -#line 1806 "parse.y" +#line 1803 "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[-2].ftype.new_type_flag; ; break;} case 399: -#line 1812 "parse.y" +#line 1809 "parse.y" { yyval.ttype = build_decl_list (NULL_TREE, yyvsp[0].ftype.t); ; break;} case 400: -#line 1814 "parse.y" +#line 1811 "parse.y" { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ttype); ; break;} case 402: -#line 1824 "parse.y" +#line 1821 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 403: -#line 1826 "parse.y" +#line 1823 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 404: -#line 1828 "parse.y" +#line 1825 "parse.y" { yyval.ftype.t = finish_typeof (yyvsp[-1].ttype); yyval.ftype.new_type_flag = 0; ; break;} case 405: -#line 1831 "parse.y" +#line 1828 "parse.y" { yyval.ftype.t = groktypename (yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = 0; ; break;} case 406: -#line 1834 "parse.y" +#line 1831 "parse.y" { tree type = TREE_TYPE (yyvsp[-1].ttype); yyval.ftype.new_type_flag = 0; @@ -6099,7 +6096,7 @@ case 406: ; break;} case 407: -#line 1849 "parse.y" +#line 1846 "parse.y" { tree type = groktypename (yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = 0; @@ -6116,243 +6113,243 @@ case 407: ; break;} case 408: -#line 1869 "parse.y" +#line 1866 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 409: -#line 1871 "parse.y" +#line 1868 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 412: -#line 1878 "parse.y" +#line 1875 "parse.y" { check_multiple_declarators (); ; break;} case 414: -#line 1884 "parse.y" +#line 1881 "parse.y" { check_multiple_declarators (); ; break;} case 416: -#line 1890 "parse.y" +#line 1887 "parse.y" { check_multiple_declarators (); ; break;} case 417: -#line 1895 "parse.y" +#line 1892 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 418: -#line 1897 "parse.y" +#line 1894 "parse.y" { if (TREE_CHAIN (yyvsp[-1].ttype)) yyvsp[-1].ttype = combine_strings (yyvsp[-1].ttype); yyval.ttype = yyvsp[-1].ttype; ; break;} case 419: -#line 1902 "parse.y" +#line 1899 "parse.y" { yyval.ttype = start_decl (yyvsp[-3].ttype, current_declspecs, 1, yyvsp[-1].ttype, prefix_attributes); ; break;} case 420: -#line 1906 "parse.y" +#line 1903 "parse.y" { cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype, 1, LOOKUP_ONLYCONVERTING); ; break;} case 421: -#line 1908 "parse.y" +#line 1905 "parse.y" { yyval.ttype = start_decl (yyvsp[-2].ttype, current_declspecs, 0, yyvsp[0].ttype, prefix_attributes); cp_finish_decl (yyval.ttype, NULL_TREE, yyvsp[-1].ttype, 1, 0); ; break;} case 422: -#line 1921 "parse.y" +#line 1918 "parse.y" { yyvsp[0].itype = parse_decl (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype, 1, &yyval.ttype); ; break;} case 423: -#line 1926 "parse.y" +#line 1923 "parse.y" { cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype, 1, LOOKUP_ONLYCONVERTING); yyval.itype = yyvsp[-2].itype; ; break;} case 424: -#line 1930 "parse.y" +#line 1927 "parse.y" { tree d; yyval.itype = parse_decl (yyvsp[-2].ttype, yyvsp[-3].ttype, yyvsp[0].ttype, 0, &d); cp_finish_decl (d, NULL_TREE, yyvsp[-1].ttype, 1, 0); ; break;} case 425: -#line 1937 "parse.y" +#line 1934 "parse.y" { yyval.itype = yyvsp[0].itype; ; break;} case 426: -#line 1941 "parse.y" +#line 1938 "parse.y" { yyval.itype = yyvsp[0].itype; ; break;} case 427: -#line 1946 "parse.y" +#line 1943 "parse.y" { /* Set things up as initdcl0_innards expects. */ yyvsp[0].ttype = yyvsp[-1].ttype; yyvsp[-1].ttype = NULL_TREE; ; break;} case 428: -#line 1950 "parse.y" +#line 1947 "parse.y" {; break;} case 429: -#line 1952 "parse.y" +#line 1949 "parse.y" { tree d; parse_decl(yyvsp[-2].ttype, NULL_TREE, yyvsp[0].ttype, 0, &d); cp_finish_decl (d, NULL_TREE, yyvsp[-1].ttype, 1, 0); ; break;} case 430: -#line 1961 "parse.y" +#line 1958 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 431: -#line 1963 "parse.y" +#line 1960 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 432: -#line 1968 "parse.y" +#line 1965 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 433: -#line 1970 "parse.y" +#line 1967 "parse.y" { yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 434: -#line 1975 "parse.y" +#line 1972 "parse.y" { yyval.ttype = yyvsp[-2].ttype; ; break;} case 435: -#line 1980 "parse.y" +#line 1977 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 436: -#line 1982 "parse.y" +#line 1979 "parse.y" { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 437: -#line 1987 "parse.y" +#line 1984 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 438: -#line 1989 "parse.y" +#line 1986 "parse.y" { yyval.ttype = build_tree_list (yyvsp[0].ttype, NULL_TREE); ; break;} case 439: -#line 1991 "parse.y" +#line 1988 "parse.y" { yyval.ttype = build_tree_list (yyvsp[-3].ttype, build_tree_list (NULL_TREE, yyvsp[-1].ttype)); ; break;} case 440: -#line 1993 "parse.y" +#line 1990 "parse.y" { yyval.ttype = build_tree_list (yyvsp[-5].ttype, tree_cons (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype)); ; break;} case 441: -#line 1995 "parse.y" +#line 1992 "parse.y" { yyval.ttype = build_tree_list (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 446: -#line 2011 "parse.y" +#line 2008 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ; break;} case 447: -#line 2013 "parse.y" +#line 2010 "parse.y" { yyval.ttype = chainon (yyvsp[-2].ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 448: -#line 2018 "parse.y" +#line 2015 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 449: -#line 2020 "parse.y" +#line 2017 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 451: -#line 2028 "parse.y" +#line 2025 "parse.y" { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, NULL_TREE); TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ; break;} case 452: -#line 2031 "parse.y" +#line 2028 "parse.y" { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-1].ttype)); TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ; break;} case 453: -#line 2034 "parse.y" +#line 2031 "parse.y" { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-2].ttype)); TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ; break;} case 454: -#line 2037 "parse.y" +#line 2034 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 455: -#line 2044 "parse.y" +#line 2041 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ; break;} case 456: -#line 2046 "parse.y" +#line 2043 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ; break;} case 457: -#line 2049 "parse.y" +#line 2046 "parse.y" { yyval.ttype = build_expr_list (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 458: -#line 2051 "parse.y" +#line 2048 "parse.y" { yyval.ttype = build_expr_list (yyval.ttype, yyvsp[0].ttype); ; break;} case 459: -#line 2053 "parse.y" +#line 2050 "parse.y" { yyval.ttype = tree_cons (yyvsp[-2].ttype, yyvsp[0].ttype, yyval.ttype); ; break;} case 460: -#line 2058 "parse.y" +#line 2055 "parse.y" { start_function (NULL_TREE, yyvsp[0].pi->fndecl, NULL_TREE, (SF_DEFAULT | SF_PRE_PARSED | SF_INCLASS_INLINE)); reinit_parse_for_function (); ; break;} case 461: -#line 2065 "parse.y" +#line 2062 "parse.y" { expand_body (finish_function (lineno, (int)yyvsp[-1].itype | 2)); process_next_inline (yyvsp[-3].pi); ; break;} case 462: -#line 2070 "parse.y" +#line 2067 "parse.y" { expand_body (finish_function (lineno, (int)yyvsp[0].itype | 2)); process_next_inline (yyvsp[-2].pi); ; break;} case 463: -#line 2075 "parse.y" +#line 2072 "parse.y" { finish_function (lineno, 2); process_next_inline (yyvsp[-2].pi); ; break;} case 466: -#line 2089 "parse.y" +#line 2086 "parse.y" { replace_defarg (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 467: -#line 2091 "parse.y" +#line 2088 "parse.y" { replace_defarg (yyvsp[-2].ttype, error_mark_node); ; break;} case 469: -#line 2096 "parse.y" +#line 2093 "parse.y" { do_pending_defargs (); ; break;} case 470: -#line 2098 "parse.y" +#line 2095 "parse.y" { do_pending_defargs (); ; break;} case 471: -#line 2103 "parse.y" +#line 2100 "parse.y" { yyvsp[0].itype = suspend_momentary (); yyval.ttype = current_enum_type; current_enum_type = start_enum (yyvsp[-1].ttype); ; break;} case 472: -#line 2107 "parse.y" +#line 2104 "parse.y" { TYPE_VALUES (current_enum_type) = yyvsp[-1].ttype; yyval.ftype.t = finish_enum (current_enum_type); yyval.ftype.new_type_flag = 1; @@ -6361,13 +6358,13 @@ case 472: check_for_missing_semicolon (yyval.ftype.t); ; break;} case 473: -#line 2114 "parse.y" +#line 2111 "parse.y" { yyvsp[0].itype = suspend_momentary (); yyval.ttype = current_enum_type; current_enum_type = start_enum (make_anon_name ()); ; break;} case 474: -#line 2118 "parse.y" +#line 2115 "parse.y" { TYPE_VALUES (current_enum_type) = yyvsp[-1].ttype; yyval.ftype.t = finish_enum (current_enum_type); yyval.ftype.new_type_flag = 1; @@ -6376,28 +6373,28 @@ case 474: check_for_missing_semicolon (yyval.ftype.t); ; break;} case 475: -#line 2125 "parse.y" +#line 2122 "parse.y" { yyval.ftype.t = xref_tag (enum_type_node, yyvsp[0].ttype, 1); yyval.ftype.new_type_flag = 0; ; break;} case 476: -#line 2128 "parse.y" +#line 2125 "parse.y" { yyval.ftype.t = xref_tag (enum_type_node, yyvsp[0].ttype, 1); yyval.ftype.new_type_flag = 0; ; break;} case 477: -#line 2131 "parse.y" +#line 2128 "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 478: -#line 2137 "parse.y" +#line 2134 "parse.y" { yyvsp[-1].ftype.t = begin_class_definition (yyvsp[-1].ftype.t); ; break;} case 479: -#line 2139 "parse.y" +#line 2136 "parse.y" { int semi; @@ -6410,13 +6407,13 @@ case 479: ; break;} case 480: -#line 2150 "parse.y" +#line 2147 "parse.y" { begin_inline_definitions (); ; break;} case 481: -#line 2154 "parse.y" +#line 2151 "parse.y" { finish_inline_definitions (); yyval.ftype.t = yyvsp[-3].ttype; @@ -6424,7 +6421,7 @@ case 481: ; break;} case 482: -#line 2160 "parse.y" +#line 2157 "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))); @@ -6448,51 +6445,51 @@ case 482: ; break;} case 486: -#line 2191 "parse.y" +#line 2188 "parse.y" { if (pedantic && !in_system_header) pedwarn ("comma at end of enumerator list"); ; break;} case 488: -#line 2198 "parse.y" +#line 2195 "parse.y" { error ("storage class specifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ; break;} case 489: -#line 2200 "parse.y" +#line 2197 "parse.y" { error ("type specifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ; break;} case 490: -#line 2202 "parse.y" +#line 2199 "parse.y" { error ("type qualifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ; break;} case 491: -#line 2204 "parse.y" +#line 2201 "parse.y" { error ("no body nor ';' separates two class, struct or union declarations"); ; break;} case 492: -#line 2206 "parse.y" +#line 2203 "parse.y" { yyval.ttype = build_decl_list (yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 493: -#line 2211 "parse.y" +#line 2208 "parse.y" { current_aggr = yyvsp[-1].ttype; yyval.ttype = yyvsp[0].ttype; ; break;} case 494: -#line 2219 "parse.y" +#line 2216 "parse.y" { current_aggr = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ; break;} case 495: -#line 2221 "parse.y" +#line 2218 "parse.y" { yyungetc ('{', 1); ; break;} case 496: -#line 2223 "parse.y" +#line 2220 "parse.y" { yyungetc (':', 1); ; break;} case 497: -#line 2228 "parse.y" +#line 2225 "parse.y" { current_aggr = yyvsp[-2].ttype; yyval.ftype.t = handle_class_head (yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); @@ -6500,7 +6497,7 @@ case 497: ; break;} case 498: -#line 2234 "parse.y" +#line 2231 "parse.y" { current_aggr = yyvsp[-3].ttype; yyval.ftype.t = handle_class_head (yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); @@ -6508,7 +6505,7 @@ case 498: ; break;} case 499: -#line 2240 "parse.y" +#line 2237 "parse.y" { current_aggr = yyvsp[-2].ttype; yyval.ftype.t = handle_class_head (yyvsp[-2].ttype, NULL_TREE, yyvsp[0].ttype); @@ -6516,7 +6513,7 @@ case 499: ; break;} case 500: -#line 2246 "parse.y" +#line 2243 "parse.y" { current_aggr = yyvsp[-1].ttype; yyval.ftype.t = yyvsp[0].ttype; @@ -6524,7 +6521,7 @@ case 500: ; break;} case 501: -#line 2252 "parse.y" +#line 2249 "parse.y" { current_aggr = yyvsp[-2].ttype; yyval.ftype.t = yyvsp[0].ttype; @@ -6534,18 +6531,18 @@ case 501: ; break;} case 502: -#line 2263 "parse.y" +#line 2260 "parse.y" { yyval.ftype.t = xref_tag (current_aggr, yyvsp[0].ttype, 1); yyval.ftype.new_type_flag = 0; ; break;} case 503: -#line 2268 "parse.y" +#line 2265 "parse.y" { yyval.ttype = xref_tag (current_aggr, yyvsp[0].ttype, 0); ; break;} case 504: -#line 2272 "parse.y" +#line 2269 "parse.y" { yyval.ftype.t = yyvsp[-1].ttype; yyval.ftype.new_type_flag = 0; @@ -6554,7 +6551,7 @@ case 504: ; break;} case 505: -#line 2280 "parse.y" +#line 2277 "parse.y" { if (yyvsp[-1].ftype.t != error_mark_node) { @@ -6581,53 +6578,53 @@ case 505: ; break;} case 506: -#line 2308 "parse.y" +#line 2305 "parse.y" { yyval.ttype = xref_tag (yyval.ttype, make_anon_name (), 0); yyungetc ('{', 1); ; break;} case 507: -#line 2318 "parse.y" +#line 2315 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 509: -#line 2327 "parse.y" +#line 2324 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 510: -#line 2329 "parse.y" +#line 2326 "parse.y" { yyungetc(':', 1); yyval.ttype = NULL_TREE; ; break;} case 511: -#line 2331 "parse.y" +#line 2328 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 513: -#line 2337 "parse.y" +#line 2334 "parse.y" { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ; break;} case 514: -#line 2342 "parse.y" +#line 2339 "parse.y" { yyval.ttype = finish_base_specifier (access_default_node, yyvsp[0].ttype); ; break;} case 515: -#line 2344 "parse.y" +#line 2341 "parse.y" { yyval.ttype = finish_base_specifier (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 516: -#line 2349 "parse.y" +#line 2346 "parse.y" { if (yyval.ttype != error_mark_node) yyval.ttype = TYPE_MAIN_DECL (yyvsp[0].ttype); ; break;} case 519: -#line 2356 "parse.y" +#line 2353 "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 520: -#line 2360 "parse.y" +#line 2357 "parse.y" { if (yyvsp[-2].ttype != access_default_virtual_node) error ("multiple access specifiers"); @@ -6640,7 +6637,7 @@ case 520: ; break;} case 521: -#line 2371 "parse.y" +#line 2368 "parse.y" { if (yyvsp[-1].ttype != ridpointers[(int)RID_VIRTUAL]) cp_error ("`%D' access", yyvsp[-1].ttype); else if (yyval.ttype == access_public_node) @@ -6654,55 +6651,55 @@ case 521: ; break;} case 526: -#line 2392 "parse.y" +#line 2389 "parse.y" { current_access_specifier = yyvsp[-1].ttype; ; break;} case 527: -#line 2401 "parse.y" +#line 2398 "parse.y" { finish_member_declaration (yyvsp[0].ttype); ; break;} case 528: -#line 2405 "parse.y" +#line 2402 "parse.y" { finish_member_declaration (yyvsp[0].ttype); ; break;} case 530: -#line 2413 "parse.y" +#line 2410 "parse.y" { error ("missing ';' before right brace"); yyungetc ('}', 0); ; break;} case 531: -#line 2418 "parse.y" +#line 2415 "parse.y" { yyval.ttype = finish_method (yyval.ttype); ; break;} case 532: -#line 2420 "parse.y" +#line 2417 "parse.y" { yyval.ttype = finish_method (yyval.ttype); ; break;} case 533: -#line 2422 "parse.y" +#line 2419 "parse.y" { yyval.ttype = finish_method (yyval.ttype); ; break;} case 534: -#line 2424 "parse.y" +#line 2421 "parse.y" { yyval.ttype = finish_method (yyval.ttype); ; break;} case 535: -#line 2426 "parse.y" +#line 2423 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 536: -#line 2428 "parse.y" +#line 2425 "parse.y" { yyval.ttype = yyvsp[0].ttype; pedantic = yyvsp[-1].itype; ; break;} case 537: -#line 2431 "parse.y" +#line 2428 "parse.y" { if (yyvsp[0].ttype) yyval.ttype = finish_member_template_decl (yyvsp[0].ttype); @@ -6714,14 +6711,14 @@ case 537: ; break;} case 538: -#line 2441 "parse.y" +#line 2438 "parse.y" { yyval.ttype = finish_member_class_template (yyvsp[-1].ftype.t); finish_template_decl (yyvsp[-2].ttype); ; break;} case 539: -#line 2452 "parse.y" +#line 2449 "parse.y" { /* Most of the productions for component_decl only allow the creation of one new member, so we call @@ -6744,7 +6741,7 @@ case 539: ; break;} case 540: -#line 2473 "parse.y" +#line 2470 "parse.y" { if (!yyvsp[0].itype) grok_x_components (yyvsp[-1].ttype); @@ -6752,45 +6749,45 @@ case 540: ; break;} case 541: -#line 2479 "parse.y" +#line 2476 "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 542: -#line 2482 "parse.y" +#line 2479 "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 543: -#line 2485 "parse.y" +#line 2482 "parse.y" { yyval.ttype = grokbitfield (NULL_TREE, NULL_TREE, yyvsp[0].ttype); ; break;} case 544: -#line 2487 "parse.y" +#line 2484 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 545: -#line 2498 "parse.y" +#line 2495 "parse.y" { tree specs, attrs; split_specs_attrs (yyvsp[-4].ttype, &specs, &attrs); yyval.ttype = grokfield (yyvsp[-3].ttype, specs, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, attrs)); ; break;} case 546: -#line 2503 "parse.y" +#line 2500 "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 547: -#line 2506 "parse.y" +#line 2503 "parse.y" { yyval.ttype = do_class_using_decl (yyvsp[0].ttype); ; break;} case 548: -#line 2512 "parse.y" +#line 2509 "parse.y" { yyval.itype = 0; ; break;} case 549: -#line 2514 "parse.y" +#line 2511 "parse.y" { if (PROCESSING_REAL_TEMPLATE_DECL_P ()) yyvsp[0].ttype = finish_member_template_decl (yyvsp[0].ttype); @@ -6799,7 +6796,7 @@ case 549: ; break;} case 550: -#line 2521 "parse.y" +#line 2518 "parse.y" { check_multiple_declarators (); if (PROCESSING_REAL_TEMPLATE_DECL_P ()) @@ -6809,11 +6806,11 @@ case 550: ; break;} case 551: -#line 2532 "parse.y" +#line 2529 "parse.y" { yyval.itype = 0; ; break;} case 552: -#line 2534 "parse.y" +#line 2531 "parse.y" { if (PROCESSING_REAL_TEMPLATE_DECL_P ()) yyvsp[0].ttype = finish_member_template_decl (yyvsp[0].ttype); @@ -6822,7 +6819,7 @@ case 552: ; break;} case 553: -#line 2541 "parse.y" +#line 2538 "parse.y" { check_multiple_declarators (); if (PROCESSING_REAL_TEMPLATE_DECL_P ()) @@ -6832,7 +6829,7 @@ case 553: ; break;} case 558: -#line 2562 "parse.y" +#line 2559 "parse.y" { split_specs_attrs (yyvsp[-4].ttype, ¤t_declspecs, &prefix_attributes); yyvsp[-4].ttype = current_declspecs; @@ -6840,7 +6837,7 @@ case 558: build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; break;} case 559: -#line 2568 "parse.y" +#line 2565 "parse.y" { split_specs_attrs (yyvsp[-4].ttype, ¤t_declspecs, &prefix_attributes); yyvsp[-4].ttype = current_declspecs; @@ -6848,7 +6845,7 @@ case 559: cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; break;} case 560: -#line 2577 "parse.y" +#line 2574 "parse.y" { split_specs_attrs (yyvsp[-4].ttype, ¤t_declspecs, &prefix_attributes); yyvsp[-4].ttype = current_declspecs; @@ -6856,7 +6853,7 @@ case 560: build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; break;} case 561: -#line 2583 "parse.y" +#line 2580 "parse.y" { split_specs_attrs (yyvsp[-4].ttype, ¤t_declspecs, &prefix_attributes); yyvsp[-4].ttype = current_declspecs; @@ -6864,7 +6861,7 @@ case 561: build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; break;} case 562: -#line 2589 "parse.y" +#line 2586 "parse.y" { split_specs_attrs (yyvsp[-4].ttype, ¤t_declspecs, &prefix_attributes); yyvsp[-4].ttype = current_declspecs; @@ -6872,7 +6869,7 @@ case 562: cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; break;} case 563: -#line 2595 "parse.y" +#line 2592 "parse.y" { split_specs_attrs (yyvsp[-3].ttype, ¤t_declspecs, &prefix_attributes); yyvsp[-3].ttype = current_declspecs; @@ -6880,58 +6877,58 @@ case 563: cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; break;} case 564: -#line 2604 "parse.y" +#line 2601 "parse.y" { yyval.ttype = grokfield (yyval.ttype, current_declspecs, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; break;} case 565: -#line 2607 "parse.y" +#line 2604 "parse.y" { yyval.ttype = grokbitfield (yyval.ttype, current_declspecs, yyvsp[-1].ttype); cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; break;} case 566: -#line 2613 "parse.y" +#line 2610 "parse.y" { yyval.ttype = grokfield (yyval.ttype, current_declspecs, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; break;} case 567: -#line 2616 "parse.y" +#line 2613 "parse.y" { yyval.ttype = grokbitfield (yyval.ttype, current_declspecs, yyvsp[-1].ttype); cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; break;} case 568: -#line 2619 "parse.y" +#line 2616 "parse.y" { yyval.ttype = grokbitfield (NULL_TREE, current_declspecs, yyvsp[-1].ttype); cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; break;} case 570: -#line 2626 "parse.y" +#line 2623 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 572: -#line 2636 "parse.y" +#line 2633 "parse.y" { TREE_CHAIN (yyvsp[0].ttype) = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ; break;} case 573: -#line 2641 "parse.y" +#line 2638 "parse.y" { yyval.ttype = build_enumerator (yyval.ttype, NULL_TREE, current_enum_type); ; break;} case 574: -#line 2643 "parse.y" +#line 2640 "parse.y" { yyval.ttype = build_enumerator (yyval.ttype, yyvsp[0].ttype, current_enum_type); ; break;} case 575: -#line 2649 "parse.y" +#line 2646 "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 576: -#line 2652 "parse.y" +#line 2649 "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 577: -#line 2659 "parse.y" +#line 2656 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids array dimensions with parenthesized type in new"); @@ -6941,49 +6938,49 @@ case 577: ; break;} case 578: -#line 2670 "parse.y" +#line 2667 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 579: -#line 2672 "parse.y" +#line 2669 "parse.y" { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ; break;} case 580: -#line 2677 "parse.y" +#line 2674 "parse.y" { yyval.ftype.t = hash_tree_cons (NULL_TREE, yyvsp[0].ttype, NULL_TREE); yyval.ftype.new_type_flag = 0; ; break;} case 581: -#line 2680 "parse.y" +#line 2677 "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 582: -#line 2689 "parse.y" +#line 2686 "parse.y" { yyval.itype = suspend_momentary (); ; break;} case 583: -#line 2694 "parse.y" +#line 2691 "parse.y" { resume_momentary ((int) yyvsp[-1].itype); yyval.ttype = yyvsp[0].ttype; ; break;} case 584: -#line 2700 "parse.y" +#line 2697 "parse.y" { resume_momentary ((int) yyvsp[-3].itype); yyval.ttype = yyvsp[-1].ttype; ; break;} case 585: -#line 2702 "parse.y" +#line 2699 "parse.y" { resume_momentary ((int) yyvsp[-3].itype); yyval.ttype = yyvsp[-1].ttype; ; break;} case 586: -#line 2704 "parse.y" +#line 2701 "parse.y" { resume_momentary ((int) yyvsp[-1].itype); yyval.ttype = empty_parms (); ; break;} case 587: -#line 2706 "parse.y" +#line 2703 "parse.y" { resume_momentary ((int) yyvsp[-3].itype); yyval.ttype = NULL_TREE; ; break;} case 589: -#line 2714 "parse.y" +#line 2711 "parse.y" { /* Provide support for '(' attributes '*' declarator ')' etc */ @@ -6991,51 +6988,51 @@ case 589: ; break;} case 590: -#line 2724 "parse.y" +#line 2721 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 591: -#line 2726 "parse.y" +#line 2723 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 592: -#line 2728 "parse.y" +#line 2725 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 593: -#line 2730 "parse.y" +#line 2727 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 594: -#line 2732 "parse.y" +#line 2729 "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 596: -#line 2740 "parse.y" +#line 2737 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 597: -#line 2742 "parse.y" +#line 2739 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ; break;} case 598: -#line 2744 "parse.y" +#line 2741 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ; break;} case 599: -#line 2746 "parse.y" +#line 2743 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 600: -#line 2748 "parse.y" +#line 2745 "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 602: -#line 2756 "parse.y" +#line 2753 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) { @@ -7047,7 +7044,7 @@ case 602: ; break;} case 603: -#line 2766 "parse.y" +#line 2763 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) yyval.ttype = IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype); @@ -7057,15 +7054,15 @@ case 603: ; break;} case 606: -#line 2779 "parse.y" +#line 2776 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 607: -#line 2784 "parse.y" +#line 2781 "parse.y" { yyval.ttype = get_type_decl (yyvsp[0].ttype); ; break;} case 609: -#line 2793 "parse.y" +#line 2790 "parse.y" { /* Provide support for '(' attributes '*' declarator ')' etc */ @@ -7073,122 +7070,122 @@ case 609: ; break;} case 610: -#line 2802 "parse.y" +#line 2799 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 611: -#line 2804 "parse.y" +#line 2801 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 612: -#line 2806 "parse.y" +#line 2803 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 613: -#line 2808 "parse.y" +#line 2805 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 614: -#line 2810 "parse.y" +#line 2807 "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 616: -#line 2818 "parse.y" +#line 2815 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 617: -#line 2820 "parse.y" +#line 2817 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 618: -#line 2822 "parse.y" +#line 2819 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 619: -#line 2824 "parse.y" +#line 2821 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 620: -#line 2826 "parse.y" +#line 2823 "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 622: -#line 2834 "parse.y" +#line 2831 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 623: -#line 2836 "parse.y" +#line 2833 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 624: -#line 2838 "parse.y" +#line 2835 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ; break;} case 625: -#line 2840 "parse.y" +#line 2837 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ; break;} case 626: -#line 2842 "parse.y" +#line 2839 "parse.y" { enter_scope_of (yyvsp[0].ttype); ; break;} case 627: -#line 2844 "parse.y" +#line 2841 "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 628: -#line 2852 "parse.y" +#line 2849 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); ; break;} case 629: -#line 2855 "parse.y" +#line 2852 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 630: -#line 2861 "parse.y" +#line 2858 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); ; break;} case 631: -#line 2864 "parse.y" +#line 2861 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 633: -#line 2871 "parse.y" +#line 2868 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 634: -#line 2876 "parse.y" +#line 2873 "parse.y" { yyval.ttype = build_functional_cast (yyvsp[-3].ftype.t, yyvsp[-1].ttype); ; break;} case 635: -#line 2878 "parse.y" +#line 2875 "parse.y" { yyval.ttype = reparse_decl_as_expr (yyvsp[-3].ftype.t, yyvsp[-1].ttype); ; break;} case 636: -#line 2880 "parse.y" +#line 2877 "parse.y" { yyval.ttype = reparse_absdcl_as_expr (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 641: -#line 2891 "parse.y" +#line 2888 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 642: -#line 2893 "parse.y" +#line 2890 "parse.y" { got_scope = yyval.ttype = make_typename_type (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 643: -#line 2900 "parse.y" +#line 2897 "parse.y" { if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE) { @@ -7200,7 +7197,7 @@ case 643: ; break;} case 644: -#line 2910 "parse.y" +#line 2907 "parse.y" { if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -7208,7 +7205,7 @@ case 644: ; break;} case 645: -#line 2916 "parse.y" +#line 2913 "parse.y" { if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -7216,15 +7213,15 @@ case 645: ; break;} case 646: -#line 2922 "parse.y" +#line 2919 "parse.y" { got_scope = yyval.ttype = complete_type (TREE_TYPE (yyvsp[-1].ttype)); ; break;} case 648: -#line 2938 "parse.y" +#line 2935 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 649: -#line 2943 "parse.y" +#line 2940 "parse.y" { if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-1].ttype)) == 't') yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype); @@ -7239,26 +7236,26 @@ case 649: ; break;} case 650: -#line 2956 "parse.y" +#line 2953 "parse.y" { yyval.ttype = TREE_TYPE (yyvsp[0].ttype); ; break;} case 651: -#line 2958 "parse.y" +#line 2955 "parse.y" { yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 652: -#line 2960 "parse.y" +#line 2957 "parse.y" { yyval.ttype = make_typename_type (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 653: -#line 2965 "parse.y" +#line 2962 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) cp_error ("`%T' is not a class or namespace", yyvsp[0].ttype); ; break;} case 654: -#line 2970 "parse.y" +#line 2967 "parse.y" { if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-1].ttype)) == 't') yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype); @@ -7273,15 +7270,15 @@ case 654: ; break;} case 655: -#line 2983 "parse.y" +#line 2980 "parse.y" { got_scope = yyval.ttype = make_typename_type (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 656: -#line 2985 "parse.y" +#line 2982 "parse.y" { got_scope = yyval.ttype = make_typename_type (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 657: -#line 2990 "parse.y" +#line 2987 "parse.y" { if (TREE_CODE (yyvsp[-1].ttype) != IDENTIFIER_NODE) yyvsp[-1].ttype = lastiddecl; @@ -7295,7 +7292,7 @@ case 657: ; break;} case 658: -#line 3002 "parse.y" +#line 2999 "parse.y" { if (TREE_CODE (yyvsp[-1].ttype) != IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -7303,11 +7300,11 @@ case 658: ; break;} case 659: -#line 3008 "parse.y" +#line 3005 "parse.y" { got_scope = yyval.ttype = complete_type (TREE_TYPE (yyval.ttype)); ; break;} case 662: -#line 3012 "parse.y" +#line 3009 "parse.y" { if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -7315,11 +7312,11 @@ case 662: ; break;} case 663: -#line 3021 "parse.y" +#line 3018 "parse.y" { yyval.ttype = build_min_nt (TEMPLATE_ID_EXPR, yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 664: -#line 3026 "parse.y" +#line 3023 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) yyval.ttype = IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype); @@ -7329,59 +7326,59 @@ case 664: ; break;} case 666: -#line 3035 "parse.y" +#line 3032 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 667: -#line 3040 "parse.y" +#line 3037 "parse.y" { got_scope = NULL_TREE; ; break;} case 668: -#line 3042 "parse.y" +#line 3039 "parse.y" { yyval.ttype = yyvsp[-1].ttype; got_scope = NULL_TREE; ; break;} case 669: -#line 3049 "parse.y" +#line 3046 "parse.y" { got_scope = void_type_node; ; break;} case 670: -#line 3055 "parse.y" +#line 3052 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 671: -#line 3057 "parse.y" +#line 3054 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE); ; break;} case 672: -#line 3059 "parse.y" +#line 3056 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 673: -#line 3061 "parse.y" +#line 3058 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[0].ttype, NULL_TREE); ; break;} case 674: -#line 3063 "parse.y" +#line 3060 "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 675: -#line 3067 "parse.y" +#line 3064 "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 677: -#line 3076 "parse.y" +#line 3073 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ; break;} case 678: -#line 3078 "parse.y" +#line 3075 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ; break;} case 680: -#line 3084 "parse.y" +#line 3081 "parse.y" { /* Provide support for '(' attributes '*' declarator ')' etc */ @@ -7389,96 +7386,96 @@ case 680: ; break;} case 681: -#line 3094 "parse.y" +#line 3091 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 682: -#line 3096 "parse.y" +#line 3093 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 683: -#line 3098 "parse.y" +#line 3095 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[0].ftype.t, NULL_TREE); ; break;} case 684: -#line 3100 "parse.y" +#line 3097 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, NULL_TREE); ; break;} case 685: -#line 3102 "parse.y" +#line 3099 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 686: -#line 3104 "parse.y" +#line 3101 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 687: -#line 3106 "parse.y" +#line 3103 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[0].ftype.t, NULL_TREE); ; break;} case 688: -#line 3108 "parse.y" +#line 3105 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, NULL_TREE); ; break;} case 689: -#line 3110 "parse.y" +#line 3107 "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 690: -#line 3114 "parse.y" +#line 3111 "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 692: -#line 3123 "parse.y" +#line 3120 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 693: -#line 3126 "parse.y" +#line 3123 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 694: -#line 3128 "parse.y" +#line 3125 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 695: -#line 3130 "parse.y" +#line 3127 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ; break;} case 696: -#line 3132 "parse.y" +#line 3129 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ; break;} case 697: -#line 3134 "parse.y" +#line 3131 "parse.y" { yyval.ttype = make_call_declarator (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 698: -#line 3136 "parse.y" +#line 3133 "parse.y" { set_quals_and_spec (yyval.ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 699: -#line 3138 "parse.y" +#line 3135 "parse.y" { set_quals_and_spec (yyval.ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 700: -#line 3140 "parse.y" +#line 3137 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ; break;} case 701: -#line 3142 "parse.y" +#line 3139 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, NULL_TREE); ; break;} case 708: -#line 3165 "parse.y" +#line 3162 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids label declarations"); ; break;} case 711: -#line 3176 "parse.y" +#line 3173 "parse.y" { while (yyvsp[-1].ttype) { @@ -7488,181 +7485,181 @@ case 711: ; break;} case 712: -#line 3189 "parse.y" +#line 3186 "parse.y" {; break;} case 714: -#line 3195 "parse.y" +#line 3192 "parse.y" { yyval.ttype = begin_compound_stmt (0); ; break;} case 715: -#line 3197 "parse.y" +#line 3194 "parse.y" { yyval.ttype = finish_compound_stmt (0, yyvsp[-1].ttype); ; break;} case 716: -#line 3202 "parse.y" +#line 3199 "parse.y" { yyval.ttype = begin_if_stmt (); cond_stmt_keyword = "if"; ; break;} case 717: -#line 3207 "parse.y" +#line 3204 "parse.y" { finish_if_stmt_cond (yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 718: -#line 3209 "parse.y" +#line 3206 "parse.y" { yyval.ttype = finish_then_clause (yyvsp[-3].ttype); ; break;} case 720: -#line 3214 "parse.y" +#line 3211 "parse.y" { yyval.ttype = begin_compound_stmt (0); ; break;} case 721: -#line 3216 "parse.y" +#line 3213 "parse.y" { yyval.ttype = finish_compound_stmt (0, yyvsp[-1].ttype); ; break;} case 722: -#line 3221 "parse.y" +#line 3218 "parse.y" {; break;} case 724: -#line 3227 "parse.y" +#line 3224 "parse.y" { finish_stmt (); ; break;} case 725: -#line 3229 "parse.y" +#line 3226 "parse.y" { finish_expr_stmt (yyvsp[-1].ttype); ; break;} case 726: -#line 3231 "parse.y" +#line 3228 "parse.y" { begin_else_clause (); ; break;} case 727: -#line 3233 "parse.y" +#line 3230 "parse.y" { finish_else_clause (yyvsp[-3].ttype); finish_if_stmt (); ; break;} case 728: -#line 3238 "parse.y" +#line 3235 "parse.y" { finish_if_stmt (); ; break;} case 729: -#line 3240 "parse.y" +#line 3237 "parse.y" { yyval.ttype = begin_while_stmt (); cond_stmt_keyword = "while"; ; break;} case 730: -#line 3245 "parse.y" +#line 3242 "parse.y" { finish_while_stmt_cond (yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 731: -#line 3247 "parse.y" +#line 3244 "parse.y" { finish_while_stmt (yyvsp[-3].ttype); ; break;} case 732: -#line 3249 "parse.y" +#line 3246 "parse.y" { yyval.ttype = begin_do_stmt (); ; break;} case 733: -#line 3251 "parse.y" +#line 3248 "parse.y" { finish_do_body (yyvsp[-2].ttype); cond_stmt_keyword = "do"; ; break;} case 734: -#line 3256 "parse.y" +#line 3253 "parse.y" { finish_do_stmt (yyvsp[-1].ttype, yyvsp[-5].ttype); ; break;} case 735: -#line 3258 "parse.y" +#line 3255 "parse.y" { yyval.ttype = begin_for_stmt (); ; break;} case 736: -#line 3260 "parse.y" +#line 3257 "parse.y" { finish_for_init_stmt (yyvsp[-2].ttype); ; break;} case 737: -#line 3262 "parse.y" +#line 3259 "parse.y" { finish_for_cond (yyvsp[-1].ttype, yyvsp[-5].ttype); ; break;} case 738: -#line 3264 "parse.y" +#line 3261 "parse.y" { finish_for_expr (yyvsp[-1].ttype, yyvsp[-8].ttype); ; break;} case 739: -#line 3266 "parse.y" +#line 3263 "parse.y" { finish_for_stmt (yyvsp[-3].ttype, yyvsp[-10].ttype); ; break;} case 740: -#line 3268 "parse.y" +#line 3265 "parse.y" { yyval.ttype = begin_switch_stmt (); ; break;} case 741: -#line 3270 "parse.y" +#line 3267 "parse.y" { finish_switch_cond (yyvsp[-1].ttype, yyvsp[-3].ttype); ; break;} case 742: -#line 3272 "parse.y" +#line 3269 "parse.y" { finish_switch_stmt (yyvsp[-3].ttype, yyvsp[-5].ttype); ; break;} case 743: -#line 3274 "parse.y" +#line 3271 "parse.y" { finish_case_label (yyvsp[-1].ttype, NULL_TREE); ; break;} case 745: -#line 3277 "parse.y" +#line 3274 "parse.y" { finish_case_label (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 747: -#line 3280 "parse.y" +#line 3277 "parse.y" { finish_case_label (NULL_TREE, NULL_TREE); ; break;} case 749: -#line 3283 "parse.y" +#line 3280 "parse.y" { finish_break_stmt (); ; break;} case 750: -#line 3285 "parse.y" +#line 3282 "parse.y" { finish_continue_stmt (); ; break;} case 751: -#line 3287 "parse.y" +#line 3284 "parse.y" { finish_return_stmt (NULL_TREE); ; break;} case 752: -#line 3289 "parse.y" +#line 3286 "parse.y" { finish_return_stmt (yyvsp[-1].ttype); ; break;} case 753: -#line 3291 "parse.y" +#line 3288 "parse.y" { finish_asm_stmt (yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE, NULL_TREE, NULL_TREE); ; break;} case 754: -#line 3297 "parse.y" +#line 3294 "parse.y" { finish_asm_stmt (yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE, NULL_TREE); ; break;} case 755: -#line 3303 "parse.y" +#line 3300 "parse.y" { finish_asm_stmt (yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE); ; break;} case 756: -#line 3307 "parse.y" +#line 3304 "parse.y" { finish_asm_stmt (yyvsp[-10].ttype, yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype); ; break;} case 757: -#line 3309 "parse.y" +#line 3306 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids computed gotos"); @@ -7670,67 +7667,67 @@ case 757: ; break;} case 758: -#line 3315 "parse.y" +#line 3312 "parse.y" { finish_goto_stmt (yyvsp[-1].ttype); ; break;} case 760: -#line 3318 "parse.y" +#line 3315 "parse.y" { error ("label must be followed by statement"); yyungetc ('}', 0); ; break;} case 761: -#line 3321 "parse.y" +#line 3318 "parse.y" { finish_stmt (); ; break;} case 764: -#line 3325 "parse.y" +#line 3322 "parse.y" { do_local_using_decl (yyvsp[0].ttype); ; break;} case 766: -#line 3331 "parse.y" +#line 3328 "parse.y" { yyval.ttype = begin_function_try_block (); ; break;} case 767: -#line 3333 "parse.y" +#line 3330 "parse.y" { finish_function_try_block (yyvsp[-2].ttype); ; break;} case 768: -#line 3335 "parse.y" +#line 3332 "parse.y" { finish_function_handler_sequence (yyvsp[-4].ttype); yyval.itype = yyvsp[-3].itype; ; break;} case 769: -#line 3343 "parse.y" +#line 3340 "parse.y" { yyval.ttype = begin_try_block (); ; break;} case 770: -#line 3345 "parse.y" +#line 3342 "parse.y" { finish_try_block (yyvsp[-1].ttype); ; break;} case 771: -#line 3347 "parse.y" +#line 3344 "parse.y" { finish_handler_sequence (yyvsp[-3].ttype); ; break;} case 774: -#line 3357 "parse.y" +#line 3354 "parse.y" { yyval.ttype = begin_handler(); ; break;} case 775: -#line 3359 "parse.y" +#line 3356 "parse.y" { yyval.ttype = finish_handler_parms (yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 776: -#line 3361 "parse.y" +#line 3358 "parse.y" { finish_handler (yyvsp[-1].ttype, yyvsp[-3].ttype); ; break;} case 779: -#line 3371 "parse.y" +#line 3368 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 780: -#line 3387 "parse.y" +#line 3384 "parse.y" { check_for_new_type ("inside exception declarations", yyvsp[-1].ftype); yyval.ttype = start_handler_parms (TREE_PURPOSE (yyvsp[-1].ftype.t), @@ -7738,102 +7735,102 @@ case 780: ; break;} case 781: -#line 3396 "parse.y" +#line 3393 "parse.y" { finish_label_stmt (yyvsp[-1].ttype); ; break;} case 782: -#line 3398 "parse.y" +#line 3395 "parse.y" { finish_label_stmt (yyvsp[-1].ttype); ; break;} case 783: -#line 3400 "parse.y" +#line 3397 "parse.y" { finish_label_stmt (yyvsp[-1].ttype); ; break;} case 784: -#line 3402 "parse.y" +#line 3399 "parse.y" { finish_label_stmt (yyvsp[-1].ttype); ; break;} case 785: -#line 3407 "parse.y" +#line 3404 "parse.y" { finish_expr_stmt (yyvsp[-1].ttype); ; break;} case 787: -#line 3410 "parse.y" +#line 3407 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids compound statements inside for initializations"); ; break;} case 788: -#line 3419 "parse.y" +#line 3416 "parse.y" { emit_line_note (input_filename, lineno); yyval.ttype = NULL_TREE; ; break;} case 789: -#line 3422 "parse.y" +#line 3419 "parse.y" { emit_line_note (input_filename, lineno); ; break;} case 790: -#line 3427 "parse.y" +#line 3424 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 792: -#line 3430 "parse.y" +#line 3427 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 793: -#line 3437 "parse.y" +#line 3434 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 796: -#line 3444 "parse.y" +#line 3441 "parse.y" { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ; break;} case 797: -#line 3449 "parse.y" +#line 3446 "parse.y" { yyval.ttype = build_tree_list (yyval.ttype, yyvsp[-1].ttype); ; break;} case 798: -#line 3454 "parse.y" +#line 3451 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, NULL_TREE); ; break;} case 799: -#line 3456 "parse.y" +#line 3453 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ; break;} case 800: -#line 3467 "parse.y" +#line 3464 "parse.y" { yyval.ttype = empty_parms(); ; break;} case 802: -#line 3472 "parse.y" +#line 3469 "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 803: -#line 3480 "parse.y" +#line 3477 "parse.y" { yyval.ttype = finish_parmlist (yyval.ttype, 0); ; break;} case 804: -#line 3482 "parse.y" +#line 3479 "parse.y" { yyval.ttype = finish_parmlist (yyvsp[-1].ttype, 1); ; break;} case 805: -#line 3485 "parse.y" +#line 3482 "parse.y" { yyval.ttype = finish_parmlist (yyvsp[-1].ttype, 1); ; break;} case 806: -#line 3487 "parse.y" +#line 3484 "parse.y" { yyval.ttype = finish_parmlist (build_tree_list (NULL_TREE, yyvsp[-1].ftype.t), 1); ; break;} case 807: -#line 3490 "parse.y" +#line 3487 "parse.y" { yyval.ttype = finish_parmlist (NULL_TREE, 1); ; break;} case 808: -#line 3492 "parse.y" +#line 3489 "parse.y" { /* This helps us recover from really nasty parse errors, for example, a missing right @@ -7845,7 +7842,7 @@ case 808: ; break;} case 809: -#line 3502 "parse.y" +#line 3499 "parse.y" { /* This helps us recover from really nasty parse errors, for example, a missing right @@ -7858,99 +7855,99 @@ case 809: ; break;} case 810: -#line 3517 "parse.y" +#line 3514 "parse.y" { maybe_snarf_defarg (); ; break;} case 811: -#line 3519 "parse.y" +#line 3516 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 814: -#line 3530 "parse.y" +#line 3527 "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 815: -#line 3533 "parse.y" +#line 3530 "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 816: -#line 3536 "parse.y" +#line 3533 "parse.y" { check_for_new_type ("in a parameter list", yyvsp[0].ftype); yyval.ttype = chainon (yyval.ttype, yyvsp[0].ftype.t); ; break;} case 817: -#line 3539 "parse.y" +#line 3536 "parse.y" { yyval.ttype = chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 818: -#line 3541 "parse.y" +#line 3538 "parse.y" { yyval.ttype = chainon (yyval.ttype, build_tree_list (yyvsp[0].ttype, yyvsp[-2].ttype)); ; break;} case 820: -#line 3547 "parse.y" +#line 3544 "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 821: -#line 3557 "parse.y" +#line 3554 "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 822: -#line 3561 "parse.y" +#line 3558 "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 823: -#line 3564 "parse.y" +#line 3561 "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 824: -#line 3568 "parse.y" +#line 3565 "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 825: -#line 3572 "parse.y" +#line 3569 "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 826: -#line 3576 "parse.y" +#line 3573 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ttype); yyval.ftype.t = build_tree_list (specs, yyvsp[0].ttype); yyval.ftype.new_type_flag = 0; ; break;} case 827: -#line 3583 "parse.y" +#line 3580 "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 828: -#line 3586 "parse.y" +#line 3583 "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 831: -#line 3597 "parse.y" +#line 3594 "parse.y" { see_typename (); ; break;} case 832: -#line 3602 "parse.y" +#line 3599 "parse.y" { error ("type specifier omitted for parameter"); yyval.ttype = build_tree_list (integer_type_node, NULL_TREE); ; break;} case 833: -#line 3607 "parse.y" +#line 3604 "parse.y" { error ("type specifier omitted for parameter"); if (TREE_CODE (yyval.ttype) == SCOPE_REF @@ -7961,192 +7958,192 @@ case 833: ; break;} case 834: -#line 3619 "parse.y" +#line 3616 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 835: -#line 3621 "parse.y" +#line 3618 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 836: -#line 3623 "parse.y" +#line 3620 "parse.y" { yyval.ttype = empty_except_spec; ; break;} case 837: -#line 3628 "parse.y" +#line 3625 "parse.y" { check_for_new_type ("exception specifier", yyvsp[0].ftype); yyval.ttype = groktypename (yyvsp[0].ftype.t); ; break;} case 838: -#line 3636 "parse.y" +#line 3633 "parse.y" { yyval.ttype = add_exception_specifier (NULL_TREE, yyvsp[0].ttype, 1); ; break;} case 839: -#line 3638 "parse.y" +#line 3635 "parse.y" { yyval.ttype = add_exception_specifier (yyvsp[-2].ttype, yyvsp[0].ttype, 1); ; break;} case 840: -#line 3643 "parse.y" +#line 3640 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 841: -#line 3645 "parse.y" +#line 3642 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 842: -#line 3647 "parse.y" +#line 3644 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 843: -#line 3649 "parse.y" +#line 3646 "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 844: -#line 3656 "parse.y" +#line 3653 "parse.y" { got_scope = NULL_TREE; ; break;} case 845: -#line 3661 "parse.y" +#line 3658 "parse.y" { yyval.ttype = ansi_opname[MULT_EXPR]; ; break;} case 846: -#line 3663 "parse.y" +#line 3660 "parse.y" { yyval.ttype = ansi_opname[TRUNC_DIV_EXPR]; ; break;} case 847: -#line 3665 "parse.y" +#line 3662 "parse.y" { yyval.ttype = ansi_opname[TRUNC_MOD_EXPR]; ; break;} case 848: -#line 3667 "parse.y" +#line 3664 "parse.y" { yyval.ttype = ansi_opname[PLUS_EXPR]; ; break;} case 849: -#line 3669 "parse.y" +#line 3666 "parse.y" { yyval.ttype = ansi_opname[MINUS_EXPR]; ; break;} case 850: -#line 3671 "parse.y" +#line 3668 "parse.y" { yyval.ttype = ansi_opname[BIT_AND_EXPR]; ; break;} case 851: -#line 3673 "parse.y" +#line 3670 "parse.y" { yyval.ttype = ansi_opname[BIT_IOR_EXPR]; ; break;} case 852: -#line 3675 "parse.y" +#line 3672 "parse.y" { yyval.ttype = ansi_opname[BIT_XOR_EXPR]; ; break;} case 853: -#line 3677 "parse.y" +#line 3674 "parse.y" { yyval.ttype = ansi_opname[BIT_NOT_EXPR]; ; break;} case 854: -#line 3679 "parse.y" +#line 3676 "parse.y" { yyval.ttype = ansi_opname[COMPOUND_EXPR]; ; break;} case 855: -#line 3681 "parse.y" +#line 3678 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 856: -#line 3683 "parse.y" +#line 3680 "parse.y" { yyval.ttype = ansi_opname[LT_EXPR]; ; break;} case 857: -#line 3685 "parse.y" +#line 3682 "parse.y" { yyval.ttype = ansi_opname[GT_EXPR]; ; break;} case 858: -#line 3687 "parse.y" +#line 3684 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 859: -#line 3689 "parse.y" +#line 3686 "parse.y" { yyval.ttype = ansi_assopname[yyvsp[0].code]; ; break;} case 860: -#line 3691 "parse.y" +#line 3688 "parse.y" { yyval.ttype = ansi_opname [MODIFY_EXPR]; ; break;} case 861: -#line 3693 "parse.y" +#line 3690 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 862: -#line 3695 "parse.y" +#line 3692 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 863: -#line 3697 "parse.y" +#line 3694 "parse.y" { yyval.ttype = ansi_opname[POSTINCREMENT_EXPR]; ; break;} case 864: -#line 3699 "parse.y" +#line 3696 "parse.y" { yyval.ttype = ansi_opname[PREDECREMENT_EXPR]; ; break;} case 865: -#line 3701 "parse.y" +#line 3698 "parse.y" { yyval.ttype = ansi_opname[TRUTH_ANDIF_EXPR]; ; break;} case 866: -#line 3703 "parse.y" +#line 3700 "parse.y" { yyval.ttype = ansi_opname[TRUTH_ORIF_EXPR]; ; break;} case 867: -#line 3705 "parse.y" +#line 3702 "parse.y" { yyval.ttype = ansi_opname[TRUTH_NOT_EXPR]; ; break;} case 868: -#line 3707 "parse.y" +#line 3704 "parse.y" { yyval.ttype = ansi_opname[COND_EXPR]; ; break;} case 869: -#line 3709 "parse.y" +#line 3706 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 870: -#line 3711 "parse.y" +#line 3708 "parse.y" { yyval.ttype = ansi_opname[COMPONENT_REF]; ; break;} case 871: -#line 3713 "parse.y" +#line 3710 "parse.y" { yyval.ttype = ansi_opname[MEMBER_REF]; ; break;} case 872: -#line 3715 "parse.y" +#line 3712 "parse.y" { yyval.ttype = ansi_opname[CALL_EXPR]; ; break;} case 873: -#line 3717 "parse.y" +#line 3714 "parse.y" { yyval.ttype = ansi_opname[ARRAY_REF]; ; break;} case 874: -#line 3719 "parse.y" +#line 3716 "parse.y" { yyval.ttype = ansi_opname[NEW_EXPR]; ; break;} case 875: -#line 3721 "parse.y" +#line 3718 "parse.y" { yyval.ttype = ansi_opname[DELETE_EXPR]; ; break;} case 876: -#line 3723 "parse.y" +#line 3720 "parse.y" { yyval.ttype = ansi_opname[VEC_NEW_EXPR]; ; break;} case 877: -#line 3725 "parse.y" +#line 3722 "parse.y" { yyval.ttype = ansi_opname[VEC_DELETE_EXPR]; ; break;} case 878: -#line 3728 "parse.y" +#line 3725 "parse.y" { yyval.ttype = grokoptypename (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 879: -#line 3730 "parse.y" +#line 3727 "parse.y" { yyval.ttype = ansi_opname[ERROR_MARK]; ; break;} } @@ -8371,7 +8368,7 @@ yyerrhandle: } return 1; } -#line 3733 "parse.y" +#line 3730 "parse.y" #ifdef SPEW_DEBUG diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y index 335c022627a..c33cec03b86 100644 --- a/gcc/cp/parse.y +++ b/gcc/cp/parse.y @@ -70,10 +70,7 @@ int have_extern_spec; int used_extern_spec; /* Cons up an empty parameter list. */ -#ifdef __GNUC__ -__inline -#endif -static tree +static inline tree empty_parms () { tree parms; -- 2.11.4.GIT