tree.h (VOID_TYPE_P): New macro.

	* tree.h (VOID_TYPE_P): New macro.
	(COMPLETE_OR_VOID_TYPE_P): Use VOID_TYPE_P.
	* c-decl.c (grokdeclarator): Use VOID_TYPE_P.
	(get_parm_info): Likewise.
	(store_parm_decls): Likewise.
	(combine_parm_decls): Likewise.
	(finish_function): Likewise.
	* c-typeck.c (build_function_call): Likewise.
	(build_binary_op): Likewise.
	(build_conditional_expr): Likewise.
	(internal_build_compound_expr): Likewise.
	(convert_for_assignment): Likewise.
	* stmt.c (expend_expr_stmt): Likewise.
	(warn_if_unused_value): Likewise.
	(expand_return): Likewise.
	* c-parse.in (primary): Likewise.
	* c-parse.y, c-parse.c, c-parse.h: Regenerate.
	* objc/objc-parse.y, objc/objc-parse.c: Regenerate.

From-SVN: r34402

2 files changed, 423 insertions, 425 deletions

diff --git a/gcc/objc/objc-parse.c b/gcc/objc/objc-parse.c
index 5407d32..d8c1d25 100644
--- a/gcc/objc/objc-parse.c
+++ b/gcc/objc/objc-parse.c
@@ -471,54 +471,54 @@ static const short yyrline[] = { 0,
    491,   495,   497,   500,   504,   531,   533,   535,   537,   539,
    541,   543,   545,   547,   549,   551,   553,   555,   557,   561,
    563,   567,   569,   572,   576,   578,   585,   588,   596,   607,
-   767,   768,   770,   776,   778,   801,   810,   812,   814,   826,
-   840,   842,   844,   846,   848,   850,   852,   857,   859,   866,
-   868,   872,   874,   875,   885,   890,   892,   893,   894,   901,
-   906,   910,   913,   921,   926,   928,   929,   930,   937,   947,
-   951,   956,   960,   964,   968,   970,   972,   981,   984,   988,
-   990,   992,   997,  1001,  1004,  1008,  1011,  1013,  1025,  1028,
-  1030,  1032,  1036,  1040,  1042,  1045,  1058,  1061,  1065,  1067,
-  1075,  1076,  1077,  1081,  1083,  1088,  1090,  1092,  1098,  1099,
-  1100,  1103,  1105,  1108,  1110,  1113,  1116,  1122,  1129,  1131,
-  1138,  1145,  1148,  1155,  1158,  1162,  1165,  1169,  1174,  1177,
-  1181,  1184,  1186,  1188,  1190,  1197,  1199,  1200,  1201,  1206,
-  1208,  1210,  1212,  1217,  1221,  1224,  1226,  1231,  1233,  1234,
-  1237,  1237,  1240,  1243,  1245,  1247,  1250,  1252,  1255,  1263,
-  1277,  1285,  1289,  1303,  1311,  1318,  1320,  1325,  1328,  1333,
-  1335,  1337,  1344,  1346,  1347,  1355,  1361,  1363,  1365,  1372,
-  1374,  1380,  1386,  1388,  1390,  1392,  1399,  1401,  1404,  1407,
-  1411,  1414,  1418,  1421,  1425,  1430,  1432,  1436,  1438,  1440,
-  1442,  1446,  1448,  1450,  1453,  1455,  1458,  1462,  1464,  1467,
-  1469,  1474,  1477,  1482,  1484,  1486,  1490,  1514,  1520,  1533,
-  1538,  1543,  1545,  1550,  1552,  1556,  1560,  1564,  1574,  1576,
-  1581,  1586,  1589,  1593,  1596,  1600,  1603,  1606,  1609,  1613,
-  1616,  1620,  1624,  1626,  1628,  1630,  1632,  1634,  1636,  1638,
-  1642,  1650,  1658,  1660,  1662,  1666,  1668,  1671,  1674,  1686,
-  1688,  1693,  1695,  1698,  1712,  1715,  1718,  1720,  1722,  1726,
-  1730,  1736,  1754,  1759,  1764,  1767,  1781,  1790,  1794,  1798,
-  1802,  1808,  1812,  1817,  1820,  1825,  1828,  1829,  1845,  1850,
-  1853,  1865,  1867,  1877,  1887,  1888,  1895,  1897,  1909,  1913,
-  1927,  1933,  1939,  1940,  1945,  1950,  1954,  1958,  1969,  1976,
-  1983,  1990,  2001,  2007,  2010,  2015,  2038,  2068,  2099,  2130,
-  2145,  2159,  2163,  2167,  2170,  2175,  2177,  2180,  2182,  2186,
-  2191,  2194,  2200,  2205,  2210,  2212,  2221,  2222,  2228,  2230,
-  2240,  2242,  2246,  2249,  2255,  2264,  2272,  2280,  2289,  2302,
-  2307,  2312,  2314,  2323,  2326,  2331,  2334,  2338,  2347,  2349,
-  2350,  2351,  2352,  2353,  2367,  2370,  2374,  2380,  2386,  2393,
-  2398,  2404,  2411,  2417,  2423,  2428,  2434,  2441,  2447,  2453,
-  2459,  2467,  2473,  2479,  2487,  2494,  2500,  2509,  2516,  2524,
-  2529,  2532,  2542,  2544,  2547,  2549,  2550,  2553,  2558,  2559,
-  2576,  2582,  2587,  2591,  2594,  2595,  2598,  2606,  2612,  2621,
-  2631,  2638,  2642,  2647,  2656,  2663,  2667,  2677,  2679,  2680,
-  2682,  2684,  2685,  2686,  2687,  2689,  2691,  2694,  2702,  2709,
-  2709,  2716,  2722,  2724,  2730,  2735,  2740,  2749,  2751,  2757,
-  2759,  2762,  2764,  2765,  2766,  2769,  2774,  2776,  2780,  2783,
-  2790,  2796,  2801,  2808,  2813,  2818,  2823,  2830,  2834,  2837,
-  2843,  2845,  2846,  2847,  2850,  2852,  2853,  2854,  2855,  2856,
-  2857,  2858,  2859,  2860,  2861,  2862,  2863,  2864,  2865,  2866,
-  2867,  2868,  2869,  2870,  2870,  2873,  2879,  2884,  2889,  2895,
-  2897,  2900,  2902,  2909,  2921,  2926,  2932,  2934,  2940,  2944,
-  2945,  2951,  2953,  2956,  2958,  2964,  2969,  2975,  2982,  2991
+   766,   767,   769,   775,   777,   800,   809,   811,   813,   825,
+   839,   841,   843,   845,   847,   849,   851,   856,   858,   865,
+   867,   871,   873,   874,   884,   889,   891,   892,   893,   900,
+   905,   909,   912,   920,   925,   927,   928,   929,   936,   946,
+   950,   955,   959,   963,   967,   969,   971,   980,   983,   987,
+   989,   991,   996,  1000,  1003,  1007,  1010,  1012,  1024,  1027,
+  1029,  1031,  1035,  1039,  1041,  1044,  1057,  1060,  1064,  1066,
+  1074,  1075,  1076,  1080,  1082,  1087,  1089,  1091,  1097,  1098,
+  1099,  1102,  1104,  1107,  1109,  1112,  1115,  1121,  1128,  1130,
+  1137,  1144,  1147,  1154,  1157,  1161,  1164,  1168,  1173,  1176,
+  1180,  1183,  1185,  1187,  1189,  1196,  1198,  1199,  1200,  1205,
+  1207,  1209,  1211,  1216,  1220,  1223,  1225,  1230,  1232,  1233,
+  1236,  1236,  1239,  1242,  1244,  1246,  1249,  1251,  1254,  1262,
+  1276,  1284,  1288,  1302,  1310,  1317,  1319,  1324,  1327,  1332,
+  1334,  1336,  1343,  1345,  1346,  1354,  1360,  1362,  1364,  1371,
+  1373,  1379,  1385,  1387,  1389,  1391,  1398,  1400,  1403,  1406,
+  1410,  1413,  1417,  1420,  1424,  1429,  1431,  1435,  1437,  1439,
+  1441,  1445,  1447,  1449,  1452,  1454,  1457,  1461,  1463,  1466,
+  1468,  1473,  1476,  1481,  1483,  1485,  1489,  1513,  1519,  1532,
+  1537,  1542,  1544,  1549,  1551,  1555,  1559,  1563,  1573,  1575,
+  1580,  1585,  1588,  1592,  1595,  1599,  1602,  1605,  1608,  1612,
+  1615,  1619,  1623,  1625,  1627,  1629,  1631,  1633,  1635,  1637,
+  1641,  1649,  1657,  1659,  1661,  1665,  1667,  1670,  1673,  1685,
+  1687,  1692,  1694,  1697,  1711,  1714,  1717,  1719,  1721,  1725,
+  1729,  1735,  1753,  1758,  1763,  1766,  1780,  1789,  1793,  1797,
+  1801,  1807,  1811,  1816,  1819,  1824,  1827,  1828,  1844,  1849,
+  1852,  1864,  1866,  1876,  1886,  1887,  1894,  1896,  1908,  1912,
+  1926,  1932,  1938,  1939,  1944,  1949,  1953,  1957,  1968,  1975,
+  1982,  1989,  2000,  2006,  2009,  2014,  2037,  2067,  2098,  2129,
+  2144,  2158,  2162,  2166,  2169,  2174,  2176,  2179,  2181,  2185,
+  2190,  2193,  2199,  2204,  2209,  2211,  2220,  2221,  2227,  2229,
+  2239,  2241,  2245,  2248,  2254,  2263,  2271,  2279,  2288,  2301,
+  2306,  2311,  2313,  2322,  2325,  2330,  2333,  2337,  2346,  2348,
+  2349,  2350,  2351,  2352,  2366,  2369,  2373,  2379,  2385,  2392,
+  2397,  2403,  2410,  2416,  2422,  2427,  2433,  2440,  2446,  2452,
+  2458,  2466,  2472,  2478,  2486,  2493,  2499,  2508,  2515,  2523,
+  2528,  2531,  2541,  2543,  2546,  2548,  2549,  2552,  2557,  2558,
+  2575,  2581,  2586,  2590,  2593,  2594,  2597,  2605,  2611,  2620,
+  2630,  2637,  2641,  2646,  2655,  2662,  2666,  2676,  2678,  2679,
+  2681,  2683,  2684,  2685,  2686,  2688,  2690,  2693,  2701,  2708,
+  2708,  2715,  2721,  2723,  2729,  2734,  2739,  2748,  2750,  2756,
+  2758,  2761,  2763,  2764,  2765,  2768,  2773,  2775,  2779,  2782,
+  2789,  2795,  2800,  2807,  2812,  2817,  2822,  2829,  2833,  2836,
+  2842,  2844,  2845,  2846,  2849,  2851,  2852,  2853,  2854,  2855,
+  2856,  2857,  2858,  2859,  2860,  2861,  2862,  2863,  2864,  2865,
+  2866,  2867,  2868,  2869,  2869,  2872,  2878,  2883,  2888,  2894,
+  2896,  2899,  2901,  2908,  2920,  2925,  2931,  2933,  2939,  2943,
+  2944,  2950,  2952,  2955,  2957,  2963,  2968,  2974,  2981,  2990
 };
 #endif
 
@@ -1758,7 +1758,7 @@ static const short yycheck[] = {    56,
     50,    51,    52,    53,    54,    55,    56,    57
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/misc/bison.simple"
+#line 3 "/usr/lib/bison.simple"
 /* This file comes from bison-1.28.  */
 
 /* Skeleton output parser for bison,
@@ -1972,7 +1972,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
 #endif
 #endif
 
-#line 217 "/usr/share/misc/bison.simple"
+#line 217 "/usr/lib/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -2821,8 +2821,7 @@ case 90:
 				     IDENTIFIER_POINTER (DECL_NAME (yyval.ttype)));
 			  else if ((TYPE_MODE (TREE_TYPE (TREE_TYPE (yyval.ttype)))
 				    != TYPE_MODE (integer_type_node))
-				   && (TREE_TYPE (TREE_TYPE (yyval.ttype))
-				       != void_type_node))
+				   && !VOID_TYPE_P (TREE_TYPE (TREE_TYPE (yyval.ttype))))
 			    pedwarn ("type mismatch in implicit declaration for built-in function `%s'",
 				     IDENTIFIER_POINTER (DECL_NAME (yyval.ttype)));
 			  /* If it really returns void, change that to int.  */
@@ -2881,11 +2880,11 @@ case 90:
 		;
     break;}
 case 92:
-#line 769 "objc-parse.y"
+#line 768 "objc-parse.y"
 { yyval.ttype = combine_strings (yyvsp[0].ttype); ;
     break;}
 case 93:
-#line 771 "objc-parse.y"
+#line 770 "objc-parse.y"
 { char class = TREE_CODE_CLASS (TREE_CODE (yyvsp[-1].ttype));
 		  if (class == 'e' || class == '1'
 		      || class == '2' || class == '<')
@@ -2893,11 +2892,11 @@ case 93:
 		  yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 94:
-#line 777 "objc-parse.y"
+#line 776 "objc-parse.y"
 { yyval.ttype = error_mark_node; ;
     break;}
 case 95:
-#line 779 "objc-parse.y"
+#line 778 "objc-parse.y"
 { tree rtl_exp;
 		  if (pedantic)
 		    pedwarn ("ANSI C forbids braced-groups within expressions");
@@ -2922,7 +2921,7 @@ case 95:
 		;
     break;}
 case 96:
-#line 802 "objc-parse.y"
+#line 801 "objc-parse.y"
 {
 		  /* Make sure we call expand_end_stmt_expr.  Otherwise
 		     we are likely to lose sequences and crash later.  */
@@ -2933,15 +2932,15 @@ case 96:
 		;
     break;}
 case 97:
-#line 811 "objc-parse.y"
+#line 810 "objc-parse.y"
 { yyval.ttype = build_function_call (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 98:
-#line 813 "objc-parse.y"
+#line 812 "objc-parse.y"
 { yyval.ttype = build_array_ref (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 99:
-#line 815 "objc-parse.y"
+#line 814 "objc-parse.y"
 {
                   if (doing_objc_thang)
                     {
@@ -2955,7 +2954,7 @@ case 99:
 		;
     break;}
 case 100:
-#line 827 "objc-parse.y"
+#line 826 "objc-parse.y"
 {
                   tree expr = build_indirect_ref (yyvsp[-2].ttype, "->");
 
@@ -2971,79 +2970,79 @@ case 100:
 		;
     break;}
 case 101:
-#line 841 "objc-parse.y"
+#line 840 "objc-parse.y"
 { yyval.ttype = build_unary_op (POSTINCREMENT_EXPR, yyvsp[-1].ttype, 0); ;
     break;}
 case 102:
-#line 843 "objc-parse.y"
+#line 842 "objc-parse.y"
 { yyval.ttype = build_unary_op (POSTDECREMENT_EXPR, yyvsp[-1].ttype, 0); ;
     break;}
 case 103:
-#line 845 "objc-parse.y"
+#line 844 "objc-parse.y"
 { yyval.ttype = build_message_expr (yyvsp[0].ttype); ;
     break;}
 case 104:
-#line 847 "objc-parse.y"
+#line 846 "objc-parse.y"
 { yyval.ttype = build_selector_expr (yyvsp[0].ttype); ;
     break;}
 case 105:
-#line 849 "objc-parse.y"
+#line 848 "objc-parse.y"
 { yyval.ttype = build_protocol_expr (yyvsp[0].ttype); ;
     break;}
 case 106:
-#line 851 "objc-parse.y"
+#line 850 "objc-parse.y"
 { yyval.ttype = build_encode_expr (yyvsp[0].ttype); ;
     break;}
 case 107:
-#line 853 "objc-parse.y"
+#line 852 "objc-parse.y"
 { yyval.ttype = build_objc_string_object (yyvsp[0].ttype); ;
     break;}
 case 109:
-#line 860 "objc-parse.y"
+#line 859 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 111:
-#line 869 "objc-parse.y"
+#line 868 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 114:
-#line 877 "objc-parse.y"
+#line 876 "objc-parse.y"
 { c_mark_varargs ();
 		  if (pedantic)
 		    pedwarn ("ANSI C does not permit use of `varargs.h'"); ;
     break;}
 case 115:
-#line 887 "objc-parse.y"
+#line 886 "objc-parse.y"
 { ;
     break;}
 case 120:
-#line 903 "objc-parse.y"
+#line 902 "objc-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 121:
-#line 907 "objc-parse.y"
+#line 906 "objc-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);	
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 122:
-#line 911 "objc-parse.y"
+#line 910 "objc-parse.y"
 { shadow_tag_warned (yyvsp[-1].ttype, 1);
 		  pedwarn ("empty declaration"); ;
     break;}
 case 123:
-#line 914 "objc-parse.y"
+#line 913 "objc-parse.y"
 { pedwarn ("empty declaration"); ;
     break;}
 case 124:
-#line 923 "objc-parse.y"
+#line 922 "objc-parse.y"
 { ;
     break;}
 case 129:
-#line 938 "objc-parse.y"
+#line 937 "objc-parse.y"
 { pending_xref_error ();
 		  declspec_stack = tree_cons (prefix_attributes,
 					      current_declspecs,
@@ -3052,127 +3051,127 @@ case 129:
 				     &current_declspecs, &prefix_attributes); ;
     break;}
 case 130:
-#line 948 "objc-parse.y"
+#line 947 "objc-parse.y"
 { prefix_attributes = chainon (prefix_attributes, yyvsp[0].ttype); ;
     break;}
 case 131:
-#line 953 "objc-parse.y"
+#line 952 "objc-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 132:
-#line 957 "objc-parse.y"
+#line 956 "objc-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 133:
-#line 961 "objc-parse.y"
+#line 960 "objc-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 134:
-#line 965 "objc-parse.y"
+#line 964 "objc-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 135:
-#line 969 "objc-parse.y"
+#line 968 "objc-parse.y"
 { shadow_tag (yyvsp[-1].ttype); ;
     break;}
 case 136:
-#line 971 "objc-parse.y"
+#line 970 "objc-parse.y"
 { pedwarn ("empty declaration"); ;
     break;}
 case 137:
-#line 973 "objc-parse.y"
+#line 972 "objc-parse.y"
 { RESTORE_WARN_FLAGS (yyvsp[-1].ttype); ;
     break;}
 case 138:
-#line 983 "objc-parse.y"
+#line 982 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 139:
-#line 985 "objc-parse.y"
+#line 984 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[0].ttype, tree_cons (NULL_TREE, yyvsp[-1].ttype, yyvsp[-2].ttype)); ;
     break;}
 case 140:
-#line 989 "objc-parse.y"
+#line 988 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 141:
-#line 991 "objc-parse.y"
+#line 990 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 142:
-#line 993 "objc-parse.y"
+#line 992 "objc-parse.y"
 { if (extra_warnings)
 		    warning ("`%s' is not at beginning of declaration",
 			     IDENTIFIER_POINTER (yyvsp[0].ttype));
 		  yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 143:
-#line 998 "objc-parse.y"
+#line 997 "objc-parse.y"
 { yyval.ttype = tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 144:
-#line 1003 "objc-parse.y"
+#line 1002 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 145:
-#line 1005 "objc-parse.y"
+#line 1004 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[0].ttype, tree_cons (NULL_TREE, yyvsp[-1].ttype, yyvsp[-2].ttype)); ;
     break;}
 case 146:
-#line 1010 "objc-parse.y"
+#line 1009 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 147:
-#line 1012 "objc-parse.y"
+#line 1011 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 148:
-#line 1014 "objc-parse.y"
+#line 1013 "objc-parse.y"
 { if (extra_warnings)
 		    warning ("`%s' is not at beginning of declaration",
 			     IDENTIFIER_POINTER (yyvsp[0].ttype));
 		  yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 149:
-#line 1027 "objc-parse.y"
+#line 1026 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 150:
-#line 1029 "objc-parse.y"
+#line 1028 "objc-parse.y"
 { yyval.ttype = tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); ;
     break;}
 case 151:
-#line 1031 "objc-parse.y"
+#line 1030 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 152:
-#line 1033 "objc-parse.y"
+#line 1032 "objc-parse.y"
 { yyval.ttype = tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 153:
-#line 1038 "objc-parse.y"
+#line 1037 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, NULL_TREE);
 		  TREE_STATIC (yyval.ttype) = 1; ;
     break;}
 case 154:
-#line 1041 "objc-parse.y"
+#line 1040 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 155:
-#line 1043 "objc-parse.y"
+#line 1042 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype);
 		  TREE_STATIC (yyval.ttype) = 1; ;
     break;}
 case 156:
-#line 1046 "objc-parse.y"
+#line 1045 "objc-parse.y"
 { if (extra_warnings && TREE_STATIC (yyvsp[-1].ttype))
 		    warning ("`%s' is not at beginning of declaration",
 			     IDENTIFIER_POINTER (yyvsp[0].ttype));
@@ -3180,180 +3179,180 @@ case 156:
 		  TREE_STATIC (yyval.ttype) = TREE_STATIC (yyvsp[-1].ttype); ;
     break;}
 case 157:
-#line 1060 "objc-parse.y"
+#line 1059 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 158:
-#line 1062 "objc-parse.y"
+#line 1061 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[0].ttype, tree_cons (NULL_TREE, yyvsp[-1].ttype, yyvsp[-2].ttype)); ;
     break;}
 case 159:
-#line 1066 "objc-parse.y"
+#line 1065 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 160:
-#line 1068 "objc-parse.y"
+#line 1067 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 163:
-#line 1078 "objc-parse.y"
+#line 1077 "objc-parse.y"
 { /* For a typedef name, record the meaning, not the name.
 		     In case of `foo foo, bar;'.  */
 		  yyval.ttype = lookup_name (yyvsp[0].ttype); ;
     break;}
 case 164:
-#line 1082 "objc-parse.y"
+#line 1081 "objc-parse.y"
 { yyval.ttype = get_static_reference (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 165:
-#line 1084 "objc-parse.y"
+#line 1083 "objc-parse.y"
 { yyval.ttype = get_object_reference (yyvsp[0].ttype); ;
     break;}
 case 166:
-#line 1089 "objc-parse.y"
+#line 1088 "objc-parse.y"
 { yyval.ttype = get_object_reference (yyvsp[0].ttype); ;
     break;}
 case 167:
-#line 1091 "objc-parse.y"
+#line 1090 "objc-parse.y"
 { yyval.ttype = TREE_TYPE (yyvsp[-1].ttype); ;
     break;}
 case 168:
-#line 1093 "objc-parse.y"
+#line 1092 "objc-parse.y"
 { yyval.ttype = groktypename (yyvsp[-1].ttype); ;
     break;}
 case 176:
-#line 1115 "objc-parse.y"
+#line 1114 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 177:
-#line 1117 "objc-parse.y"
+#line 1116 "objc-parse.y"
 { if (TREE_CHAIN (yyvsp[-1].ttype)) yyvsp[-1].ttype = combine_strings (yyvsp[-1].ttype);
 		  yyval.ttype = yyvsp[-1].ttype;
 		;
     break;}
 case 178:
-#line 1124 "objc-parse.y"
+#line 1123 "objc-parse.y"
 { yyval.ttype = start_decl (yyvsp[-3].ttype, current_declspecs, 1,
 					  yyvsp[-1].ttype, prefix_attributes);
 		  start_init (yyval.ttype, yyvsp[-2].ttype, global_bindings_p ()); ;
     break;}
 case 179:
-#line 1129 "objc-parse.y"
+#line 1128 "objc-parse.y"
 { finish_init ();
 		  finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype); ;
     break;}
 case 180:
-#line 1132 "objc-parse.y"
+#line 1131 "objc-parse.y"
 { tree d = start_decl (yyvsp[-2].ttype, current_declspecs, 0,
 				       yyvsp[0].ttype, prefix_attributes);
 		  finish_decl (d, NULL_TREE, yyvsp[-1].ttype); 
                 ;
     break;}
 case 181:
-#line 1140 "objc-parse.y"
+#line 1139 "objc-parse.y"
 { yyval.ttype = start_decl (yyvsp[-3].ttype, current_declspecs, 1,
 					  yyvsp[-1].ttype, prefix_attributes);
 		  start_init (yyval.ttype, yyvsp[-2].ttype, global_bindings_p ()); ;
     break;}
 case 182:
-#line 1145 "objc-parse.y"
+#line 1144 "objc-parse.y"
 { finish_init ();
 		  decl_attributes (yyvsp[-1].ttype, yyvsp[-3].ttype, prefix_attributes);
 		  finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype); ;
     break;}
 case 183:
-#line 1149 "objc-parse.y"
+#line 1148 "objc-parse.y"
 { tree d = start_decl (yyvsp[-2].ttype, current_declspecs, 0,
 				       yyvsp[0].ttype, prefix_attributes);
 		  finish_decl (d, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 184:
-#line 1157 "objc-parse.y"
+#line 1156 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 185:
-#line 1159 "objc-parse.y"
+#line 1158 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 186:
-#line 1164 "objc-parse.y"
+#line 1163 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 187:
-#line 1166 "objc-parse.y"
+#line 1165 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 188:
-#line 1171 "objc-parse.y"
+#line 1170 "objc-parse.y"
 { yyval.ttype = yyvsp[-2].ttype; ;
     break;}
 case 189:
-#line 1176 "objc-parse.y"
+#line 1175 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 190:
-#line 1178 "objc-parse.y"
+#line 1177 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 191:
-#line 1183 "objc-parse.y"
+#line 1182 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 192:
-#line 1185 "objc-parse.y"
+#line 1184 "objc-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 193:
-#line 1187 "objc-parse.y"
+#line 1186 "objc-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-3].ttype, build_tree_list (NULL_TREE, yyvsp[-1].ttype)); ;
     break;}
 case 194:
-#line 1189 "objc-parse.y"
+#line 1188 "objc-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-5].ttype, tree_cons (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype)); ;
     break;}
 case 195:
-#line 1191 "objc-parse.y"
+#line 1190 "objc-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 201:
-#line 1209 "objc-parse.y"
+#line 1208 "objc-parse.y"
 { really_start_incremental_init (NULL_TREE); ;
     break;}
 case 202:
-#line 1211 "objc-parse.y"
+#line 1210 "objc-parse.y"
 { yyval.ttype = pop_init_level (0); ;
     break;}
 case 203:
-#line 1213 "objc-parse.y"
+#line 1212 "objc-parse.y"
 { yyval.ttype = error_mark_node; ;
     break;}
 case 204:
-#line 1219 "objc-parse.y"
+#line 1218 "objc-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids empty initializer braces"); ;
     break;}
 case 210:
-#line 1235 "objc-parse.y"
+#line 1234 "objc-parse.y"
 { set_init_label (yyvsp[-1].ttype); ;
     break;}
 case 213:
-#line 1242 "objc-parse.y"
+#line 1241 "objc-parse.y"
 { push_init_level (0); ;
     break;}
 case 214:
-#line 1244 "objc-parse.y"
+#line 1243 "objc-parse.y"
 { process_init_element (pop_init_level (0)); ;
     break;}
 case 215:
-#line 1246 "objc-parse.y"
+#line 1245 "objc-parse.y"
 { process_init_element (yyvsp[0].ttype); ;
     break;}
 case 219:
-#line 1257 "objc-parse.y"
+#line 1256 "objc-parse.y"
 { set_init_label (yyvsp[0].ttype); ;
     break;}
 case 220:
-#line 1265 "objc-parse.y"
+#line 1264 "objc-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids nested functions");
 
@@ -3367,16 +3366,16 @@ case 220:
 		  reinit_parse_for_function (); ;
     break;}
 case 221:
-#line 1277 "objc-parse.y"
+#line 1276 "objc-parse.y"
 { store_parm_decls (); ;
     break;}
 case 222:
-#line 1285 "objc-parse.y"
+#line 1284 "objc-parse.y"
 { finish_function (1);
 		  pop_function_context (); ;
     break;}
 case 223:
-#line 1291 "objc-parse.y"
+#line 1290 "objc-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids nested functions");
 
@@ -3390,195 +3389,195 @@ case 223:
 		  reinit_parse_for_function (); ;
     break;}
 case 224:
-#line 1303 "objc-parse.y"
+#line 1302 "objc-parse.y"
 { store_parm_decls (); ;
     break;}
 case 225:
-#line 1311 "objc-parse.y"
+#line 1310 "objc-parse.y"
 { finish_function (1);
 		  pop_function_context (); ;
     break;}
 case 228:
-#line 1327 "objc-parse.y"
+#line 1326 "objc-parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 229:
-#line 1329 "objc-parse.y"
+#line 1328 "objc-parse.y"
 { yyval.ttype = build_nt (CALL_EXPR, yyvsp[-2].ttype, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 230:
-#line 1334 "objc-parse.y"
+#line 1333 "objc-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 231:
-#line 1336 "objc-parse.y"
+#line 1335 "objc-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 232:
-#line 1338 "objc-parse.y"
+#line 1337 "objc-parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 233:
-#line 1345 "objc-parse.y"
+#line 1344 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 236:
-#line 1357 "objc-parse.y"
+#line 1356 "objc-parse.y"
 { yyval.ttype = build_nt (CALL_EXPR, yyvsp[-2].ttype, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 237:
-#line 1362 "objc-parse.y"
+#line 1361 "objc-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 238:
-#line 1364 "objc-parse.y"
+#line 1363 "objc-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 239:
-#line 1366 "objc-parse.y"
+#line 1365 "objc-parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 240:
-#line 1373 "objc-parse.y"
+#line 1372 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 242:
-#line 1382 "objc-parse.y"
+#line 1381 "objc-parse.y"
 { yyval.ttype = build_nt (CALL_EXPR, yyvsp[-2].ttype, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 243:
-#line 1387 "objc-parse.y"
+#line 1386 "objc-parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 244:
-#line 1389 "objc-parse.y"
+#line 1388 "objc-parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 245:
-#line 1391 "objc-parse.y"
+#line 1390 "objc-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 246:
-#line 1393 "objc-parse.y"
+#line 1392 "objc-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 247:
-#line 1400 "objc-parse.y"
+#line 1399 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 249:
-#line 1406 "objc-parse.y"
+#line 1405 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 250:
-#line 1408 "objc-parse.y"
+#line 1407 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 251:
-#line 1413 "objc-parse.y"
+#line 1412 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 252:
-#line 1415 "objc-parse.y"
+#line 1414 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 253:
-#line 1420 "objc-parse.y"
+#line 1419 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 254:
-#line 1422 "objc-parse.y"
+#line 1421 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 255:
-#line 1427 "objc-parse.y"
+#line 1426 "objc-parse.y"
 { yyval.ttype = start_struct (RECORD_TYPE, yyvsp[-1].ttype);
 		  /* Start scope of tag before parsing components.  */
 		;
     break;}
 case 256:
-#line 1431 "objc-parse.y"
+#line 1430 "objc-parse.y"
 { yyval.ttype = finish_struct (yyvsp[-3].ttype, yyvsp[-2].ttype, chainon (yyvsp[-6].ttype, yyvsp[0].ttype)); ;
     break;}
 case 257:
-#line 1433 "objc-parse.y"
+#line 1432 "objc-parse.y"
 { yyval.ttype = finish_struct (start_struct (RECORD_TYPE, NULL_TREE),
 				      yyvsp[-2].ttype, chainon (yyvsp[-4].ttype, yyvsp[0].ttype));
 		;
     break;}
 case 258:
-#line 1437 "objc-parse.y"
+#line 1436 "objc-parse.y"
 { yyval.ttype = xref_tag (RECORD_TYPE, yyvsp[0].ttype); ;
     break;}
 case 259:
-#line 1439 "objc-parse.y"
+#line 1438 "objc-parse.y"
 { yyval.ttype = start_struct (UNION_TYPE, yyvsp[-1].ttype); ;
     break;}
 case 260:
-#line 1441 "objc-parse.y"
+#line 1440 "objc-parse.y"
 { yyval.ttype = finish_struct (yyvsp[-3].ttype, yyvsp[-2].ttype, chainon (yyvsp[-6].ttype, yyvsp[0].ttype)); ;
     break;}
 case 261:
-#line 1443 "objc-parse.y"
+#line 1442 "objc-parse.y"
 { yyval.ttype = finish_struct (start_struct (UNION_TYPE, NULL_TREE),
 				      yyvsp[-2].ttype, chainon (yyvsp[-4].ttype, yyvsp[0].ttype));
 		;
     break;}
 case 262:
-#line 1447 "objc-parse.y"
+#line 1446 "objc-parse.y"
 { yyval.ttype = xref_tag (UNION_TYPE, yyvsp[0].ttype); ;
     break;}
 case 263:
-#line 1449 "objc-parse.y"
+#line 1448 "objc-parse.y"
 { yyval.ttype = start_enum (yyvsp[-1].ttype); ;
     break;}
 case 264:
-#line 1451 "objc-parse.y"
+#line 1450 "objc-parse.y"
 { yyval.ttype = finish_enum (yyvsp[-4].ttype, nreverse (yyvsp[-3].ttype),
 				    chainon (yyvsp[-7].ttype, yyvsp[0].ttype)); ;
     break;}
 case 265:
-#line 1454 "objc-parse.y"
+#line 1453 "objc-parse.y"
 { yyval.ttype = start_enum (NULL_TREE); ;
     break;}
 case 266:
-#line 1456 "objc-parse.y"
+#line 1455 "objc-parse.y"
 { yyval.ttype = finish_enum (yyvsp[-4].ttype, nreverse (yyvsp[-3].ttype),
 				    chainon (yyvsp[-6].ttype, yyvsp[0].ttype)); ;
     break;}
 case 267:
-#line 1459 "objc-parse.y"
+#line 1458 "objc-parse.y"
 { yyval.ttype = xref_tag (ENUMERAL_TYPE, yyvsp[0].ttype); ;
     break;}
 case 271:
-#line 1470 "objc-parse.y"
+#line 1469 "objc-parse.y"
 { if (pedantic && ! flag_isoc99)
 		    pedwarn ("comma at end of enumerator list"); ;
     break;}
 case 272:
-#line 1476 "objc-parse.y"
+#line 1475 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 273:
-#line 1478 "objc-parse.y"
+#line 1477 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype);
 		  pedwarn ("no semicolon at end of struct or union"); ;
     break;}
 case 274:
-#line 1483 "objc-parse.y"
+#line 1482 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 275:
-#line 1485 "objc-parse.y"
+#line 1484 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 276:
-#line 1487 "objc-parse.y"
+#line 1486 "objc-parse.y"
 { if (pedantic)
 		    pedwarn ("extra semicolon in struct or union specified"); ;
     break;}
 case 277:
-#line 1491 "objc-parse.y"
+#line 1490 "objc-parse.y"
 {
 		  tree interface = lookup_interface (yyvsp[-1].ttype);
 
@@ -3593,14 +3592,14 @@ case 277:
 		;
     break;}
 case 278:
-#line 1516 "objc-parse.y"
+#line 1515 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 279:
-#line 1521 "objc-parse.y"
+#line 1520 "objc-parse.y"
 {
 		  /* Support for unnamed structs or unions as members of 
 		     structs or unions (which is [a] useful and [b] supports 
@@ -3615,151 +3614,151 @@ case 279:
 		;
     break;}
 case 280:
-#line 1534 "objc-parse.y"
+#line 1533 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 281:
-#line 1539 "objc-parse.y"
+#line 1538 "objc-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids member declarations with no members");
 		  shadow_tag(yyvsp[0].ttype);
 		  yyval.ttype = NULL_TREE; ;
     break;}
 case 282:
-#line 1544 "objc-parse.y"
+#line 1543 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 283:
-#line 1546 "objc-parse.y"
+#line 1545 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  RESTORE_WARN_FLAGS (yyvsp[-1].ttype); ;
     break;}
 case 285:
-#line 1553 "objc-parse.y"
+#line 1552 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 286:
-#line 1558 "objc-parse.y"
+#line 1557 "objc-parse.y"
 { yyval.ttype = grokfield (yyvsp[-3].filename, yyvsp[-2].lineno, yyvsp[-1].ttype, current_declspecs, NULL_TREE);
 		  decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ;
     break;}
 case 287:
-#line 1562 "objc-parse.y"
+#line 1561 "objc-parse.y"
 { yyval.ttype = grokfield (yyvsp[-5].filename, yyvsp[-4].lineno, yyvsp[-3].ttype, current_declspecs, yyvsp[-1].ttype);
 		  decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ;
     break;}
 case 288:
-#line 1565 "objc-parse.y"
+#line 1564 "objc-parse.y"
 { yyval.ttype = grokfield (yyvsp[-4].filename, yyvsp[-3].lineno, NULL_TREE, current_declspecs, yyvsp[-1].ttype);
 		  decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ;
     break;}
 case 290:
-#line 1577 "objc-parse.y"
+#line 1576 "objc-parse.y"
 { if (yyvsp[-2].ttype == error_mark_node)
 		    yyval.ttype = yyvsp[-2].ttype;
 		  else
 		    yyval.ttype = chainon (yyvsp[0].ttype, yyvsp[-2].ttype); ;
     break;}
 case 291:
-#line 1582 "objc-parse.y"
+#line 1581 "objc-parse.y"
 { yyval.ttype = error_mark_node; ;
     break;}
 case 292:
-#line 1588 "objc-parse.y"
+#line 1587 "objc-parse.y"
 { yyval.ttype = build_enumerator (yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 293:
-#line 1590 "objc-parse.y"
+#line 1589 "objc-parse.y"
 { yyval.ttype = build_enumerator (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 294:
-#line 1595 "objc-parse.y"
+#line 1594 "objc-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 295:
-#line 1597 "objc-parse.y"
+#line 1596 "objc-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 296:
-#line 1602 "objc-parse.y"
+#line 1601 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 298:
-#line 1608 "objc-parse.y"
+#line 1607 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 299:
-#line 1610 "objc-parse.y"
+#line 1609 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 300:
-#line 1615 "objc-parse.y"
+#line 1614 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 301:
-#line 1617 "objc-parse.y"
+#line 1616 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 302:
-#line 1622 "objc-parse.y"
+#line 1621 "objc-parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 303:
-#line 1625 "objc-parse.y"
+#line 1624 "objc-parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 304:
-#line 1627 "objc-parse.y"
+#line 1626 "objc-parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 305:
-#line 1629 "objc-parse.y"
+#line 1628 "objc-parse.y"
 { yyval.ttype = build_nt (CALL_EXPR, yyvsp[-2].ttype, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 306:
-#line 1631 "objc-parse.y"
+#line 1630 "objc-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 307:
-#line 1633 "objc-parse.y"
+#line 1632 "objc-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 308:
-#line 1635 "objc-parse.y"
+#line 1634 "objc-parse.y"
 { yyval.ttype = build_nt (CALL_EXPR, NULL_TREE, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 309:
-#line 1637 "objc-parse.y"
+#line 1636 "objc-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 310:
-#line 1639 "objc-parse.y"
+#line 1638 "objc-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, NULL_TREE, NULL_TREE); ;
     break;}
 case 311:
-#line 1643 "objc-parse.y"
+#line 1642 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 312:
-#line 1652 "objc-parse.y"
+#line 1651 "objc-parse.y"
 {
 		  if (pedantic && yyvsp[0].ends_in_label)
 		    pedwarn ("ANSI C forbids label at end of compound statement");
 		;
     break;}
 case 314:
-#line 1661 "objc-parse.y"
+#line 1660 "objc-parse.y"
 { yyval.ends_in_label = yyvsp[0].ends_in_label; ;
     break;}
 case 315:
-#line 1663 "objc-parse.y"
+#line 1662 "objc-parse.y"
 { yyval.ends_in_label = 0; ;
     break;}
 case 319:
-#line 1675 "objc-parse.y"
+#line 1674 "objc-parse.y"
 { emit_line_note (input_filename, lineno);
 		  pushlevel (0);
 		  clear_last_expr ();
@@ -3769,12 +3768,12 @@ case 319:
 		;
     break;}
 case 321:
-#line 1689 "objc-parse.y"
+#line 1688 "objc-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids label declarations"); ;
     break;}
 case 324:
-#line 1700 "objc-parse.y"
+#line 1699 "objc-parse.y"
 { tree link;
 		  for (link = yyvsp[-1].ttype; link; link = TREE_CHAIN (link))
 		    {
@@ -3785,37 +3784,37 @@ case 324:
 		;
     break;}
 case 325:
-#line 1714 "objc-parse.y"
+#line 1713 "objc-parse.y"
 {;
     break;}
 case 327:
-#line 1718 "objc-parse.y"
+#line 1717 "objc-parse.y"
 { compstmt_count++; ;
     break;}
 case 328:
-#line 1721 "objc-parse.y"
+#line 1720 "objc-parse.y"
 { yyval.ttype = convert (void_type_node, integer_zero_node); ;
     break;}
 case 329:
-#line 1723 "objc-parse.y"
+#line 1722 "objc-parse.y"
 { emit_line_note (input_filename, lineno);
 		  expand_end_bindings (getdecls (), 1, 0);
 		  yyval.ttype = poplevel (1, 1, 0); ;
     break;}
 case 330:
-#line 1727 "objc-parse.y"
+#line 1726 "objc-parse.y"
 { emit_line_note (input_filename, lineno);
 		  expand_end_bindings (getdecls (), kept_level_p (), 0);
 		  yyval.ttype = poplevel (kept_level_p (), 0, 0); ;
     break;}
 case 331:
-#line 1731 "objc-parse.y"
+#line 1730 "objc-parse.y"
 { emit_line_note (input_filename, lineno);
 		  expand_end_bindings (getdecls (), kept_level_p (), 0);
 		  yyval.ttype = poplevel (kept_level_p (), 0, 0); ;
     break;}
 case 332:
-#line 1738 "objc-parse.y"
+#line 1737 "objc-parse.y"
 { if (current_function_decl == 0)
 		    {
 		      error ("braced-group within expression allowed only inside a function");
@@ -3833,11 +3832,11 @@ case 332:
 		;
     break;}
 case 333:
-#line 1755 "objc-parse.y"
+#line 1754 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 336:
-#line 1769 "objc-parse.y"
+#line 1768 "objc-parse.y"
 { emit_line_note (yyvsp[-5].filename, yyvsp[-4].lineno);
 		  c_expand_start_cond (truthvalue_conversion (yyvsp[-1].ttype), 0, 
 				       compstmt_count);
@@ -3847,7 +3846,7 @@ case 336:
 		  position_after_white_space (); ;
     break;}
 case 337:
-#line 1783 "objc-parse.y"
+#line 1782 "objc-parse.y"
 { stmt_count++;
 		  compstmt_count++;
 		  emit_line_note (yyvsp[-2].filename, yyvsp[-1].lineno);
@@ -3857,43 +3856,43 @@ case 337:
 		  position_after_white_space (); ;
     break;}
 case 338:
-#line 1791 "objc-parse.y"
+#line 1790 "objc-parse.y"
 { expand_loop_continue_here (); ;
     break;}
 case 339:
-#line 1795 "objc-parse.y"
+#line 1794 "objc-parse.y"
 { yyval.filename = input_filename; ;
     break;}
 case 340:
-#line 1799 "objc-parse.y"
+#line 1798 "objc-parse.y"
 { yyval.lineno = lineno; ;
     break;}
 case 341:
-#line 1804 "objc-parse.y"
+#line 1803 "objc-parse.y"
 { ;
     break;}
 case 342:
-#line 1809 "objc-parse.y"
+#line 1808 "objc-parse.y"
 { ;
     break;}
 case 343:
-#line 1814 "objc-parse.y"
+#line 1813 "objc-parse.y"
 { yyval.ends_in_label = yyvsp[0].ends_in_label; ;
     break;}
 case 344:
-#line 1819 "objc-parse.y"
+#line 1818 "objc-parse.y"
 { yyval.ends_in_label = 0; ;
     break;}
 case 345:
-#line 1821 "objc-parse.y"
+#line 1820 "objc-parse.y"
 { yyval.ends_in_label = 1; ;
     break;}
 case 346:
-#line 1827 "objc-parse.y"
+#line 1826 "objc-parse.y"
 { stmt_count++; ;
     break;}
 case 348:
-#line 1830 "objc-parse.y"
+#line 1829 "objc-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-3].filename, yyvsp[-2].lineno);
 /* It appears that this should not be done--that a non-lvalue array
@@ -3911,19 +3910,19 @@ case 348:
 		  iterator_expand (yyvsp[-1].ttype); ;
     break;}
 case 349:
-#line 1846 "objc-parse.y"
+#line 1845 "objc-parse.y"
 { c_expand_start_else ();
 		  yyvsp[-1].itype = stmt_count;
 		  position_after_white_space (); ;
     break;}
 case 350:
-#line 1850 "objc-parse.y"
+#line 1849 "objc-parse.y"
 { c_expand_end_cond ();
 		  if (extra_warnings && stmt_count == yyvsp[-3].itype)
 		    warning ("empty body in an else-statement"); ;
     break;}
 case 351:
-#line 1854 "objc-parse.y"
+#line 1853 "objc-parse.y"
 { c_expand_end_cond ();
 		  /* This warning is here instead of in simple_if, because we
 		     do not want a warning if an empty if is followed by an
@@ -3934,11 +3933,11 @@ case 351:
 						"empty body in an if-statement"); ;
     break;}
 case 352:
-#line 1866 "objc-parse.y"
+#line 1865 "objc-parse.y"
 { c_expand_end_cond (); ;
     break;}
 case 353:
-#line 1868 "objc-parse.y"
+#line 1867 "objc-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-2].filename, yyvsp[-1].lineno);
 		  /* The emit_nop used to come before emit_line_note,
@@ -3950,7 +3949,7 @@ case 353:
 		  emit_nop (); ;
     break;}
 case 354:
-#line 1878 "objc-parse.y"
+#line 1877 "objc-parse.y"
 { /* Don't start the loop till we have succeeded
 		     in parsing the end test.  This is to make sure
 		     that we end every loop we start.  */
@@ -3961,22 +3960,22 @@ case 354:
 		  position_after_white_space (); ;
     break;}
 case 355:
-#line 1887 "objc-parse.y"
+#line 1886 "objc-parse.y"
 { expand_end_loop (); ;
     break;}
 case 356:
-#line 1890 "objc-parse.y"
+#line 1889 "objc-parse.y"
 { emit_line_note (input_filename, lineno);
 		  expand_exit_loop_if_false (NULL_PTR,
 					     truthvalue_conversion (yyvsp[-2].ttype));
 		  expand_end_loop (); ;
     break;}
 case 357:
-#line 1896 "objc-parse.y"
+#line 1895 "objc-parse.y"
 { expand_end_loop (); ;
     break;}
 case 358:
-#line 1899 "objc-parse.y"
+#line 1898 "objc-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-5].filename, yyvsp[-4].lineno);
 		  /* See comment in `while' alternative, above.  */
@@ -3989,12 +3988,12 @@ case 358:
 		;
     break;}
 case 359:
-#line 1911 "objc-parse.y"
+#line 1910 "objc-parse.y"
 { yyvsp[0].lineno = lineno;
 		  yyval.filename = input_filename; ;
     break;}
 case 360:
-#line 1914 "objc-parse.y"
+#line 1913 "objc-parse.y"
 { 
 		  /* Start the loop.  Doing this after parsing
 		     all the expressions ensures we will end the loop.  */
@@ -4009,7 +4008,7 @@ case 360:
 		  position_after_white_space (); ;
     break;}
 case 361:
-#line 1927 "objc-parse.y"
+#line 1926 "objc-parse.y"
 { /* Emit the increment expression, with a line number.  */
 		  emit_line_note (yyvsp[-4].filename, yyvsp[-5].lineno);
 		  expand_loop_continue_here ();
@@ -4018,44 +4017,44 @@ case 361:
 		  expand_end_loop (); ;
     break;}
 case 362:
-#line 1934 "objc-parse.y"
+#line 1933 "objc-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-5].filename, yyvsp[-4].lineno);
 		  c_expand_start_case (yyvsp[-1].ttype);
 		  position_after_white_space (); ;
     break;}
 case 363:
-#line 1939 "objc-parse.y"
+#line 1938 "objc-parse.y"
 { expand_end_case (yyvsp[-3].ttype); ;
     break;}
 case 364:
-#line 1941 "objc-parse.y"
+#line 1940 "objc-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-3].filename, yyvsp[-2].lineno);
 		  if ( ! expand_exit_something ())
 		    error ("break statement not within loop or switch"); ;
     break;}
 case 365:
-#line 1946 "objc-parse.y"
+#line 1945 "objc-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-3].filename, yyvsp[-2].lineno);
 		  if (! expand_continue_loop (NULL_PTR))
 		    error ("continue statement not within a loop"); ;
     break;}
 case 366:
-#line 1951 "objc-parse.y"
+#line 1950 "objc-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-3].filename, yyvsp[-2].lineno);
 		  c_expand_return (NULL_TREE); ;
     break;}
 case 367:
-#line 1955 "objc-parse.y"
+#line 1954 "objc-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-4].filename, yyvsp[-3].lineno);
 		  c_expand_return (yyvsp[-1].ttype); ;
     break;}
 case 368:
-#line 1959 "objc-parse.y"
+#line 1958 "objc-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-7].filename, yyvsp[-6].lineno);
 		  STRIP_NOPS (yyvsp[-2].ttype);
@@ -4067,7 +4066,7 @@ case 368:
 		    error ("argument of `asm' is not a constant string"); ;
     break;}
 case 369:
-#line 1970 "objc-parse.y"
+#line 1969 "objc-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-9].filename, yyvsp[-8].lineno);
 		  c_expand_asm_operands (yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE, NULL_TREE,
@@ -4075,7 +4074,7 @@ case 369:
 					 input_filename, lineno); ;
     break;}
 case 370:
-#line 1977 "objc-parse.y"
+#line 1976 "objc-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-11].filename, yyvsp[-10].lineno);
 		  c_expand_asm_operands (yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE,
@@ -4083,7 +4082,7 @@ case 370:
 					 input_filename, lineno); ;
     break;}
 case 371:
-#line 1985 "objc-parse.y"
+#line 1984 "objc-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-13].filename, yyvsp[-12].lineno);
 		  c_expand_asm_operands (yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype,
@@ -4091,7 +4090,7 @@ case 371:
 					 input_filename, lineno); ;
     break;}
 case 372:
-#line 1991 "objc-parse.y"
+#line 1990 "objc-parse.y"
 { tree decl;
 		  stmt_count++;
 		  emit_line_note (yyvsp[-4].filename, yyvsp[-3].lineno);
@@ -4104,7 +4103,7 @@ case 372:
 		;
     break;}
 case 373:
-#line 2002 "objc-parse.y"
+#line 2001 "objc-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids `goto *expr;'");
 		  stmt_count++;
@@ -4112,7 +4111,7 @@ case 373:
 		  expand_computed_goto (convert (ptr_type_node, yyvsp[-1].ttype)); ;
     break;}
 case 376:
-#line 2017 "objc-parse.y"
+#line 2016 "objc-parse.y"
 {
 	    /* The value returned by this action is  */
 	    /*      1 if everything is OK */ 
@@ -4135,14 +4134,14 @@ case 376:
 	  ;
     break;}
 case 377:
-#line 2038 "objc-parse.y"
+#line 2037 "objc-parse.y"
 {
 	    if (yyvsp[-1].itype)
 	      iterator_for_loop_end (yyvsp[-3].ttype);
 	  ;
     break;}
 case 378:
-#line 2069 "objc-parse.y"
+#line 2068 "objc-parse.y"
 { register tree value = check_case_value (yyvsp[-1].ttype);
 		  register tree label
 		    = build_decl (LABEL_DECL, NULL_TREE, NULL_TREE);
@@ -4175,7 +4174,7 @@ case 378:
 		  position_after_white_space (); ;
     break;}
 case 379:
-#line 2100 "objc-parse.y"
+#line 2099 "objc-parse.y"
 { register tree value1 = check_case_value (yyvsp[-3].ttype);
 		  register tree value2 = check_case_value (yyvsp[-1].ttype);
 		  register tree label
@@ -4208,7 +4207,7 @@ case 379:
 		  position_after_white_space (); ;
     break;}
 case 380:
-#line 2131 "objc-parse.y"
+#line 2130 "objc-parse.y"
 {
 		  tree duplicate;
 		  register tree label
@@ -4225,7 +4224,7 @@ case 380:
 		  position_after_white_space (); ;
     break;}
 case 381:
-#line 2146 "objc-parse.y"
+#line 2145 "objc-parse.y"
 { tree label = define_label (input_filename, lineno, yyvsp[-2].ttype);
 		  stmt_count++;
 		  emit_nop ();
@@ -4237,52 +4236,52 @@ case 381:
 		  position_after_white_space (); ;
     break;}
 case 382:
-#line 2161 "objc-parse.y"
+#line 2160 "objc-parse.y"
 { emit_line_note (input_filename, lineno);
 		  yyval.ttype = NULL_TREE; ;
     break;}
 case 383:
-#line 2164 "objc-parse.y"
+#line 2163 "objc-parse.y"
 { emit_line_note (input_filename, lineno); ;
     break;}
 case 384:
-#line 2169 "objc-parse.y"
+#line 2168 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 386:
-#line 2176 "objc-parse.y"
+#line 2175 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 389:
-#line 2183 "objc-parse.y"
+#line 2182 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 390:
-#line 2188 "objc-parse.y"
+#line 2187 "objc-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 391:
-#line 2193 "objc-parse.y"
+#line 2192 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, combine_strings (yyvsp[0].ttype), NULL_TREE); ;
     break;}
 case 392:
-#line 2195 "objc-parse.y"
+#line 2194 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, combine_strings (yyvsp[0].ttype), yyvsp[-2].ttype); ;
     break;}
 case 393:
-#line 2201 "objc-parse.y"
+#line 2200 "objc-parse.y"
 { pushlevel (0);
 		  clear_parm_order ();
 		  declare_parm_level (0); ;
     break;}
 case 394:
-#line 2205 "objc-parse.y"
+#line 2204 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  parmlist_tags_warning ();
 		  poplevel (0, 0, 0); ;
     break;}
 case 396:
-#line 2213 "objc-parse.y"
+#line 2212 "objc-parse.y"
 { tree parm;
 		  if (pedantic)
 		    pedwarn ("ANSI C forbids forward parameter declarations");
@@ -4292,19 +4291,19 @@ case 396:
 		  clear_parm_order (); ;
     break;}
 case 397:
-#line 2221 "objc-parse.y"
+#line 2220 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 398:
-#line 2223 "objc-parse.y"
+#line 2222 "objc-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, NULL_TREE, NULL_TREE); ;
     break;}
 case 399:
-#line 2229 "objc-parse.y"
+#line 2228 "objc-parse.y"
 { yyval.ttype = get_parm_info (0); ;
     break;}
 case 400:
-#line 2231 "objc-parse.y"
+#line 2230 "objc-parse.y"
 { yyval.ttype = get_parm_info (0);
 		  /* Gcc used to allow this as an extension.  However, it does
 		     not work for all targets, and thus has been disabled.
@@ -4316,23 +4315,23 @@ case 400:
 		;
     break;}
 case 401:
-#line 2241 "objc-parse.y"
+#line 2240 "objc-parse.y"
 { yyval.ttype = get_parm_info (1); ;
     break;}
 case 402:
-#line 2243 "objc-parse.y"
+#line 2242 "objc-parse.y"
 { yyval.ttype = get_parm_info (0); ;
     break;}
 case 403:
-#line 2248 "objc-parse.y"
+#line 2247 "objc-parse.y"
 { push_parm_decl (yyvsp[0].ttype); ;
     break;}
 case 404:
-#line 2250 "objc-parse.y"
+#line 2249 "objc-parse.y"
 { push_parm_decl (yyvsp[0].ttype); ;
     break;}
 case 405:
-#line 2257 "objc-parse.y"
+#line 2256 "objc-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
@@ -4342,7 +4341,7 @@ case 405:
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 406:
-#line 2265 "objc-parse.y"
+#line 2264 "objc-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
@@ -4352,7 +4351,7 @@ case 406:
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 407:
-#line 2273 "objc-parse.y"
+#line 2272 "objc-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
@@ -4362,7 +4361,7 @@ case 407:
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 408:
-#line 2281 "objc-parse.y"
+#line 2280 "objc-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
@@ -4372,7 +4371,7 @@ case 408:
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 409:
-#line 2290 "objc-parse.y"
+#line 2289 "objc-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
@@ -4382,19 +4381,19 @@ case 409:
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 410:
-#line 2303 "objc-parse.y"
+#line 2302 "objc-parse.y"
 { pushlevel (0);
 		  clear_parm_order ();
 		  declare_parm_level (1); ;
     break;}
 case 411:
-#line 2307 "objc-parse.y"
+#line 2306 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  parmlist_tags_warning ();
 		  poplevel (0, 0, 0); ;
     break;}
 case 413:
-#line 2315 "objc-parse.y"
+#line 2314 "objc-parse.y"
 { tree t;
 		  for (t = yyvsp[-1].ttype; t; t = TREE_CHAIN (t))
 		    if (TREE_VALUE (t) == NULL_TREE)
@@ -4402,29 +4401,29 @@ case 413:
 		  yyval.ttype = tree_cons (NULL_TREE, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 414:
-#line 2325 "objc-parse.y"
+#line 2324 "objc-parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 415:
-#line 2327 "objc-parse.y"
+#line 2326 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 416:
-#line 2333 "objc-parse.y"
+#line 2332 "objc-parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 417:
-#line 2335 "objc-parse.y"
+#line 2334 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 418:
-#line 2340 "objc-parse.y"
+#line 2339 "objc-parse.y"
 { yyval.ttype = SAVE_WARN_FLAGS();
 		  pedantic = 0;
 		  warn_pointer_arith = 0; ;
     break;}
 case 424:
-#line 2354 "objc-parse.y"
+#line 2353 "objc-parse.y"
 {
 		  if (objc_implementation_context)
                     {
@@ -4437,27 +4436,27 @@ case 424:
 		;
     break;}
 case 425:
-#line 2369 "objc-parse.y"
+#line 2368 "objc-parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 426:
-#line 2371 "objc-parse.y"
+#line 2370 "objc-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 427:
-#line 2376 "objc-parse.y"
+#line 2375 "objc-parse.y"
 {
 		  objc_declare_class (yyvsp[-1].ttype);
 		;
     break;}
 case 428:
-#line 2382 "objc-parse.y"
+#line 2381 "objc-parse.y"
 {
 		  objc_declare_alias (yyvsp[-2].ttype, yyvsp[-1].ttype);
 		;
     break;}
 case 429:
-#line 2388 "objc-parse.y"
+#line 2387 "objc-parse.y"
 {
 		  objc_interface_context = objc_ivar_context
 		    = start_class (CLASS_INTERFACE_TYPE, yyvsp[-2].ttype, NULL_TREE, yyvsp[-1].ttype);
@@ -4465,20 +4464,20 @@ case 429:
 		;
     break;}
 case 430:
-#line 2394 "objc-parse.y"
+#line 2393 "objc-parse.y"
 {
                   continue_class (objc_interface_context);
 		;
     break;}
 case 431:
-#line 2399 "objc-parse.y"
+#line 2398 "objc-parse.y"
 {
 		  finish_class (objc_interface_context);
 		  objc_interface_context = NULL_TREE;
 		;
     break;}
 case 432:
-#line 2405 "objc-parse.y"
+#line 2404 "objc-parse.y"
 {
 		  objc_interface_context
 		    = start_class (CLASS_INTERFACE_TYPE, yyvsp[-1].ttype, NULL_TREE, yyvsp[0].ttype);
@@ -4486,14 +4485,14 @@ case 432:
 		;
     break;}
 case 433:
-#line 2412 "objc-parse.y"
+#line 2411 "objc-parse.y"
 {
 		  finish_class (objc_interface_context);
 		  objc_interface_context = NULL_TREE;
 		;
     break;}
 case 434:
-#line 2418 "objc-parse.y"
+#line 2417 "objc-parse.y"
 {
 		  objc_interface_context = objc_ivar_context
 		    = start_class (CLASS_INTERFACE_TYPE, yyvsp[-4].ttype, yyvsp[-2].ttype, yyvsp[-1].ttype);
@@ -4501,20 +4500,20 @@ case 434:
 		;
     break;}
 case 435:
-#line 2424 "objc-parse.y"
+#line 2423 "objc-parse.y"
 {
                   continue_class (objc_interface_context);
 		;
     break;}
 case 436:
-#line 2429 "objc-parse.y"
+#line 2428 "objc-parse.y"
 {
 		  finish_class (objc_interface_context);
 		  objc_interface_context = NULL_TREE;
 		;
     break;}
 case 437:
-#line 2435 "objc-parse.y"
+#line 2434 "objc-parse.y"
 {
 		  objc_interface_context
 		    = start_class (CLASS_INTERFACE_TYPE, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype);
@@ -4522,14 +4521,14 @@ case 437:
 		;
     break;}
 case 438:
-#line 2442 "objc-parse.y"
+#line 2441 "objc-parse.y"
 {
 		  finish_class (objc_interface_context);
 		  objc_interface_context = NULL_TREE;
 		;
     break;}
 case 439:
-#line 2448 "objc-parse.y"
+#line 2447 "objc-parse.y"
 {
 		  objc_implementation_context = objc_ivar_context
 		    = start_class (CLASS_IMPLEMENTATION_TYPE, yyvsp[-1].ttype, NULL_TREE, NULL_TREE);
@@ -4537,14 +4536,14 @@ case 439:
 		;
     break;}
 case 440:
-#line 2454 "objc-parse.y"
+#line 2453 "objc-parse.y"
 {
                   objc_ivar_chain
 		    = continue_class (objc_implementation_context);
 		;
     break;}
 case 441:
-#line 2460 "objc-parse.y"
+#line 2459 "objc-parse.y"
 {
 		  objc_implementation_context
 		    = start_class (CLASS_IMPLEMENTATION_TYPE, yyvsp[0].ttype, NULL_TREE, NULL_TREE);
@@ -4553,7 +4552,7 @@ case 441:
 		;
     break;}
 case 442:
-#line 2468 "objc-parse.y"
+#line 2467 "objc-parse.y"
 {
 		  objc_implementation_context = objc_ivar_context
 		    = start_class (CLASS_IMPLEMENTATION_TYPE, yyvsp[-3].ttype, yyvsp[-1].ttype, NULL_TREE);
@@ -4561,14 +4560,14 @@ case 442:
 		;
     break;}
 case 443:
-#line 2474 "objc-parse.y"
+#line 2473 "objc-parse.y"
 {
                   objc_ivar_chain
 		    = continue_class (objc_implementation_context);
 		;
     break;}
 case 444:
-#line 2480 "objc-parse.y"
+#line 2479 "objc-parse.y"
 {
 		  objc_implementation_context
 		    = start_class (CLASS_IMPLEMENTATION_TYPE, yyvsp[-2].ttype, yyvsp[0].ttype, NULL_TREE);
@@ -4577,7 +4576,7 @@ case 444:
 		;
     break;}
 case 445:
-#line 2488 "objc-parse.y"
+#line 2487 "objc-parse.y"
 {
 		  objc_interface_context
 		    = start_class (CATEGORY_INTERFACE_TYPE, yyvsp[-4].ttype, yyvsp[-2].ttype, yyvsp[0].ttype);
@@ -4585,14 +4584,14 @@ case 445:
 		;
     break;}
 case 446:
-#line 2495 "objc-parse.y"
+#line 2494 "objc-parse.y"
 {
 		  finish_class (objc_interface_context);
 		  objc_interface_context = NULL_TREE;
 		;
     break;}
 case 447:
-#line 2501 "objc-parse.y"
+#line 2500 "objc-parse.y"
 {
 		  objc_implementation_context
 		    = start_class (CATEGORY_IMPLEMENTATION_TYPE, yyvsp[-3].ttype, yyvsp[-1].ttype, NULL_TREE);
@@ -4601,7 +4600,7 @@ case 447:
 		;
     break;}
 case 448:
-#line 2511 "objc-parse.y"
+#line 2510 "objc-parse.y"
 {
 		  remember_protocol_qualifiers ();
 		  objc_interface_context
@@ -4609,7 +4608,7 @@ case 448:
 		;
     break;}
 case 449:
-#line 2517 "objc-parse.y"
+#line 2516 "objc-parse.y"
 {
 		  forget_protocol_qualifiers();
 		  finish_protocol(objc_interface_context);
@@ -4617,13 +4616,13 @@ case 449:
 		;
     break;}
 case 450:
-#line 2526 "objc-parse.y"
+#line 2525 "objc-parse.y"
 {
 		  yyval.ttype = NULL_TREE;
 		;
     break;}
 case 452:
-#line 2534 "objc-parse.y"
+#line 2533 "objc-parse.y"
 {
 		  if (yyvsp[-2].code == LT_EXPR && yyvsp[0].code == GT_EXPR)
 		    yyval.ttype = yyvsp[-1].ttype;
@@ -4632,54 +4631,54 @@ case 452:
 		;
     break;}
 case 455:
-#line 2548 "objc-parse.y"
+#line 2547 "objc-parse.y"
 { objc_public_flag = 2; ;
     break;}
 case 456:
-#line 2549 "objc-parse.y"
+#line 2548 "objc-parse.y"
 { objc_public_flag = 0; ;
     break;}
 case 457:
-#line 2550 "objc-parse.y"
+#line 2549 "objc-parse.y"
 { objc_public_flag = 1; ;
     break;}
 case 458:
-#line 2555 "objc-parse.y"
+#line 2554 "objc-parse.y"
 {
                   yyval.ttype = NULL_TREE;
                 ;
     break;}
 case 460:
-#line 2560 "objc-parse.y"
+#line 2559 "objc-parse.y"
 {
                   if (pedantic)
 		    pedwarn ("extra semicolon in struct or union specified");
                 ;
     break;}
 case 461:
-#line 2578 "objc-parse.y"
+#line 2577 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 462:
-#line 2583 "objc-parse.y"
+#line 2582 "objc-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 463:
-#line 2588 "objc-parse.y"
+#line 2587 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 464:
-#line 2593 "objc-parse.y"
+#line 2592 "objc-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 467:
-#line 2600 "objc-parse.y"
+#line 2599 "objc-parse.y"
 {
 		  yyval.ttype = add_instance_variable (objc_ivar_context,
 					      objc_public_flag,
@@ -4688,7 +4687,7 @@ case 467:
                 ;
     break;}
 case 468:
-#line 2607 "objc-parse.y"
+#line 2606 "objc-parse.y"
 {
 		  yyval.ttype = add_instance_variable (objc_ivar_context,
 					      objc_public_flag,
@@ -4696,7 +4695,7 @@ case 468:
                 ;
     break;}
 case 469:
-#line 2613 "objc-parse.y"
+#line 2612 "objc-parse.y"
 {
 		  yyval.ttype = add_instance_variable (objc_ivar_context,
 					      objc_public_flag,
@@ -4705,7 +4704,7 @@ case 469:
                 ;
     break;}
 case 470:
-#line 2623 "objc-parse.y"
+#line 2622 "objc-parse.y"
 {
 		  remember_protocol_qualifiers ();
 		  if (objc_implementation_context)
@@ -4715,7 +4714,7 @@ case 470:
 		;
     break;}
 case 471:
-#line 2631 "objc-parse.y"
+#line 2630 "objc-parse.y"
 {
 		  forget_protocol_qualifiers ();
 		  add_class_method (objc_implementation_context, yyvsp[0].ttype);
@@ -4724,20 +4723,20 @@ case 471:
 		;
     break;}
 case 472:
-#line 2638 "objc-parse.y"
+#line 2637 "objc-parse.y"
 {
 		  continue_method_def ();
 		;
     break;}
 case 473:
-#line 2642 "objc-parse.y"
+#line 2641 "objc-parse.y"
 {
 		  finish_method_def ();
 		  objc_method_context = NULL_TREE;
 		;
     break;}
 case 474:
-#line 2648 "objc-parse.y"
+#line 2647 "objc-parse.y"
 {
 		  remember_protocol_qualifiers ();
 		  if (objc_implementation_context)
@@ -4747,7 +4746,7 @@ case 474:
 		;
     break;}
 case 475:
-#line 2656 "objc-parse.y"
+#line 2655 "objc-parse.y"
 {
 		  forget_protocol_qualifiers ();
 		  add_instance_method (objc_implementation_context, yyvsp[0].ttype);
@@ -4756,28 +4755,28 @@ case 475:
 		;
     break;}
 case 476:
-#line 2663 "objc-parse.y"
+#line 2662 "objc-parse.y"
 {
 		  continue_method_def ();
 		;
     break;}
 case 477:
-#line 2667 "objc-parse.y"
+#line 2666 "objc-parse.y"
 {
 		  finish_method_def ();
 		  objc_method_context = NULL_TREE;
 		;
     break;}
 case 479:
-#line 2679 "objc-parse.y"
+#line 2678 "objc-parse.y"
 {yyval.ttype = NULL_TREE; ;
     break;}
 case 484:
-#line 2686 "objc-parse.y"
+#line 2685 "objc-parse.y"
 {yyval.ttype = NULL_TREE; ;
     break;}
 case 488:
-#line 2696 "objc-parse.y"
+#line 2695 "objc-parse.y"
 {
 		  /* Remember protocol qualifiers in prototypes.  */
 		  remember_protocol_qualifiers ();
@@ -4785,7 +4784,7 @@ case 488:
 		;
     break;}
 case 489:
-#line 2702 "objc-parse.y"
+#line 2701 "objc-parse.y"
 {
 		  /* Forget protocol qualifiers here.  */
 		  forget_protocol_qualifiers ();
@@ -4793,7 +4792,7 @@ case 489:
 		;
     break;}
 case 491:
-#line 2710 "objc-parse.y"
+#line 2709 "objc-parse.y"
 {
 		  /* Remember protocol qualifiers in prototypes.  */
 		  remember_protocol_qualifiers ();
@@ -4801,7 +4800,7 @@ case 491:
 		;
     break;}
 case 492:
-#line 2716 "objc-parse.y"
+#line 2715 "objc-parse.y"
 {
 		  /* Forget protocol qualifiers here.  */
 		  forget_protocol_qualifiers ();
@@ -4809,93 +4808,93 @@ case 492:
 		;
     break;}
 case 494:
-#line 2726 "objc-parse.y"
+#line 2725 "objc-parse.y"
 {
 		  yyval.ttype = build_method_decl (objc_inherit_code, yyvsp[-2].ttype, yyvsp[0].ttype, NULL_TREE);
 		;
     break;}
 case 495:
-#line 2731 "objc-parse.y"
+#line 2730 "objc-parse.y"
 {
 		  yyval.ttype = build_method_decl (objc_inherit_code, NULL_TREE, yyvsp[0].ttype, NULL_TREE);
 		;
     break;}
 case 496:
-#line 2736 "objc-parse.y"
+#line 2735 "objc-parse.y"
 {
 		  yyval.ttype = build_method_decl (objc_inherit_code, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 497:
-#line 2741 "objc-parse.y"
+#line 2740 "objc-parse.y"
 {
 		  yyval.ttype = build_method_decl (objc_inherit_code, NULL_TREE, yyvsp[-1].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 506:
-#line 2771 "objc-parse.y"
+#line 2770 "objc-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack); ;
     break;}
 case 507:
-#line 2775 "objc-parse.y"
+#line 2774 "objc-parse.y"
 { shadow_tag (yyvsp[-1].ttype); ;
     break;}
 case 508:
-#line 2777 "objc-parse.y"
+#line 2776 "objc-parse.y"
 { pedwarn ("empty declaration"); ;
     break;}
 case 509:
-#line 2782 "objc-parse.y"
+#line 2781 "objc-parse.y"
 { push_parm_decl (yyvsp[0].ttype); ;
     break;}
 case 510:
-#line 2784 "objc-parse.y"
+#line 2783 "objc-parse.y"
 { push_parm_decl (yyvsp[0].ttype); ;
     break;}
 case 511:
-#line 2792 "objc-parse.y"
+#line 2791 "objc-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
 							 yyvsp[0].ttype)); ;
     break;}
 case 512:
-#line 2797 "objc-parse.y"
+#line 2796 "objc-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
 							 yyvsp[0].ttype)); ;
     break;}
 case 513:
-#line 2802 "objc-parse.y"
+#line 2801 "objc-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
 							 yyvsp[0].ttype)); ;
     break;}
 case 514:
-#line 2810 "objc-parse.y"
+#line 2809 "objc-parse.y"
 {
 	    	  yyval.ttype = NULL_TREE;
 		;
     break;}
 case 515:
-#line 2814 "objc-parse.y"
+#line 2813 "objc-parse.y"
 {
 		  /* oh what a kludge! */
 		  yyval.ttype = objc_ellipsis_node;
 		;
     break;}
 case 516:
-#line 2819 "objc-parse.y"
+#line 2818 "objc-parse.y"
 {
 		  pushlevel (0);
 		;
     break;}
 case 517:
-#line 2823 "objc-parse.y"
+#line 2822 "objc-parse.y"
 {
 	  	  /* returns a tree list node generated by get_parm_info */
 		  yyval.ttype = yyvsp[0].ttype;
@@ -4903,119 +4902,119 @@ case 517:
 		;
     break;}
 case 520:
-#line 2838 "objc-parse.y"
+#line 2837 "objc-parse.y"
 {
 		  yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 525:
-#line 2851 "objc-parse.y"
+#line 2850 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 526:
-#line 2852 "objc-parse.y"
+#line 2851 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 527:
-#line 2853 "objc-parse.y"
+#line 2852 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 528:
-#line 2854 "objc-parse.y"
+#line 2853 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 529:
-#line 2855 "objc-parse.y"
+#line 2854 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 530:
-#line 2856 "objc-parse.y"
+#line 2855 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 531:
-#line 2857 "objc-parse.y"
+#line 2856 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 532:
-#line 2858 "objc-parse.y"
+#line 2857 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 533:
-#line 2859 "objc-parse.y"
+#line 2858 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 534:
-#line 2860 "objc-parse.y"
+#line 2859 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 535:
-#line 2861 "objc-parse.y"
+#line 2860 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 536:
-#line 2862 "objc-parse.y"
+#line 2861 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 537:
-#line 2863 "objc-parse.y"
+#line 2862 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 538:
-#line 2864 "objc-parse.y"
+#line 2863 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 539:
-#line 2865 "objc-parse.y"
+#line 2864 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 540:
-#line 2866 "objc-parse.y"
+#line 2865 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 541:
-#line 2867 "objc-parse.y"
+#line 2866 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 542:
-#line 2868 "objc-parse.y"
+#line 2867 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 543:
-#line 2869 "objc-parse.y"
+#line 2868 "objc-parse.y"
 { yyval.ttype = get_identifier (token_buffer); ;
     break;}
 case 546:
-#line 2875 "objc-parse.y"
+#line 2874 "objc-parse.y"
 {
 		  yyval.ttype = build_keyword_decl (yyvsp[-5].ttype, yyvsp[-2].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 547:
-#line 2880 "objc-parse.y"
+#line 2879 "objc-parse.y"
 {
 		  yyval.ttype = build_keyword_decl (yyvsp[-2].ttype, NULL_TREE, yyvsp[0].ttype);
 		;
     break;}
 case 548:
-#line 2885 "objc-parse.y"
+#line 2884 "objc-parse.y"
 {
 		  yyval.ttype = build_keyword_decl (NULL_TREE, yyvsp[-2].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 549:
-#line 2890 "objc-parse.y"
+#line 2889 "objc-parse.y"
 {
 		  yyval.ttype = build_keyword_decl (NULL_TREE, NULL_TREE, yyvsp[0].ttype);
 		;
     break;}
 case 553:
-#line 2903 "objc-parse.y"
+#line 2902 "objc-parse.y"
 {
 		  yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 554:
-#line 2911 "objc-parse.y"
+#line 2910 "objc-parse.y"
 {
 		  if (TREE_CHAIN (yyvsp[0].ttype) == NULL_TREE)
 		    /* just return the expr., remove a level of indirection */
@@ -5026,76 +5025,76 @@ case 554:
 		;
     break;}
 case 555:
-#line 2923 "objc-parse.y"
+#line 2922 "objc-parse.y"
 {
 		  yyval.ttype = build_tree_list (yyvsp[-2].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 556:
-#line 2927 "objc-parse.y"
+#line 2926 "objc-parse.y"
 {
 		  yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype);
 		;
     break;}
 case 558:
-#line 2935 "objc-parse.y"
+#line 2934 "objc-parse.y"
 {
 		  yyval.ttype = get_class_reference (yyvsp[0].ttype);
 		;
     break;}
 case 559:
-#line 2942 "objc-parse.y"
+#line 2941 "objc-parse.y"
 { objc_receiver_context = 1; ;
     break;}
 case 560:
-#line 2944 "objc-parse.y"
+#line 2943 "objc-parse.y"
 { objc_receiver_context = 0; ;
     break;}
 case 561:
-#line 2946 "objc-parse.y"
+#line 2945 "objc-parse.y"
 {
 		  yyval.ttype = build_tree_list (yyvsp[-3].ttype, yyvsp[-1].ttype);
 		;
     break;}
 case 565:
-#line 2959 "objc-parse.y"
+#line 2958 "objc-parse.y"
 {
 		  yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 566:
-#line 2966 "objc-parse.y"
+#line 2965 "objc-parse.y"
 {
 		  yyval.ttype = build_tree_list (yyvsp[-1].ttype, NULL_TREE);
 		;
     break;}
 case 567:
-#line 2970 "objc-parse.y"
+#line 2969 "objc-parse.y"
 {
 		  yyval.ttype = build_tree_list (NULL_TREE, NULL_TREE);
 		;
     break;}
 case 568:
-#line 2977 "objc-parse.y"
+#line 2976 "objc-parse.y"
 {
 		  yyval.ttype = yyvsp[-1].ttype;
 		;
     break;}
 case 569:
-#line 2984 "objc-parse.y"
+#line 2983 "objc-parse.y"
 {
 		  yyval.ttype = yyvsp[-1].ttype;
 		;
     break;}
 case 570:
-#line 2993 "objc-parse.y"
+#line 2992 "objc-parse.y"
 {
 		  yyval.ttype = groktypename (yyvsp[-1].ttype);
 		;
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/share/misc/bison.simple"
+#line 543 "/usr/lib/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -5315,5 +5314,5 @@ yyerrhandle:
     }
   return 1;
 }
-#line 2998 "objc-parse.y"
+#line 2997 "objc-parse.y"
 
diff --git a/gcc/objc/objc-parse.y b/gcc/objc/objc-parse.y
index 10e135f..7bf9119 100644
--- a/gcc/objc/objc-parse.y
+++ b/gcc/objc/objc-parse.y
@@ -706,8 +706,7 @@ primary:
 				     IDENTIFIER_POINTER (DECL_NAME ($$)));
 			  else if ((TYPE_MODE (TREE_TYPE (TREE_TYPE ($$)))
 				    != TYPE_MODE (integer_type_node))
-				   && (TREE_TYPE (TREE_TYPE ($$))
-				       != void_type_node))
+				   && !VOID_TYPE_P (TREE_TYPE (TREE_TYPE ($$))))
 			    pedwarn ("type mismatch in implicit declaration for built-in function `%s'",
 				     IDENTIFIER_POINTER (DECL_NAME ($$)));
 			  /* If it really returns void, change that to int.  */