From: Mark Mitchell <mmitchel@gcc.gnu.org>
Date: Tue, 21 Sep 1999 07:41:01 +0000 (+0000)
Subject: cp-tree.h (finish_stmt_expr): Change prototype.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bce9471e0ca352b7195fe476d4ca739f5f850a37;p=gcc.git

cp-tree.h (finish_stmt_expr): Change prototype.

	* cp-tree.h (finish_stmt_expr): Change prototype.
	* expr.c (cplus_expand_expr): Adjust call accordingly.
	* init.c (finish_init_stmts): Likewise.
	* parse.y (primary): Likewise.
	* pt.c (tsubst_copy): Likewise.
	* semantics.c (finish_stmt_expr): Don't take two parameters.
	Don't remove generated BLOCKs from the block-tree.

From-SVN: r29537
---

diff --git a/gcc/cp/ir.texi b/gcc/cp/ir.texi
index e1ff4cae665..7056a666ed8 100644
--- a/gcc/cp/ir.texi
+++ b/gcc/cp/ir.texi
@@ -807,7 +807,11 @@ than the @code{TYPE_SIZE} and @code{TYPE_ALIGN} given by the
 variable to give it a particular size and alignment.
 
 If this variable is initialized (but does not require a constructor),
-the @code{DECL_INITIAL} will be an expression for the initializer.
+the @code{DECL_INITIAL} will be an expression for the initializer.  The
+initializer should be evaluated, and a bitwise copy into the variable
+performed.  If the @code{DECL_INITIAL} is the @code{error_mark_node},
+there is an initializer, but it is given by an explicit statement later
+in the code; no bitwise copy is required.
 
 @item PARM_DECL
 Used to represent a parameter to a function.  Treat these nodes
diff --git a/gcc/cp/parse.c b/gcc/cp/parse.c
index 018a754285a..a7b552628de 100644
--- a/gcc/cp/parse.c
+++ b/gcc/cp/parse.c
@@ -692,62 +692,62 @@ static const short yyrline[] = { 0,
   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,  1487,  1488,  1492,  1496,  1500,  1504,
-  1506,  1510,  1512,  1514,  1522,  1524,  1526,  1528,  1532,  1534,
-  1536,  1538,  1543,  1545,  1547,  1549,  1552,  1554,  1556,  1600,
-  1603,  1607,  1610,  1614,  1617,  1622,  1624,  1628,  1637,  1640,
-  1647,  1654,  1659,  1661,  1666,  1668,  1675,  1677,  1681,  1685,
-  1691,  1695,  1698,  1702,  1705,  1715,  1717,  1720,  1724,  1727,
-  1730,  1733,  1736,  1742,  1748,  1750,  1755,  1757,  1775,  1778,
-  1780,  1783,  1789,  1791,  1801,  1805,  1808,  1811,  1816,  1819,
-  1827,  1829,  1831,  1833,  1836,  1839,  1854,  1873,  1876,  1878,
-  1881,  1883,  1887,  1889,  1893,  1895,  1899,  1902,  1906,  1912,
-  1913,  1925,  1932,  1935,  1941,  1945,  1950,  1956,  1957,  1965,
-  1968,  1972,  1975,  1979,  1984,  1987,  1991,  1994,  1996,  1998,
-  2000,  2007,  2009,  2010,  2011,  2015,  2018,  2022,  2025,  2031,
-  2033,  2036,  2039,  2042,  2048,  2051,  2054,  2056,  2058,  2062,
-  2069,  2075,  2080,  2086,  2088,  2093,  2096,  2099,  2101,  2103,
-  2107,  2112,  2119,  2123,  2130,  2133,  2136,  2142,  2144,  2156,
-  2160,  2165,  2189,  2191,  2194,  2196,  2201,  2203,  2205,  2207,
-  2209,  2211,  2215,  2223,  2226,  2228,  2232,  2239,  2245,  2251,
-  2257,  2267,  2273,  2277,  2284,  2312,  2322,  2328,  2331,  2334,
-  2336,  2340,  2342,  2346,  2349,  2353,  2356,  2359,  2361,  2365,
-  2376,  2390,  2391,  2392,  2393,  2396,  2405,  2410,  2416,  2418,
-  2423,  2425,  2427,  2429,  2431,  2433,  2436,  2446,  2453,  2478,
-  2484,  2487,  2490,  2492,  2503,  2508,  2511,  2516,  2519,  2526,
-  2536,  2539,  2546,  2556,  2558,  2561,  2563,  2566,  2573,  2581,
-  2588,  2594,  2600,  2608,  2612,  2617,  2621,  2624,  2629,  2631,
-  2639,  2641,  2645,  2648,  2653,  2657,  2663,  2674,  2677,  2681,
-  2685,  2693,  2698,  2704,  2707,  2709,  2711,  2717,  2719,  2728,
-  2731,  2733,  2735,  2737,  2741,  2744,  2747,  2749,  2751,  2753,
-  2757,  2760,  2771,  2781,  2783,  2784,  2788,  2796,  2798,  2806,
-  2809,  2811,  2813,  2815,  2819,  2822,  2825,  2827,  2829,  2831,
-  2835,  2838,  2841,  2843,  2845,  2847,  2849,  2856,  2860,  2865,
-  2869,  2874,  2876,  2880,  2883,  2885,  2888,  2890,  2891,  2894,
-  2896,  2898,  2904,  2915,  2921,  2927,  2941,  2943,  2947,  2961,
-  2963,  2965,  2969,  2975,  2988,  2990,  2994,  3007,  3013,  3015,
-  3016,  3017,  3025,  3030,  3039,  3040,  3044,  3047,  3053,  3059,
-  3062,  3064,  3066,  3068,  3072,  3076,  3080,  3083,  3087,  3089,
-  3098,  3101,  3103,  3105,  3107,  3109,  3111,  3113,  3115,  3119,
-  3123,  3127,  3131,  3133,  3135,  3137,  3139,  3141,  3143,  3145,
-  3147,  3155,  3157,  3158,  3159,  3162,  3168,  3170,  3175,  3177,
-  3180,  3193,  3196,  3199,  3203,  3206,  3213,  3215,  3218,  3220,
-  3222,  3225,  3228,  3231,  3234,  3236,  3239,  3243,  3245,  3251,
-  3253,  3254,  3256,  3261,  3263,  3265,  3267,  3269,  3272,  3273,
-  3275,  3278,  3279,  3282,  3282,  3285,  3285,  3288,  3288,  3290,
-  3292,  3294,  3296,  3302,  3308,  3311,  3314,  3320,  3322,  3324,
-  3328,  3330,  3331,  3332,  3334,  3337,  3340,  3343,  3349,  3353,
-  3355,  3358,  3360,  3363,  3367,  3369,  3372,  3374,  3377,  3394,
-  3402,  3405,  3407,  3409,  3413,  3416,  3417,  3425,  3429,  3433,
-  3436,  3437,  3443,  3446,  3449,  3451,  3455,  3460,  3463,  3473,
-  3478,  3479,  3486,  3489,  3492,  3494,  3497,  3499,  3509,  3523,
-  3527,  3530,  3532,  3536,  3540,  3543,  3546,  3548,  3552,  3554,
-  3561,  3568,  3571,  3575,  3579,  3583,  3589,  3593,  3598,  3600,
-  3603,  3608,  3614,  3625,  3628,  3630,  3634,  3642,  3645,  3649,
-  3652,  3654,  3656,  3662,  3667,  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,  3726,  3728,  3730,  3732,  3735,  3737
+  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,  3318,
+  3322,  3324,  3325,  3326,  3328,  3331,  3334,  3337,  3343,  3347,
+  3349,  3352,  3354,  3357,  3361,  3363,  3366,  3368,  3371,  3388,
+  3396,  3399,  3401,  3403,  3407,  3410,  3411,  3419,  3423,  3427,
+  3430,  3431,  3437,  3440,  3443,  3445,  3449,  3454,  3457,  3467,
+  3472,  3473,  3480,  3483,  3486,  3488,  3491,  3493,  3503,  3517,
+  3521,  3524,  3526,  3530,  3534,  3537,  3540,  3542,  3546,  3548,
+  3555,  3562,  3565,  3569,  3573,  3577,  3583,  3587,  3592,  3594,
+  3597,  3602,  3608,  3619,  3622,  3624,  3628,  3636,  3639,  3643,
+  3646,  3648,  3650,  3656,  3661,  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,  3726,  3729,  3731
 };
 #endif
 
@@ -5666,7 +5666,7 @@ case 314:
     break;}
 case 315:
 #line 1449 "parse.y"
-{ yyval.ttype = finish_stmt_expr (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
+{ yyval.ttype = finish_stmt_expr (yyvsp[-2].ttype); ;
     break;}
 case 316:
 #line 1454 "parse.y"
@@ -5708,61 +5708,55 @@ case 324:
 		     `const (3)' is equivalent to `const int (3)'.  */
 		  tree type;
 
-		  if (yyvsp[-1].ttype == error_mark_node)
-		    {
-		      yyval.ttype = error_mark_node;
-		      break;
-		    }
-
-		  type = cp_build_qualified_type (integer_type_node,
-						  cp_type_qual_from_rid (yyvsp[-3].ttype));
-		  yyval.ttype = build_c_cast (type, build_compound_expr (yyvsp[-1].ttype));
+		  type = hash_tree_cons (NULL_TREE, yyvsp[-3].ttype, NULL_TREE);
+		  type = groktypename (build_decl_list (type, NULL_TREE));
+		  yyval.ttype = build_functional_cast (type, yyvsp[-1].ttype);
 		;
     break;}
 case 326:
-#line 1489 "parse.y"
+#line 1483 "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 1493 "parse.y"
+#line 1487 "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 1497 "parse.y"
+#line 1491 "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 1501 "parse.y"
+#line 1495 "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 1505 "parse.y"
+#line 1499 "parse.y"
 { yyval.ttype = build_x_typeid (yyvsp[-1].ttype); ;
     break;}
 case 331:
-#line 1507 "parse.y"
+#line 1501 "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 1511 "parse.y"
+#line 1505 "parse.y"
 { yyval.ttype = do_scoped_id (yyvsp[0].ttype, 1); ;
     break;}
 case 333:
-#line 1513 "parse.y"
+#line 1507 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 334:
-#line 1515 "parse.y"
+#line 1509 "parse.y"
 {
 		  got_scope = NULL_TREE;
 		  if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
@@ -5772,102 +5766,102 @@ case 334:
 		;
     break;}
 case 335:
-#line 1523 "parse.y"
+#line 1517 "parse.y"
 { yyval.ttype = build_offset_ref (OP0 (yyval.ttype), OP1 (yyval.ttype)); ;
     break;}
 case 336:
-#line 1525 "parse.y"
+#line 1519 "parse.y"
 { yyval.ttype = finish_qualified_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 337:
-#line 1527 "parse.y"
+#line 1521 "parse.y"
 { yyval.ttype = finish_qualified_call_expr (yyvsp[-1].ttype, NULL_TREE); ;
     break;}
 case 338:
-#line 1529 "parse.y"
+#line 1523 "parse.y"
 { 
 		  yyval.ttype = build_x_component_ref (yyval.ttype, yyvsp[0].ttype, NULL_TREE, 1); 
 		;
     break;}
 case 339:
-#line 1533 "parse.y"
+#line 1527 "parse.y"
 { yyval.ttype = finish_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ;
     break;}
 case 340:
-#line 1535 "parse.y"
+#line 1529 "parse.y"
 { yyval.ttype = finish_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 341:
-#line 1537 "parse.y"
+#line 1531 "parse.y"
 { yyval.ttype = build_x_component_ref (yyval.ttype, yyvsp[0].ttype, NULL_TREE, 1); ;
     break;}
 case 342:
-#line 1539 "parse.y"
+#line 1533 "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 1544 "parse.y"
+#line 1538 "parse.y"
 { yyval.ttype = finish_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ;
     break;}
 case 344:
-#line 1546 "parse.y"
+#line 1540 "parse.y"
 { yyval.ttype = finish_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 345:
-#line 1548 "parse.y"
+#line 1542 "parse.y"
 { yyval.ttype = finish_qualified_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ;
     break;}
 case 346:
-#line 1550 "parse.y"
+#line 1544 "parse.y"
 { yyval.ttype = finish_qualified_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 347:
-#line 1553 "parse.y"
+#line 1547 "parse.y"
 { yyval.ttype = finish_pseudo_destructor_call_expr (yyvsp[-3].ttype, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 348:
-#line 1555 "parse.y"
+#line 1549 "parse.y"
 { yyval.ttype = finish_pseudo_destructor_call_expr (yyvsp[-5].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ;
     break;}
 case 349:
-#line 1557 "parse.y"
+#line 1551 "parse.y"
 {
 		  yyval.ttype = error_mark_node;
 		;
     break;}
 case 350:
-#line 1602 "parse.y"
+#line 1596 "parse.y"
 { yyval.itype = 0; ;
     break;}
 case 351:
-#line 1604 "parse.y"
+#line 1598 "parse.y"
 { got_scope = NULL_TREE; yyval.itype = 1; ;
     break;}
 case 352:
-#line 1609 "parse.y"
+#line 1603 "parse.y"
 { yyval.itype = 0; ;
     break;}
 case 353:
-#line 1611 "parse.y"
+#line 1605 "parse.y"
 { got_scope = NULL_TREE; yyval.itype = 1; ;
     break;}
 case 354:
-#line 1616 "parse.y"
+#line 1610 "parse.y"
 { yyval.ttype = boolean_true_node; ;
     break;}
 case 355:
-#line 1618 "parse.y"
+#line 1612 "parse.y"
 { yyval.ttype = boolean_false_node; ;
     break;}
 case 357:
-#line 1625 "parse.y"
+#line 1619 "parse.y"
 { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 358:
-#line 1630 "parse.y"
+#line 1624 "parse.y"
 {
 		  if (! current_function_parms_stored)
 		    store_parm_decls ();
@@ -5875,18 +5869,18 @@ case 358:
 		;
     break;}
 case 359:
-#line 1639 "parse.y"
+#line 1633 "parse.y"
 { got_object = TREE_TYPE (yyval.ttype); ;
     break;}
 case 360:
-#line 1641 "parse.y"
+#line 1635 "parse.y"
 {
 		  yyval.ttype = build_x_arrow (yyval.ttype); 
 		  got_object = TREE_TYPE (yyval.ttype);
 		;
     break;}
 case 361:
-#line 1649 "parse.y"
+#line 1643 "parse.y"
 {
 		  resume_momentary (yyvsp[-1].itype);
 		  if (yyvsp[-2].ftype.t && IS_AGGR_TYPE_CODE (TREE_CODE (yyvsp[-2].ftype.t)))
@@ -5894,139 +5888,139 @@ case 361:
 		;
     break;}
 case 362:
-#line 1655 "parse.y"
+#line 1649 "parse.y"
 {
 		  resume_momentary (yyvsp[-1].itype);
 		  note_list_got_semicolon (yyvsp[-2].ftype.t);
 		;
     break;}
 case 363:
-#line 1660 "parse.y"
+#line 1654 "parse.y"
 { resume_momentary (yyvsp[-1].itype); ;
     break;}
 case 364:
-#line 1662 "parse.y"
+#line 1656 "parse.y"
 {
 		  shadow_tag (yyvsp[-1].ftype.t);
 		  note_list_got_semicolon (yyvsp[-1].ftype.t);
 		;
     break;}
 case 365:
-#line 1667 "parse.y"
+#line 1661 "parse.y"
 { warning ("empty declaration"); ;
     break;}
 case 366:
-#line 1669 "parse.y"
+#line 1663 "parse.y"
 { pedantic = yyvsp[-1].itype; ;
     break;}
 case 369:
-#line 1683 "parse.y"
+#line 1677 "parse.y"
 { yyval.ttype = make_call_declarator (NULL_TREE, empty_parms (),
 					     NULL_TREE, NULL_TREE); ;
     break;}
 case 370:
-#line 1686 "parse.y"
+#line 1680 "parse.y"
 { yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), NULL_TREE,
 					     NULL_TREE); ;
     break;}
 case 371:
-#line 1693 "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 372:
-#line 1696 "parse.y"
+#line 1690 "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 1699 "parse.y"
+#line 1693 "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 1703 "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 375:
-#line 1706 "parse.y"
+#line 1700 "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 1722 "parse.y"
+#line 1716 "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 1725 "parse.y"
+#line 1719 "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 1728 "parse.y"
+#line 1722 "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 1731 "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 382:
-#line 1734 "parse.y"
+#line 1728 "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 1737 "parse.y"
+#line 1731 "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 1744 "parse.y"
+#line 1738 "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 1749 "parse.y"
+#line 1743 "parse.y"
 { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyval.ttype); ;
     break;}
 case 386:
-#line 1751 "parse.y"
+#line 1745 "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 1756 "parse.y"
+#line 1750 "parse.y"
 { yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 388:
-#line 1758 "parse.y"
+#line 1752 "parse.y"
 { yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); ;
     break;}
 case 389:
-#line 1777 "parse.y"
+#line 1771 "parse.y"
 { yyval.ttype = yyvsp[0].ftype.t; TREE_STATIC (yyval.ttype) = 1; ;
     break;}
 case 390:
-#line 1779 "parse.y"
+#line 1773 "parse.y"
 { yyval.ttype = hash_tree_cons (NULL_TREE, yyval.ttype, NULL_TREE); ;
     break;}
 case 391:
-#line 1781 "parse.y"
+#line 1775 "parse.y"
 { yyval.ttype = hash_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype);
 		  TREE_STATIC (yyval.ttype) = 1; ;
     break;}
 case 392:
-#line 1784 "parse.y"
+#line 1778 "parse.y"
 { if (extra_warnings && TREE_STATIC (yyval.ttype))
 		    warning ("`%s' is not at beginning of declaration",
 			     IDENTIFIER_POINTER (yyvsp[0].ttype));
@@ -6034,61 +6028,61 @@ case 392:
 		  TREE_STATIC (yyval.ttype) = TREE_STATIC (yyvsp[-1].ttype); ;
     break;}
 case 393:
-#line 1790 "parse.y"
+#line 1784 "parse.y"
 { yyval.ttype = hash_tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 394:
-#line 1792 "parse.y"
+#line 1786 "parse.y"
 { yyval.ttype = hash_tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); ;
     break;}
 case 395:
-#line 1803 "parse.y"
+#line 1797 "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 1806 "parse.y"
+#line 1800 "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 1809 "parse.y"
+#line 1803 "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 1812 "parse.y"
+#line 1806 "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 1818 "parse.y"
+#line 1812 "parse.y"
 { yyval.ttype = build_decl_list (NULL_TREE, yyvsp[0].ftype.t); ;
     break;}
 case 400:
-#line 1820 "parse.y"
+#line 1814 "parse.y"
 { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ttype); ;
     break;}
 case 402:
-#line 1830 "parse.y"
+#line 1824 "parse.y"
 { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ;
     break;}
 case 403:
-#line 1832 "parse.y"
+#line 1826 "parse.y"
 { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ;
     break;}
 case 404:
-#line 1834 "parse.y"
+#line 1828 "parse.y"
 { yyval.ftype.t = finish_typeof (yyvsp[-1].ttype);
 		  yyval.ftype.new_type_flag = 0; ;
     break;}
 case 405:
-#line 1837 "parse.y"
+#line 1831 "parse.y"
 { yyval.ftype.t = groktypename (yyvsp[-1].ftype.t);
 		  yyval.ftype.new_type_flag = 0; ;
     break;}
 case 406:
-#line 1840 "parse.y"
+#line 1834 "parse.y"
 { tree type = TREE_TYPE (yyvsp[-1].ttype);
 
                   yyval.ftype.new_type_flag = 0;
@@ -6105,7 +6099,7 @@ case 406:
 		;
     break;}
 case 407:
-#line 1855 "parse.y"
+#line 1849 "parse.y"
 { tree type = groktypename (yyvsp[-1].ftype.t);
 
                   yyval.ftype.new_type_flag = 0;
@@ -6122,243 +6116,243 @@ case 407:
 		;
     break;}
 case 408:
-#line 1875 "parse.y"
+#line 1869 "parse.y"
 { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ;
     break;}
 case 409:
-#line 1877 "parse.y"
+#line 1871 "parse.y"
 { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ;
     break;}
 case 412:
-#line 1884 "parse.y"
+#line 1878 "parse.y"
 { check_multiple_declarators (); ;
     break;}
 case 414:
-#line 1890 "parse.y"
+#line 1884 "parse.y"
 { check_multiple_declarators (); ;
     break;}
 case 416:
-#line 1896 "parse.y"
+#line 1890 "parse.y"
 { check_multiple_declarators (); ;
     break;}
 case 417:
-#line 1901 "parse.y"
+#line 1895 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 418:
-#line 1903 "parse.y"
+#line 1897 "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 1908 "parse.y"
+#line 1902 "parse.y"
 { yyval.ttype = start_decl (yyvsp[-3].ttype, current_declspecs, 1,
 					  yyvsp[-1].ttype, prefix_attributes); ;
     break;}
 case 420:
-#line 1912 "parse.y"
+#line 1906 "parse.y"
 { cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype, 1, LOOKUP_ONLYCONVERTING); ;
     break;}
 case 421:
-#line 1914 "parse.y"
+#line 1908 "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 1927 "parse.y"
+#line 1921 "parse.y"
 { yyvsp[0].itype = parse_decl (yyvsp[-3].ttype, yyvsp[-4].ttype, 
 					   yyvsp[-1].ttype, 1, &yyval.ttype); ;
     break;}
 case 423:
-#line 1932 "parse.y"
+#line 1926 "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 1936 "parse.y"
+#line 1930 "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 1943 "parse.y"
+#line 1937 "parse.y"
 { yyval.itype = yyvsp[0].itype; ;
     break;}
 case 426:
-#line 1947 "parse.y"
+#line 1941 "parse.y"
 { yyval.itype = yyvsp[0].itype; ;
     break;}
 case 427:
-#line 1952 "parse.y"
+#line 1946 "parse.y"
 { /* Set things up as initdcl0_innards expects.  */
 	      yyvsp[0].ttype = yyvsp[-1].ttype; 
               yyvsp[-1].ttype = NULL_TREE; ;
     break;}
 case 428:
-#line 1956 "parse.y"
+#line 1950 "parse.y"
 {;
     break;}
 case 429:
-#line 1958 "parse.y"
+#line 1952 "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 1967 "parse.y"
+#line 1961 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 431:
-#line 1969 "parse.y"
+#line 1963 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 432:
-#line 1974 "parse.y"
+#line 1968 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 433:
-#line 1976 "parse.y"
+#line 1970 "parse.y"
 { yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 434:
-#line 1981 "parse.y"
+#line 1975 "parse.y"
 { yyval.ttype = yyvsp[-2].ttype; ;
     break;}
 case 435:
-#line 1986 "parse.y"
+#line 1980 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 436:
-#line 1988 "parse.y"
+#line 1982 "parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 437:
-#line 1993 "parse.y"
+#line 1987 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 438:
-#line 1995 "parse.y"
+#line 1989 "parse.y"
 { yyval.ttype = build_tree_list (yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 439:
-#line 1997 "parse.y"
+#line 1991 "parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-3].ttype, build_tree_list (NULL_TREE, yyvsp[-1].ttype)); ;
     break;}
 case 440:
-#line 1999 "parse.y"
+#line 1993 "parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-5].ttype, tree_cons (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype)); ;
     break;}
 case 441:
-#line 2001 "parse.y"
+#line 1995 "parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 446:
-#line 2017 "parse.y"
+#line 2011 "parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 447:
-#line 2019 "parse.y"
+#line 2013 "parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 448:
-#line 2024 "parse.y"
+#line 2018 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 449:
-#line 2026 "parse.y"
+#line 2020 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 451:
-#line 2034 "parse.y"
+#line 2028 "parse.y"
 { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, NULL_TREE);
 		  TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ;
     break;}
 case 452:
-#line 2037 "parse.y"
+#line 2031 "parse.y"
 { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-1].ttype));
 		  TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ;
     break;}
 case 453:
-#line 2040 "parse.y"
+#line 2034 "parse.y"
 { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-2].ttype));
 		  TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ;
     break;}
 case 454:
-#line 2043 "parse.y"
+#line 2037 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 455:
-#line 2050 "parse.y"
+#line 2044 "parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ;
     break;}
 case 456:
-#line 2052 "parse.y"
+#line 2046 "parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ;
     break;}
 case 457:
-#line 2055 "parse.y"
+#line 2049 "parse.y"
 { yyval.ttype = build_expr_list (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 458:
-#line 2057 "parse.y"
+#line 2051 "parse.y"
 { yyval.ttype = build_expr_list (yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 459:
-#line 2059 "parse.y"
+#line 2053 "parse.y"
 { yyval.ttype = tree_cons (yyvsp[-2].ttype, yyvsp[0].ttype, yyval.ttype); ;
     break;}
 case 460:
-#line 2064 "parse.y"
+#line 2058 "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 2071 "parse.y"
+#line 2065 "parse.y"
 {
 		  expand_body (finish_function (lineno, (int)yyvsp[-1].itype | 2));
 		  process_next_inline (yyvsp[-3].pi);
 		;
     break;}
 case 462:
-#line 2076 "parse.y"
+#line 2070 "parse.y"
 { 
 		  expand_body (finish_function (lineno, (int)yyvsp[0].itype | 2)); 
                   process_next_inline (yyvsp[-2].pi);
 		;
     break;}
 case 463:
-#line 2081 "parse.y"
+#line 2075 "parse.y"
 { 
 		  finish_function (lineno, 2); 
 		  process_next_inline (yyvsp[-2].pi); ;
     break;}
 case 466:
-#line 2095 "parse.y"
+#line 2089 "parse.y"
 { replace_defarg (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 467:
-#line 2097 "parse.y"
+#line 2091 "parse.y"
 { replace_defarg (yyvsp[-2].ttype, error_mark_node); ;
     break;}
 case 469:
-#line 2102 "parse.y"
+#line 2096 "parse.y"
 { do_pending_defargs (); ;
     break;}
 case 470:
-#line 2104 "parse.y"
+#line 2098 "parse.y"
 { do_pending_defargs (); ;
     break;}
 case 471:
-#line 2109 "parse.y"
+#line 2103 "parse.y"
 { yyvsp[0].itype = suspend_momentary ();
 		  yyval.ttype = current_enum_type;
 		  current_enum_type = start_enum (yyvsp[-1].ttype); ;
     break;}
 case 472:
-#line 2113 "parse.y"
+#line 2107 "parse.y"
 { TYPE_VALUES (current_enum_type) = yyvsp[-1].ttype;
 		  yyval.ftype.t = finish_enum (current_enum_type);
 		  yyval.ftype.new_type_flag = 1;
@@ -6367,13 +6361,13 @@ case 472:
 		  check_for_missing_semicolon (yyval.ftype.t); ;
     break;}
 case 473:
-#line 2120 "parse.y"
+#line 2114 "parse.y"
 { yyvsp[0].itype = suspend_momentary ();
 		  yyval.ttype = current_enum_type;
 		  current_enum_type = start_enum (make_anon_name ()); ;
     break;}
 case 474:
-#line 2124 "parse.y"
+#line 2118 "parse.y"
 { TYPE_VALUES (current_enum_type) = yyvsp[-1].ttype;
 		  yyval.ftype.t = finish_enum (current_enum_type);
 		  yyval.ftype.new_type_flag = 1;
@@ -6382,28 +6376,28 @@ case 474:
 		  check_for_missing_semicolon (yyval.ftype.t); ;
     break;}
 case 475:
-#line 2131 "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 476:
-#line 2134 "parse.y"
+#line 2128 "parse.y"
 { yyval.ftype.t = xref_tag (enum_type_node, yyvsp[0].ttype, 1); 
 		  yyval.ftype.new_type_flag = 0; ;
     break;}
 case 477:
-#line 2137 "parse.y"
+#line 2131 "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 2143 "parse.y"
+#line 2137 "parse.y"
 { yyvsp[-1].ftype.t = begin_class_definition (yyvsp[-1].ftype.t); ;
     break;}
 case 479:
-#line 2145 "parse.y"
+#line 2139 "parse.y"
 { 
 		  int semi;
 
@@ -6416,13 +6410,13 @@ case 479:
 		;
     break;}
 case 480:
-#line 2156 "parse.y"
+#line 2150 "parse.y"
 {
 		  begin_inline_definitions ();
 		;
     break;}
 case 481:
-#line 2160 "parse.y"
+#line 2154 "parse.y"
 {
 		  finish_inline_definitions ();
 		  yyval.ftype.t = yyvsp[-3].ttype;
@@ -6430,7 +6424,7 @@ case 481:
 		;
     break;}
 case 482:
-#line 2166 "parse.y"
+#line 2160 "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)));
@@ -6454,51 +6448,51 @@ case 482:
 		;
     break;}
 case 486:
-#line 2197 "parse.y"
+#line 2191 "parse.y"
 { if (pedantic && !in_system_header)
 		    pedwarn ("comma at end of enumerator list"); ;
     break;}
 case 488:
-#line 2204 "parse.y"
+#line 2198 "parse.y"
 { error ("storage class specifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ;
     break;}
 case 489:
-#line 2206 "parse.y"
+#line 2200 "parse.y"
 { error ("type specifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ;
     break;}
 case 490:
-#line 2208 "parse.y"
+#line 2202 "parse.y"
 { error ("type qualifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ;
     break;}
 case 491:
-#line 2210 "parse.y"
+#line 2204 "parse.y"
 { error ("no body nor ';' separates two class, struct or union declarations"); ;
     break;}
 case 492:
-#line 2212 "parse.y"
+#line 2206 "parse.y"
 { yyval.ttype = build_decl_list (yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 493:
-#line 2217 "parse.y"
+#line 2211 "parse.y"
 { 
 		  current_aggr = yyvsp[-1].ttype; 
 		  yyval.ttype = yyvsp[0].ttype; 
 		;
     break;}
 case 494:
-#line 2225 "parse.y"
+#line 2219 "parse.y"
 { current_aggr = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 495:
-#line 2227 "parse.y"
+#line 2221 "parse.y"
 { yyungetc ('{', 1); ;
     break;}
 case 496:
-#line 2229 "parse.y"
+#line 2223 "parse.y"
 { yyungetc (':', 1); ;
     break;}
 case 497:
-#line 2234 "parse.y"
+#line 2228 "parse.y"
 {
 		  current_aggr = yyvsp[-2].ttype;
 		  yyval.ftype.t = handle_class_head (yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype);
@@ -6506,7 +6500,7 @@ case 497:
 		;
     break;}
 case 498:
-#line 2240 "parse.y"
+#line 2234 "parse.y"
 {
 		  current_aggr = yyvsp[-3].ttype;
 		  yyval.ftype.t = handle_class_head (yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype);
@@ -6514,7 +6508,7 @@ case 498:
 		;
     break;}
 case 499:
-#line 2246 "parse.y"
+#line 2240 "parse.y"
 {
 		  current_aggr = yyvsp[-2].ttype;
 		  yyval.ftype.t = handle_class_head (yyvsp[-2].ttype, NULL_TREE, yyvsp[0].ttype);
@@ -6522,7 +6516,7 @@ case 499:
 		;
     break;}
 case 500:
-#line 2252 "parse.y"
+#line 2246 "parse.y"
 { 
 		  current_aggr = yyvsp[-1].ttype; 
 		  yyval.ftype.t = yyvsp[0].ttype;
@@ -6530,7 +6524,7 @@ case 500:
 		;
     break;}
 case 501:
-#line 2258 "parse.y"
+#line 2252 "parse.y"
 { 
 		  current_aggr = yyvsp[-2].ttype; 
 		  yyval.ftype.t = yyvsp[0].ttype;
@@ -6540,18 +6534,18 @@ case 501:
 		;
     break;}
 case 502:
-#line 2269 "parse.y"
+#line 2263 "parse.y"
 { 
 		  yyval.ftype.t = xref_tag (current_aggr, yyvsp[0].ttype, 1); 
 		  yyval.ftype.new_type_flag = 0;
 		;
     break;}
 case 503:
-#line 2274 "parse.y"
+#line 2268 "parse.y"
 { yyval.ttype = xref_tag (current_aggr, yyvsp[0].ttype, 0); ;
     break;}
 case 504:
-#line 2278 "parse.y"
+#line 2272 "parse.y"
 { 
 		  yyval.ftype.t = yyvsp[-1].ttype;
 		  yyval.ftype.new_type_flag = 0;
@@ -6560,7 +6554,7 @@ case 504:
 		;
     break;}
 case 505:
-#line 2286 "parse.y"
+#line 2280 "parse.y"
 { 
 		  if (yyvsp[-1].ftype.t != error_mark_node)
 		    {
@@ -6587,53 +6581,53 @@ case 505:
 		;
     break;}
 case 506:
-#line 2314 "parse.y"
+#line 2308 "parse.y"
 { yyval.ttype = xref_tag (yyval.ttype, make_anon_name (), 0);
 		  yyungetc ('{', 1); ;
     break;}
 case 507:
-#line 2324 "parse.y"
+#line 2318 "parse.y"
 {
 		  yyval.ftype.t = yyvsp[0].ttype;
 		  yyval.ftype.new_type_flag = 0;
 		;
     break;}
 case 509:
-#line 2333 "parse.y"
+#line 2327 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 510:
-#line 2335 "parse.y"
+#line 2329 "parse.y"
 { yyungetc(':', 1); yyval.ttype = NULL_TREE; ;
     break;}
 case 511:
-#line 2337 "parse.y"
+#line 2331 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 513:
-#line 2343 "parse.y"
+#line 2337 "parse.y"
 { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 514:
-#line 2348 "parse.y"
+#line 2342 "parse.y"
 { yyval.ttype = finish_base_specifier (access_default_node, yyvsp[0].ttype); ;
     break;}
 case 515:
-#line 2350 "parse.y"
+#line 2344 "parse.y"
 { yyval.ttype = finish_base_specifier (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 516:
-#line 2355 "parse.y"
+#line 2349 "parse.y"
 { if (yyval.ttype != error_mark_node) yyval.ttype = TYPE_MAIN_DECL (yyvsp[0].ttype); ;
     break;}
 case 519:
-#line 2362 "parse.y"
+#line 2356 "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 2366 "parse.y"
+#line 2360 "parse.y"
 {
 		  if (yyvsp[-2].ttype != access_default_virtual_node)
 		    error ("multiple access specifiers");
@@ -6646,7 +6640,7 @@ case 520:
 		;
     break;}
 case 521:
-#line 2377 "parse.y"
+#line 2371 "parse.y"
 { if (yyvsp[-1].ttype != ridpointers[(int)RID_VIRTUAL])
 		    cp_error ("`%D' access", yyvsp[-1].ttype);
 		  else if (yyval.ttype == access_public_node)
@@ -6660,55 +6654,55 @@ case 521:
 		;
     break;}
 case 526:
-#line 2398 "parse.y"
+#line 2392 "parse.y"
 {
 		  current_access_specifier = yyvsp[-1].ttype;
                 ;
     break;}
 case 527:
-#line 2407 "parse.y"
+#line 2401 "parse.y"
 { 
 		  finish_member_declaration (yyvsp[0].ttype);
 		;
     break;}
 case 528:
-#line 2411 "parse.y"
+#line 2405 "parse.y"
 { 
 		  finish_member_declaration (yyvsp[0].ttype);
 		;
     break;}
 case 530:
-#line 2419 "parse.y"
+#line 2413 "parse.y"
 { error ("missing ';' before right brace");
 		  yyungetc ('}', 0); ;
     break;}
 case 531:
-#line 2424 "parse.y"
+#line 2418 "parse.y"
 { yyval.ttype = finish_method (yyval.ttype); ;
     break;}
 case 532:
-#line 2426 "parse.y"
+#line 2420 "parse.y"
 { yyval.ttype = finish_method (yyval.ttype); ;
     break;}
 case 533:
-#line 2428 "parse.y"
+#line 2422 "parse.y"
 { yyval.ttype = finish_method (yyval.ttype); ;
     break;}
 case 534:
-#line 2430 "parse.y"
+#line 2424 "parse.y"
 { yyval.ttype = finish_method (yyval.ttype); ;
     break;}
 case 535:
-#line 2432 "parse.y"
+#line 2426 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 536:
-#line 2434 "parse.y"
+#line 2428 "parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  pedantic = yyvsp[-1].itype; ;
     break;}
 case 537:
-#line 2437 "parse.y"
+#line 2431 "parse.y"
 {  
 		  if (yyvsp[0].ttype)
 		    yyval.ttype = finish_member_template_decl (yyvsp[0].ttype);
@@ -6720,14 +6714,14 @@ case 537:
 		;
     break;}
 case 538:
-#line 2447 "parse.y"
+#line 2441 "parse.y"
 { 
 		  yyval.ttype = finish_member_class_template (yyvsp[-1].ftype.t); 
 		  finish_template_decl (yyvsp[-2].ttype);
 		;
     break;}
 case 539:
-#line 2458 "parse.y"
+#line 2452 "parse.y"
 {
 		  /* Most of the productions for component_decl only
 		     allow the creation of one new member, so we call
@@ -6750,7 +6744,7 @@ case 539:
 		;
     break;}
 case 540:
-#line 2479 "parse.y"
+#line 2473 "parse.y"
 { 
 		  if (!yyvsp[0].itype)
 		    grok_x_components (yyvsp[-1].ttype);
@@ -6758,45 +6752,45 @@ case 540:
 		;
     break;}
 case 541:
-#line 2485 "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 542:
-#line 2488 "parse.y"
+#line 2482 "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 2491 "parse.y"
+#line 2485 "parse.y"
 { yyval.ttype = grokbitfield (NULL_TREE, NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 544:
-#line 2493 "parse.y"
+#line 2487 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 545:
-#line 2504 "parse.y"
+#line 2498 "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 2509 "parse.y"
+#line 2503 "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 2512 "parse.y"
+#line 2506 "parse.y"
 { yyval.ttype = do_class_using_decl (yyvsp[0].ttype); ;
     break;}
 case 548:
-#line 2518 "parse.y"
+#line 2512 "parse.y"
 { yyval.itype = 0; ;
     break;}
 case 549:
-#line 2520 "parse.y"
+#line 2514 "parse.y"
 { 
 		  if (PROCESSING_REAL_TEMPLATE_DECL_P ())
 		    yyvsp[0].ttype = finish_member_template_decl (yyvsp[0].ttype);
@@ -6805,7 +6799,7 @@ case 549:
 		;
     break;}
 case 550:
-#line 2527 "parse.y"
+#line 2521 "parse.y"
 { 
 		  check_multiple_declarators ();
 		  if (PROCESSING_REAL_TEMPLATE_DECL_P ())
@@ -6815,11 +6809,11 @@ case 550:
 		;
     break;}
 case 551:
-#line 2538 "parse.y"
+#line 2532 "parse.y"
 { yyval.itype = 0; ;
     break;}
 case 552:
-#line 2540 "parse.y"
+#line 2534 "parse.y"
 { 
 		  if (PROCESSING_REAL_TEMPLATE_DECL_P ())
 		    yyvsp[0].ttype = finish_member_template_decl (yyvsp[0].ttype);
@@ -6828,7 +6822,7 @@ case 552:
 		;
     break;}
 case 553:
-#line 2547 "parse.y"
+#line 2541 "parse.y"
 { 
 		  check_multiple_declarators ();
 		  if (PROCESSING_REAL_TEMPLATE_DECL_P ())
@@ -6838,7 +6832,7 @@ case 553:
 		;
     break;}
 case 558:
-#line 2568 "parse.y"
+#line 2562 "parse.y"
 { split_specs_attrs (yyvsp[-4].ttype, &current_declspecs,
 				     &prefix_attributes);
 		  yyvsp[-4].ttype = current_declspecs;
@@ -6846,7 +6840,7 @@ case 558:
 				  build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ;
     break;}
 case 559:
-#line 2574 "parse.y"
+#line 2568 "parse.y"
 { split_specs_attrs (yyvsp[-4].ttype, &current_declspecs,
 				     &prefix_attributes);
 		  yyvsp[-4].ttype = current_declspecs;
@@ -6854,7 +6848,7 @@ case 559:
 		  cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ;
     break;}
 case 560:
-#line 2583 "parse.y"
+#line 2577 "parse.y"
 { split_specs_attrs (yyvsp[-4].ttype, &current_declspecs,
 				     &prefix_attributes);
 		  yyvsp[-4].ttype = current_declspecs;
@@ -6862,7 +6856,7 @@ case 560:
 				  build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ;
     break;}
 case 561:
-#line 2589 "parse.y"
+#line 2583 "parse.y"
 { split_specs_attrs (yyvsp[-4].ttype, &current_declspecs,
 				     &prefix_attributes);
 		  yyvsp[-4].ttype = current_declspecs;
@@ -6870,7 +6864,7 @@ case 561:
 				  build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ;
     break;}
 case 562:
-#line 2595 "parse.y"
+#line 2589 "parse.y"
 { split_specs_attrs (yyvsp[-4].ttype, &current_declspecs,
 				     &prefix_attributes);
 		  yyvsp[-4].ttype = current_declspecs;
@@ -6878,7 +6872,7 @@ case 562:
 		  cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ;
     break;}
 case 563:
-#line 2601 "parse.y"
+#line 2595 "parse.y"
 { split_specs_attrs (yyvsp[-3].ttype, &current_declspecs,
 				     &prefix_attributes);
 		  yyvsp[-3].ttype = current_declspecs;
@@ -6886,58 +6880,58 @@ case 563:
 		  cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ;
     break;}
 case 564:
-#line 2610 "parse.y"
+#line 2604 "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 2613 "parse.y"
+#line 2607 "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 2619 "parse.y"
+#line 2613 "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 2622 "parse.y"
+#line 2616 "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 2625 "parse.y"
+#line 2619 "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 2632 "parse.y"
+#line 2626 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 572:
-#line 2642 "parse.y"
+#line 2636 "parse.y"
 { TREE_CHAIN (yyvsp[0].ttype) = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 573:
-#line 2647 "parse.y"
+#line 2641 "parse.y"
 { yyval.ttype = build_enumerator (yyval.ttype, NULL_TREE, current_enum_type); ;
     break;}
 case 574:
-#line 2649 "parse.y"
+#line 2643 "parse.y"
 { yyval.ttype = build_enumerator (yyval.ttype, yyvsp[0].ttype, current_enum_type); ;
     break;}
 case 575:
-#line 2655 "parse.y"
+#line 2649 "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 2658 "parse.y"
+#line 2652 "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 2665 "parse.y"
+#line 2659 "parse.y"
 {
 		  if (pedantic)
 		    pedwarn ("ANSI C++ forbids array dimensions with parenthesized type in new");
@@ -6947,49 +6941,49 @@ case 577:
 		;
     break;}
 case 578:
-#line 2676 "parse.y"
+#line 2670 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 579:
-#line 2678 "parse.y"
+#line 2672 "parse.y"
 { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ;
     break;}
 case 580:
-#line 2683 "parse.y"
+#line 2677 "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 2686 "parse.y"
+#line 2680 "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 2695 "parse.y"
+#line 2689 "parse.y"
 { yyval.itype = suspend_momentary (); ;
     break;}
 case 583:
-#line 2700 "parse.y"
+#line 2694 "parse.y"
 { resume_momentary ((int) yyvsp[-1].itype); yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 584:
-#line 2706 "parse.y"
+#line 2700 "parse.y"
 { resume_momentary ((int) yyvsp[-3].itype); yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 585:
-#line 2708 "parse.y"
+#line 2702 "parse.y"
 { resume_momentary ((int) yyvsp[-3].itype); yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 586:
-#line 2710 "parse.y"
+#line 2704 "parse.y"
 { resume_momentary ((int) yyvsp[-1].itype); yyval.ttype = empty_parms (); ;
     break;}
 case 587:
-#line 2712 "parse.y"
+#line 2706 "parse.y"
 { resume_momentary ((int) yyvsp[-3].itype); yyval.ttype = NULL_TREE; ;
     break;}
 case 589:
-#line 2720 "parse.y"
+#line 2714 "parse.y"
 {
 		  /* Provide support for '(' attributes '*' declarator ')'
 		     etc */
@@ -6997,51 +6991,51 @@ case 589:
 		;
     break;}
 case 590:
-#line 2730 "parse.y"
+#line 2724 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 591:
-#line 2732 "parse.y"
+#line 2726 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 592:
-#line 2734 "parse.y"
+#line 2728 "parse.y"
 { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 593:
-#line 2736 "parse.y"
+#line 2730 "parse.y"
 { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 594:
-#line 2738 "parse.y"
+#line 2732 "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 2746 "parse.y"
+#line 2740 "parse.y"
 { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 597:
-#line 2748 "parse.y"
+#line 2742 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ;
     break;}
 case 598:
-#line 2750 "parse.y"
+#line 2744 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ;
     break;}
 case 599:
-#line 2752 "parse.y"
+#line 2746 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 600:
-#line 2754 "parse.y"
+#line 2748 "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 2762 "parse.y"
+#line 2756 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
 		    {
@@ -7053,7 +7047,7 @@ case 602:
 		;
     break;}
 case 603:
-#line 2772 "parse.y"
+#line 2766 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
 		    yyval.ttype = IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype);
@@ -7063,15 +7057,15 @@ case 603:
 		;
     break;}
 case 606:
-#line 2785 "parse.y"
+#line 2779 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 607:
-#line 2790 "parse.y"
+#line 2784 "parse.y"
 { yyval.ttype = get_type_decl (yyvsp[0].ttype); ;
     break;}
 case 609:
-#line 2799 "parse.y"
+#line 2793 "parse.y"
 {
 		  /* Provide support for '(' attributes '*' declarator ')'
 		     etc */
@@ -7079,122 +7073,122 @@ case 609:
 		;
     break;}
 case 610:
-#line 2808 "parse.y"
+#line 2802 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 611:
-#line 2810 "parse.y"
+#line 2804 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 612:
-#line 2812 "parse.y"
+#line 2806 "parse.y"
 { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 613:
-#line 2814 "parse.y"
+#line 2808 "parse.y"
 { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 614:
-#line 2816 "parse.y"
+#line 2810 "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 2824 "parse.y"
+#line 2818 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 617:
-#line 2826 "parse.y"
+#line 2820 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 618:
-#line 2828 "parse.y"
+#line 2822 "parse.y"
 { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 619:
-#line 2830 "parse.y"
+#line 2824 "parse.y"
 { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 620:
-#line 2832 "parse.y"
+#line 2826 "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 2840 "parse.y"
+#line 2834 "parse.y"
 { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 623:
-#line 2842 "parse.y"
+#line 2836 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 624:
-#line 2844 "parse.y"
+#line 2838 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ;
     break;}
 case 625:
-#line 2846 "parse.y"
+#line 2840 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ;
     break;}
 case 626:
-#line 2848 "parse.y"
+#line 2842 "parse.y"
 { enter_scope_of (yyvsp[0].ttype); ;
     break;}
 case 627:
-#line 2850 "parse.y"
+#line 2844 "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 2858 "parse.y"
+#line 2852 "parse.y"
 { got_scope = NULL_TREE;
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 629:
-#line 2861 "parse.y"
+#line 2855 "parse.y"
 { got_scope = NULL_TREE;
  		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 630:
-#line 2867 "parse.y"
+#line 2861 "parse.y"
 { got_scope = NULL_TREE;
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 631:
-#line 2870 "parse.y"
+#line 2864 "parse.y"
 { got_scope = NULL_TREE;
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 633:
-#line 2877 "parse.y"
+#line 2871 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 634:
-#line 2882 "parse.y"
+#line 2876 "parse.y"
 { yyval.ttype = build_functional_cast (yyvsp[-3].ftype.t, yyvsp[-1].ttype); ;
     break;}
 case 635:
-#line 2884 "parse.y"
+#line 2878 "parse.y"
 { yyval.ttype = reparse_decl_as_expr (yyvsp[-3].ftype.t, yyvsp[-1].ttype); ;
     break;}
 case 636:
-#line 2886 "parse.y"
+#line 2880 "parse.y"
 { yyval.ttype = reparse_absdcl_as_expr (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 641:
-#line 2897 "parse.y"
+#line 2891 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 642:
-#line 2899 "parse.y"
+#line 2893 "parse.y"
 { got_scope = yyval.ttype = make_typename_type (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 643:
-#line 2906 "parse.y"
+#line 2900 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE)
 		    {
@@ -7206,7 +7200,7 @@ case 643:
 		;
     break;}
 case 644:
-#line 2916 "parse.y"
+#line 2910 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE)
 		    yyval.ttype = lastiddecl;
@@ -7214,7 +7208,7 @@ case 644:
 		;
     break;}
 case 645:
-#line 2922 "parse.y"
+#line 2916 "parse.y"
 {
 		  if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE)
 		    yyval.ttype = lastiddecl;
@@ -7222,15 +7216,15 @@ case 645:
 		;
     break;}
 case 646:
-#line 2928 "parse.y"
+#line 2922 "parse.y"
 { got_scope = yyval.ttype = complete_type (TREE_TYPE (yyvsp[-1].ttype)); ;
     break;}
 case 648:
-#line 2944 "parse.y"
+#line 2938 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 649:
-#line 2949 "parse.y"
+#line 2943 "parse.y"
 {
 		  if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-1].ttype)) == 't')
 		    yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype);
@@ -7245,26 +7239,26 @@ case 649:
 		;
     break;}
 case 650:
-#line 2962 "parse.y"
+#line 2956 "parse.y"
 { yyval.ttype = TREE_TYPE (yyvsp[0].ttype); ;
     break;}
 case 651:
-#line 2964 "parse.y"
+#line 2958 "parse.y"
 { yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 652:
-#line 2966 "parse.y"
+#line 2960 "parse.y"
 { yyval.ttype = make_typename_type (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 653:
-#line 2971 "parse.y"
+#line 2965 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
 		    cp_error ("`%T' is not a class or namespace", yyvsp[0].ttype);
 		;
     break;}
 case 654:
-#line 2976 "parse.y"
+#line 2970 "parse.y"
 {
 		  if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-1].ttype)) == 't')
 		    yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype);
@@ -7279,15 +7273,15 @@ case 654:
 		;
     break;}
 case 655:
-#line 2989 "parse.y"
+#line 2983 "parse.y"
 { got_scope = yyval.ttype = make_typename_type (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 656:
-#line 2991 "parse.y"
+#line 2985 "parse.y"
 { got_scope = yyval.ttype = make_typename_type (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 657:
-#line 2996 "parse.y"
+#line 2990 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[-1].ttype) != IDENTIFIER_NODE)
 		    yyvsp[-1].ttype = lastiddecl;
@@ -7301,7 +7295,7 @@ case 657:
 		;
     break;}
 case 658:
-#line 3008 "parse.y"
+#line 3002 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[-1].ttype) != IDENTIFIER_NODE)
 		    yyval.ttype = lastiddecl;
@@ -7309,11 +7303,11 @@ case 658:
 		;
     break;}
 case 659:
-#line 3014 "parse.y"
+#line 3008 "parse.y"
 { got_scope = yyval.ttype = complete_type (TREE_TYPE (yyval.ttype)); ;
     break;}
 case 662:
-#line 3018 "parse.y"
+#line 3012 "parse.y"
 {
 		  if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE)
 		    yyval.ttype = lastiddecl;
@@ -7321,11 +7315,11 @@ case 662:
 		;
     break;}
 case 663:
-#line 3027 "parse.y"
+#line 3021 "parse.y"
 { yyval.ttype = build_min_nt (TEMPLATE_ID_EXPR, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 664:
-#line 3032 "parse.y"
+#line 3026 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
 		    yyval.ttype = IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype);
@@ -7335,59 +7329,59 @@ case 664:
 		;
     break;}
 case 666:
-#line 3041 "parse.y"
+#line 3035 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 667:
-#line 3046 "parse.y"
+#line 3040 "parse.y"
 { got_scope = NULL_TREE; ;
     break;}
 case 668:
-#line 3048 "parse.y"
+#line 3042 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; got_scope = NULL_TREE; ;
     break;}
 case 669:
-#line 3055 "parse.y"
+#line 3049 "parse.y"
 { got_scope = void_type_node; ;
     break;}
 case 670:
-#line 3061 "parse.y"
+#line 3055 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 671:
-#line 3063 "parse.y"
+#line 3057 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 672:
-#line 3065 "parse.y"
+#line 3059 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 673:
-#line 3067 "parse.y"
+#line 3061 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 674:
-#line 3069 "parse.y"
+#line 3063 "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 3073 "parse.y"
+#line 3067 "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 3082 "parse.y"
+#line 3076 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 678:
-#line 3084 "parse.y"
+#line 3078 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ;
     break;}
 case 680:
-#line 3090 "parse.y"
+#line 3084 "parse.y"
 {
 		  /* Provide support for '(' attributes '*' declarator ')'
 		     etc */
@@ -7395,96 +7389,96 @@ case 680:
 		;
     break;}
 case 681:
-#line 3100 "parse.y"
+#line 3094 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 682:
-#line 3102 "parse.y"
+#line 3096 "parse.y"
 { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 683:
-#line 3104 "parse.y"
+#line 3098 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[0].ftype.t, NULL_TREE); ;
     break;}
 case 684:
-#line 3106 "parse.y"
+#line 3100 "parse.y"
 { yyval.ttype = make_pointer_declarator (NULL_TREE, NULL_TREE); ;
     break;}
 case 685:
-#line 3108 "parse.y"
+#line 3102 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 686:
-#line 3110 "parse.y"
+#line 3104 "parse.y"
 { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 687:
-#line 3112 "parse.y"
+#line 3106 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[0].ftype.t, NULL_TREE); ;
     break;}
 case 688:
-#line 3114 "parse.y"
+#line 3108 "parse.y"
 { yyval.ttype = make_reference_declarator (NULL_TREE, NULL_TREE); ;
     break;}
 case 689:
-#line 3116 "parse.y"
+#line 3110 "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 3120 "parse.y"
+#line 3114 "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 3129 "parse.y"
+#line 3123 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 693:
-#line 3132 "parse.y"
+#line 3126 "parse.y"
 { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 694:
-#line 3134 "parse.y"
+#line 3128 "parse.y"
 { yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 695:
-#line 3136 "parse.y"
+#line 3130 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ;
     break;}
 case 696:
-#line 3138 "parse.y"
+#line 3132 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ;
     break;}
 case 697:
-#line 3140 "parse.y"
+#line 3134 "parse.y"
 { yyval.ttype = make_call_declarator (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 698:
-#line 3142 "parse.y"
+#line 3136 "parse.y"
 { set_quals_and_spec (yyval.ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 699:
-#line 3144 "parse.y"
+#line 3138 "parse.y"
 { set_quals_and_spec (yyval.ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 700:
-#line 3146 "parse.y"
+#line 3140 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 701:
-#line 3148 "parse.y"
+#line 3142 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, NULL_TREE); ;
     break;}
 case 708:
-#line 3171 "parse.y"
+#line 3165 "parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C++ forbids label declarations"); ;
     break;}
 case 711:
-#line 3182 "parse.y"
+#line 3176 "parse.y"
 { 
 		  while (yyvsp[-1].ttype)
 		    {
@@ -7494,181 +7488,181 @@ case 711:
 		;
     break;}
 case 712:
-#line 3195 "parse.y"
+#line 3189 "parse.y"
 {;
     break;}
 case 714:
-#line 3201 "parse.y"
+#line 3195 "parse.y"
 { yyval.ttype = begin_compound_stmt (0); ;
     break;}
 case 715:
-#line 3203 "parse.y"
+#line 3197 "parse.y"
 { yyval.ttype = finish_compound_stmt (0, yyvsp[-1].ttype); ;
     break;}
 case 716:
-#line 3208 "parse.y"
+#line 3202 "parse.y"
 {
 		  yyval.ttype = begin_if_stmt ();
 		  cond_stmt_keyword = "if";
 		;
     break;}
 case 717:
-#line 3213 "parse.y"
+#line 3207 "parse.y"
 { finish_if_stmt_cond (yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 718:
-#line 3215 "parse.y"
+#line 3209 "parse.y"
 { yyval.ttype = finish_then_clause (yyvsp[-3].ttype); ;
     break;}
 case 720:
-#line 3220 "parse.y"
+#line 3214 "parse.y"
 { yyval.ttype = begin_compound_stmt (0); ;
     break;}
 case 721:
-#line 3222 "parse.y"
+#line 3216 "parse.y"
 { yyval.ttype = finish_compound_stmt (0, yyvsp[-1].ttype); ;
     break;}
 case 722:
-#line 3227 "parse.y"
+#line 3221 "parse.y"
 {;
     break;}
 case 724:
-#line 3233 "parse.y"
+#line 3227 "parse.y"
 { finish_stmt (); ;
     break;}
 case 725:
-#line 3235 "parse.y"
+#line 3229 "parse.y"
 { finish_expr_stmt (yyvsp[-1].ttype); ;
     break;}
 case 726:
-#line 3237 "parse.y"
+#line 3231 "parse.y"
 { begin_else_clause (); ;
     break;}
 case 727:
-#line 3239 "parse.y"
+#line 3233 "parse.y"
 { 
 		  finish_else_clause (yyvsp[-3].ttype); 
 		  finish_if_stmt ();
 		;
     break;}
 case 728:
-#line 3244 "parse.y"
+#line 3238 "parse.y"
 { finish_if_stmt (); ;
     break;}
 case 729:
-#line 3246 "parse.y"
+#line 3240 "parse.y"
 {
 		  yyval.ttype = begin_while_stmt ();
 		  cond_stmt_keyword = "while";
 		;
     break;}
 case 730:
-#line 3251 "parse.y"
+#line 3245 "parse.y"
 { finish_while_stmt_cond (yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 731:
-#line 3253 "parse.y"
+#line 3247 "parse.y"
 { finish_while_stmt (yyvsp[-3].ttype); ;
     break;}
 case 732:
-#line 3255 "parse.y"
+#line 3249 "parse.y"
 { yyval.ttype = begin_do_stmt (); ;
     break;}
 case 733:
-#line 3257 "parse.y"
+#line 3251 "parse.y"
 {
 		  finish_do_body (yyvsp[-2].ttype);
 		  cond_stmt_keyword = "do";
 		;
     break;}
 case 734:
-#line 3262 "parse.y"
+#line 3256 "parse.y"
 { finish_do_stmt (yyvsp[-1].ttype, yyvsp[-5].ttype); ;
     break;}
 case 735:
-#line 3264 "parse.y"
+#line 3258 "parse.y"
 { yyval.ttype = begin_for_stmt (); ;
     break;}
 case 736:
-#line 3266 "parse.y"
+#line 3260 "parse.y"
 { finish_for_init_stmt (yyvsp[-2].ttype); ;
     break;}
 case 737:
-#line 3268 "parse.y"
+#line 3262 "parse.y"
 { finish_for_cond (yyvsp[-1].ttype, yyvsp[-5].ttype); ;
     break;}
 case 738:
-#line 3270 "parse.y"
+#line 3264 "parse.y"
 { finish_for_expr (yyvsp[-1].ttype, yyvsp[-8].ttype); ;
     break;}
 case 739:
-#line 3272 "parse.y"
+#line 3266 "parse.y"
 { finish_for_stmt (yyvsp[-3].ttype, yyvsp[-10].ttype); ;
     break;}
 case 740:
-#line 3274 "parse.y"
+#line 3268 "parse.y"
 { yyval.ttype = begin_switch_stmt (); ;
     break;}
 case 741:
-#line 3276 "parse.y"
+#line 3270 "parse.y"
 { finish_switch_cond (yyvsp[-1].ttype, yyvsp[-3].ttype); ;
     break;}
 case 742:
-#line 3278 "parse.y"
+#line 3272 "parse.y"
 { finish_switch_stmt (yyvsp[-3].ttype, yyvsp[-5].ttype); ;
     break;}
 case 743:
-#line 3280 "parse.y"
+#line 3274 "parse.y"
 { finish_case_label (yyvsp[-1].ttype, NULL_TREE); ;
     break;}
 case 745:
-#line 3283 "parse.y"
+#line 3277 "parse.y"
 { finish_case_label (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 747:
-#line 3286 "parse.y"
+#line 3280 "parse.y"
 { finish_case_label (NULL_TREE, NULL_TREE); ;
     break;}
 case 749:
-#line 3289 "parse.y"
+#line 3283 "parse.y"
 { finish_break_stmt (); ;
     break;}
 case 750:
-#line 3291 "parse.y"
+#line 3285 "parse.y"
 { finish_continue_stmt (); ;
     break;}
 case 751:
-#line 3293 "parse.y"
+#line 3287 "parse.y"
 { finish_return_stmt (NULL_TREE); ;
     break;}
 case 752:
-#line 3295 "parse.y"
+#line 3289 "parse.y"
 { finish_return_stmt (yyvsp[-1].ttype); ;
     break;}
 case 753:
-#line 3297 "parse.y"
+#line 3291 "parse.y"
 { 
 		  finish_asm_stmt (yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE, NULL_TREE,
 				   NULL_TREE); 
 		;
     break;}
 case 754:
-#line 3303 "parse.y"
+#line 3297 "parse.y"
 { 
 		  finish_asm_stmt (yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE,
 				   NULL_TREE); 
 		;
     break;}
 case 755:
-#line 3309 "parse.y"
+#line 3303 "parse.y"
 { finish_asm_stmt (yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 756:
-#line 3313 "parse.y"
+#line 3307 "parse.y"
 { finish_asm_stmt (yyvsp[-10].ttype, yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype); ;
     break;}
 case 757:
-#line 3315 "parse.y"
+#line 3309 "parse.y"
 { 
 		  if (pedantic)
 		    pedwarn ("ANSI C++ forbids computed gotos");
@@ -7676,72 +7670,72 @@ case 757:
 		;
     break;}
 case 758:
-#line 3321 "parse.y"
+#line 3315 "parse.y"
 { finish_goto_stmt (yyvsp[-1].ttype); ;
     break;}
 case 759:
-#line 3323 "parse.y"
+#line 3317 "parse.y"
 { finish_stmt (); ;
     break;}
 case 760:
-#line 3325 "parse.y"
+#line 3319 "parse.y"
 { error ("label must be followed by statement");
 		  yyungetc ('}', 0);
 		  finish_stmt (); ;
     break;}
 case 761:
-#line 3329 "parse.y"
+#line 3323 "parse.y"
 { finish_stmt (); ;
     break;}
 case 764:
-#line 3333 "parse.y"
+#line 3327 "parse.y"
 { do_local_using_decl (yyvsp[0].ttype); ;
     break;}
 case 766:
-#line 3339 "parse.y"
+#line 3333 "parse.y"
 { yyval.ttype = begin_function_try_block (); ;
     break;}
 case 767:
-#line 3341 "parse.y"
+#line 3335 "parse.y"
 { finish_function_try_block (yyvsp[-2].ttype); ;
     break;}
 case 768:
-#line 3343 "parse.y"
+#line 3337 "parse.y"
 {
 		  finish_function_handler_sequence (yyvsp[-4].ttype);
 		  yyval.itype = yyvsp[-3].itype;
 		;
     break;}
 case 769:
-#line 3351 "parse.y"
+#line 3345 "parse.y"
 { yyval.ttype = begin_try_block (); ;
     break;}
 case 770:
-#line 3353 "parse.y"
+#line 3347 "parse.y"
 { finish_try_block (yyvsp[-1].ttype); ;
     break;}
 case 771:
-#line 3355 "parse.y"
+#line 3349 "parse.y"
 { finish_handler_sequence (yyvsp[-3].ttype); ;
     break;}
 case 774:
-#line 3365 "parse.y"
+#line 3359 "parse.y"
 { yyval.ttype = begin_handler(); ;
     break;}
 case 775:
-#line 3367 "parse.y"
+#line 3361 "parse.y"
 { yyval.ttype = finish_handler_parms (yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 776:
-#line 3369 "parse.y"
+#line 3363 "parse.y"
 { finish_handler (yyvsp[-1].ttype, yyvsp[-3].ttype); ;
     break;}
 case 779:
-#line 3379 "parse.y"
+#line 3373 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 780:
-#line 3395 "parse.y"
+#line 3389 "parse.y"
 { 
 		  check_for_new_type ("inside exception declarations", yyvsp[-1].ftype);
 		  yyval.ttype = start_handler_parms (TREE_PURPOSE (yyvsp[-1].ftype.t),
@@ -7749,102 +7743,102 @@ case 780:
 		;
     break;}
 case 781:
-#line 3404 "parse.y"
+#line 3398 "parse.y"
 { finish_label_stmt (yyvsp[-1].ttype); ;
     break;}
 case 782:
-#line 3406 "parse.y"
+#line 3400 "parse.y"
 { finish_label_stmt (yyvsp[-1].ttype); ;
     break;}
 case 783:
-#line 3408 "parse.y"
+#line 3402 "parse.y"
 { finish_label_stmt (yyvsp[-1].ttype); ;
     break;}
 case 784:
-#line 3410 "parse.y"
+#line 3404 "parse.y"
 { finish_label_stmt (yyvsp[-1].ttype); ;
     break;}
 case 785:
-#line 3415 "parse.y"
+#line 3409 "parse.y"
 { finish_expr_stmt (yyvsp[-1].ttype); ;
     break;}
 case 787:
-#line 3418 "parse.y"
+#line 3412 "parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C++ forbids compound statements inside for initializations");
 		;
     break;}
 case 788:
-#line 3427 "parse.y"
+#line 3421 "parse.y"
 { emit_line_note (input_filename, lineno);
 		  yyval.ttype = NULL_TREE; ;
     break;}
 case 789:
-#line 3430 "parse.y"
+#line 3424 "parse.y"
 { emit_line_note (input_filename, lineno); ;
     break;}
 case 790:
-#line 3435 "parse.y"
+#line 3429 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 792:
-#line 3438 "parse.y"
+#line 3432 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 793:
-#line 3445 "parse.y"
+#line 3439 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 796:
-#line 3452 "parse.y"
+#line 3446 "parse.y"
 { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 797:
-#line 3457 "parse.y"
+#line 3451 "parse.y"
 { yyval.ttype = build_tree_list (yyval.ttype, yyvsp[-1].ttype); ;
     break;}
 case 798:
-#line 3462 "parse.y"
+#line 3456 "parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, NULL_TREE); ;
     break;}
 case 799:
-#line 3464 "parse.y"
+#line 3458 "parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ;
     break;}
 case 800:
-#line 3475 "parse.y"
+#line 3469 "parse.y"
 {
 		  yyval.ttype = empty_parms();
 		;
     break;}
 case 802:
-#line 3480 "parse.y"
+#line 3474 "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 3488 "parse.y"
+#line 3482 "parse.y"
 { yyval.ttype = finish_parmlist (yyval.ttype, 0); ;
     break;}
 case 804:
-#line 3490 "parse.y"
+#line 3484 "parse.y"
 { yyval.ttype = finish_parmlist (yyvsp[-1].ttype, 1); ;
     break;}
 case 805:
-#line 3493 "parse.y"
+#line 3487 "parse.y"
 { yyval.ttype = finish_parmlist (yyvsp[-1].ttype, 1); ;
     break;}
 case 806:
-#line 3495 "parse.y"
+#line 3489 "parse.y"
 { yyval.ttype = finish_parmlist (build_tree_list (NULL_TREE,
 							 yyvsp[-1].ftype.t), 1); ;
     break;}
 case 807:
-#line 3498 "parse.y"
+#line 3492 "parse.y"
 { yyval.ttype = finish_parmlist (NULL_TREE, 1); ;
     break;}
 case 808:
-#line 3500 "parse.y"
+#line 3494 "parse.y"
 {
 		  /* This helps us recover from really nasty
 		     parse errors, for example, a missing right
@@ -7856,7 +7850,7 @@ case 808:
 		;
     break;}
 case 809:
-#line 3510 "parse.y"
+#line 3504 "parse.y"
 {
 		  /* This helps us recover from really nasty
 		     parse errors, for example, a missing right
@@ -7869,99 +7863,99 @@ case 809:
 		;
     break;}
 case 810:
-#line 3525 "parse.y"
+#line 3519 "parse.y"
 { maybe_snarf_defarg (); ;
     break;}
 case 811:
-#line 3527 "parse.y"
+#line 3521 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 814:
-#line 3538 "parse.y"
+#line 3532 "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 3541 "parse.y"
+#line 3535 "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 3544 "parse.y"
+#line 3538 "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 3547 "parse.y"
+#line 3541 "parse.y"
 { yyval.ttype = chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 818:
-#line 3549 "parse.y"
+#line 3543 "parse.y"
 { yyval.ttype = chainon (yyval.ttype, build_tree_list (yyvsp[0].ttype, yyvsp[-2].ttype)); ;
     break;}
 case 820:
-#line 3555 "parse.y"
+#line 3549 "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 3565 "parse.y"
+#line 3559 "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 3569 "parse.y"
+#line 3563 "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 3572 "parse.y"
+#line 3566 "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 3576 "parse.y"
+#line 3570 "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 3580 "parse.y"
+#line 3574 "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 3584 "parse.y"
+#line 3578 "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 3591 "parse.y"
+#line 3585 "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 3594 "parse.y"
+#line 3588 "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 3605 "parse.y"
+#line 3599 "parse.y"
 { see_typename (); ;
     break;}
 case 832:
-#line 3610 "parse.y"
+#line 3604 "parse.y"
 {
 		  error ("type specifier omitted for parameter");
 		  yyval.ttype = build_tree_list (integer_type_node, NULL_TREE);
 		;
     break;}
 case 833:
-#line 3615 "parse.y"
+#line 3609 "parse.y"
 {
 		  error ("type specifier omitted for parameter");
 		  if (TREE_CODE (yyval.ttype) == SCOPE_REF
@@ -7972,192 +7966,192 @@ case 833:
 		;
     break;}
 case 834:
-#line 3627 "parse.y"
+#line 3621 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 835:
-#line 3629 "parse.y"
+#line 3623 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 836:
-#line 3631 "parse.y"
+#line 3625 "parse.y"
 { yyval.ttype = empty_except_spec; ;
     break;}
 case 837:
-#line 3636 "parse.y"
+#line 3630 "parse.y"
 {
 		  check_for_new_type ("exception specifier", yyvsp[0].ftype);
 		  yyval.ttype = groktypename (yyvsp[0].ftype.t);
 		;
     break;}
 case 838:
-#line 3644 "parse.y"
+#line 3638 "parse.y"
 { yyval.ttype = add_exception_specifier (NULL_TREE, yyvsp[0].ttype, 1); ;
     break;}
 case 839:
-#line 3646 "parse.y"
+#line 3640 "parse.y"
 { yyval.ttype = add_exception_specifier (yyvsp[-2].ttype, yyvsp[0].ttype, 1); ;
     break;}
 case 840:
-#line 3651 "parse.y"
+#line 3645 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 841:
-#line 3653 "parse.y"
+#line 3647 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 842:
-#line 3655 "parse.y"
+#line 3649 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 843:
-#line 3657 "parse.y"
+#line 3651 "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 3664 "parse.y"
+#line 3658 "parse.y"
 { got_scope = NULL_TREE; ;
     break;}
 case 845:
-#line 3669 "parse.y"
+#line 3663 "parse.y"
 { yyval.ttype = ansi_opname[MULT_EXPR]; ;
     break;}
 case 846:
-#line 3671 "parse.y"
+#line 3665 "parse.y"
 { yyval.ttype = ansi_opname[TRUNC_DIV_EXPR]; ;
     break;}
 case 847:
-#line 3673 "parse.y"
+#line 3667 "parse.y"
 { yyval.ttype = ansi_opname[TRUNC_MOD_EXPR]; ;
     break;}
 case 848:
-#line 3675 "parse.y"
+#line 3669 "parse.y"
 { yyval.ttype = ansi_opname[PLUS_EXPR]; ;
     break;}
 case 849:
-#line 3677 "parse.y"
+#line 3671 "parse.y"
 { yyval.ttype = ansi_opname[MINUS_EXPR]; ;
     break;}
 case 850:
-#line 3679 "parse.y"
+#line 3673 "parse.y"
 { yyval.ttype = ansi_opname[BIT_AND_EXPR]; ;
     break;}
 case 851:
-#line 3681 "parse.y"
+#line 3675 "parse.y"
 { yyval.ttype = ansi_opname[BIT_IOR_EXPR]; ;
     break;}
 case 852:
-#line 3683 "parse.y"
+#line 3677 "parse.y"
 { yyval.ttype = ansi_opname[BIT_XOR_EXPR]; ;
     break;}
 case 853:
-#line 3685 "parse.y"
+#line 3679 "parse.y"
 { yyval.ttype = ansi_opname[BIT_NOT_EXPR]; ;
     break;}
 case 854:
-#line 3687 "parse.y"
+#line 3681 "parse.y"
 { yyval.ttype = ansi_opname[COMPOUND_EXPR]; ;
     break;}
 case 855:
-#line 3689 "parse.y"
+#line 3683 "parse.y"
 { yyval.ttype = ansi_opname[yyvsp[0].code]; ;
     break;}
 case 856:
-#line 3691 "parse.y"
+#line 3685 "parse.y"
 { yyval.ttype = ansi_opname[LT_EXPR]; ;
     break;}
 case 857:
-#line 3693 "parse.y"
+#line 3687 "parse.y"
 { yyval.ttype = ansi_opname[GT_EXPR]; ;
     break;}
 case 858:
-#line 3695 "parse.y"
+#line 3689 "parse.y"
 { yyval.ttype = ansi_opname[yyvsp[0].code]; ;
     break;}
 case 859:
-#line 3697 "parse.y"
+#line 3691 "parse.y"
 { yyval.ttype = ansi_assopname[yyvsp[0].code]; ;
     break;}
 case 860:
-#line 3699 "parse.y"
+#line 3693 "parse.y"
 { yyval.ttype = ansi_opname [MODIFY_EXPR]; ;
     break;}
 case 861:
-#line 3701 "parse.y"
+#line 3695 "parse.y"
 { yyval.ttype = ansi_opname[yyvsp[0].code]; ;
     break;}
 case 862:
-#line 3703 "parse.y"
+#line 3697 "parse.y"
 { yyval.ttype = ansi_opname[yyvsp[0].code]; ;
     break;}
 case 863:
-#line 3705 "parse.y"
+#line 3699 "parse.y"
 { yyval.ttype = ansi_opname[POSTINCREMENT_EXPR]; ;
     break;}
 case 864:
-#line 3707 "parse.y"
+#line 3701 "parse.y"
 { yyval.ttype = ansi_opname[PREDECREMENT_EXPR]; ;
     break;}
 case 865:
-#line 3709 "parse.y"
+#line 3703 "parse.y"
 { yyval.ttype = ansi_opname[TRUTH_ANDIF_EXPR]; ;
     break;}
 case 866:
-#line 3711 "parse.y"
+#line 3705 "parse.y"
 { yyval.ttype = ansi_opname[TRUTH_ORIF_EXPR]; ;
     break;}
 case 867:
-#line 3713 "parse.y"
+#line 3707 "parse.y"
 { yyval.ttype = ansi_opname[TRUTH_NOT_EXPR]; ;
     break;}
 case 868:
-#line 3715 "parse.y"
+#line 3709 "parse.y"
 { yyval.ttype = ansi_opname[COND_EXPR]; ;
     break;}
 case 869:
-#line 3717 "parse.y"
+#line 3711 "parse.y"
 { yyval.ttype = ansi_opname[yyvsp[0].code]; ;
     break;}
 case 870:
-#line 3719 "parse.y"
+#line 3713 "parse.y"
 { yyval.ttype = ansi_opname[COMPONENT_REF]; ;
     break;}
 case 871:
-#line 3721 "parse.y"
+#line 3715 "parse.y"
 { yyval.ttype = ansi_opname[MEMBER_REF]; ;
     break;}
 case 872:
-#line 3723 "parse.y"
+#line 3717 "parse.y"
 { yyval.ttype = ansi_opname[CALL_EXPR]; ;
     break;}
 case 873:
-#line 3725 "parse.y"
+#line 3719 "parse.y"
 { yyval.ttype = ansi_opname[ARRAY_REF]; ;
     break;}
 case 874:
-#line 3727 "parse.y"
+#line 3721 "parse.y"
 { yyval.ttype = ansi_opname[NEW_EXPR]; ;
     break;}
 case 875:
-#line 3729 "parse.y"
+#line 3723 "parse.y"
 { yyval.ttype = ansi_opname[DELETE_EXPR]; ;
     break;}
 case 876:
-#line 3731 "parse.y"
+#line 3725 "parse.y"
 { yyval.ttype = ansi_opname[VEC_NEW_EXPR]; ;
     break;}
 case 877:
-#line 3733 "parse.y"
+#line 3727 "parse.y"
 { yyval.ttype = ansi_opname[VEC_DELETE_EXPR]; ;
     break;}
 case 878:
-#line 3736 "parse.y"
+#line 3730 "parse.y"
 { yyval.ttype = grokoptypename (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 879:
-#line 3738 "parse.y"
+#line 3732 "parse.y"
 { yyval.ttype = ansi_opname[ERROR_MARK]; ;
     break;}
 }
@@ -8382,7 +8376,7 @@ yyerrhandle:
     }
   return 1;
 }
-#line 3741 "parse.y"
+#line 3735 "parse.y"
 
 
 #ifdef SPEW_DEBUG
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen5.C b/gcc/testsuite/g++.old-deja/g++.brendan/code-gen5.C
deleted file mode 100644
index 25987776e26..00000000000
--- a/gcc/testsuite/g++.old-deja/g++.brendan/code-gen5.C
+++ /dev/null
@@ -1,57 +0,0 @@
-// Special g++ Options: -Wno-deprecated -fthis-is-variable
-// GROUPS passed code-generation
-// Check that the "this" pointer is zero when a method is
-// called for an object pointed to by a null pointer.
-
-// Normally, the "__builtin_new" operation which actually
-// allocates objects in heap space is *not* called at the
-// actual point of the "new" keyword.  Rather, a check is
-// made within each constructor and if the "this" pointer
-// value passed in is zero, then the actual allocation of
-// memory (via __builtin_new) is done at that point (i.e.
-// at the very beginning of the constructor).
-
-// A special trick allows one to subvert this mechanism.
-// Specifically, if a given constructor contains a statement
-// like: "this = this", then no attempt will be made to
-// implicitly call __builtin_new within that constructor.
-
-extern "C" void printf (char *, ...); 
-
-struct base {
-	int member;
-
-	base ();
-	void member_function ();
-};
-
-base *base_pointer_1 = 0;
-base *base_pointer_2 = 0;
-
-int errors = 0;
-
-int main ()
-{
-	//base_pointer_2 = new base();
-	base_pointer_1->member_function ();
-
-	if (errors)
-	  printf ("FAIL\n");
-	else
-	  printf ("PASS\n");
-
-	return 0;
-}
-
-base::base ()
-{
-	this = this;
-	if ((int) this != 0)
-		errors++;
-}
-
-void base::member_function ()
-{
-	if ((int) this != 0)
-		errors++;
-}
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900407_02.C b/gcc/testsuite/g++.old-deja/g++.bugs/900407_02.C
deleted file mode 100644
index 5f6862f2fea..00000000000
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900407_02.C
+++ /dev/null
@@ -1,32 +0,0 @@
-// g++ 1.37.1 bug 900407_02
-
-// g++ flags errors for attempts to assign to the "this" parameter within
-// class constructors (regardless of whether or not the -traditional)
-// option is used).
-
-// Such errors should probably not be issued when the -traditional option is
-// used.
-
-// Special g++ Options: -Wno-deprecated -fthis-is-variable
-// Special CC Options:
-
-// Cfront only flags errors for such usage whin the +p (pure language)
-// option is used.
-
-// cfront 2.0 passes this test.
-
-// keywords: anachronism, this, assignment
-
-struct s0 {
-
-  int member;
-
-  s0 ();
-};
-
-s0::s0 ()
-{
-  this = this;		// OK - anachronism allowed with -traditional
-}
-
-int main () { return 0; }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/new2.C b/gcc/testsuite/g++.old-deja/g++.jason/new2.C
index ed4f68d9f31..4f293d1be97 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/new2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/new2.C
@@ -1,5 +1,5 @@
 // PRMS Id: 6267
-// Special g++ Options: -Wno-deprecated -fthis-is-variable -fno-exceptions
+// Special g++ Options: -Wno-deprecated -fno-exceptions
 
 struct A {
   int i;