* c-parse.in: Recognize protocol qualifiers in class

        definitions for objc.
        Include "output.h".
        (yyerror): Remove redundant decl.
        (yyprint): Fix prototype.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@18788 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 394 insertions, 381 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8985262b3f4..32846c42f2d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+Mon Mar 23 23:59:11 1998  H.J. Lu  (hjl@gnu.org)
+
+	* c-parse.in: Recognize protocol qualifiers in class
+	definitions for objc.
+	Include "output.h".
+	(yyerror): Remove redundant decl.
+	(yyprint): Fix prototype.
+
 Mon Mar 23 23:49:47 1998  Jeffrey A Law  (law@cygnus.com)
 
 	* cse.c (rtx_cost): Only call CONST_COSTS if it is defined.
diff --git a/gcc/c-parse.c b/gcc/c-parse.c
index c38a7ca6033..9b473277fe7 100644
--- a/gcc/c-parse.c
+++ b/gcc/c-parse.c
@@ -78,6 +78,7 @@
 #include "c-lex.h"
 #include "c-tree.h"
 #include "flags.h"
+#include "output.h"
 
 #ifdef MULTIBYTE_CHARS
 #include <stdlib.h>
@@ -93,18 +94,16 @@ char *language_string = "GNU C";
 extern int errno;
 #endif
 
-void yyerror ();
-
 /* Like YYERROR but do call yyerror.  */
 #define YYERROR1 { yyerror ("syntax error"); YYERROR; }
 
 /* Cause the `yydebug' variable to be defined.  */
 #define YYDEBUG 1
 
-#line 94 "c-parse.y"
+#line 93 "c-parse.y"
 typedef union {long itype; tree ttype; enum tree_code code;
 	char *filename; int lineno; int ends_in_label; } YYSTYPE;
-#line 210 "c-parse.y"
+#line 209 "c-parse.y"
 
 /* Number of statements (loosely speaking) and compound statements 
    seen so far.  */
@@ -130,7 +129,7 @@ static int undeclared_variable_notice;
 /* Tell yyparse how to print a token's value, if yydebug is set.  */
 
 #define YYPRINT(FILE,YYCHAR,YYLVAL) yyprint(FILE,YYCHAR,YYLVAL)
-extern void yyprint ();
+extern void yyprint			PROTO ((FILE *, int, YYSTYPE));
 #include <stdio.h>
 
 #ifndef __cplusplus
@@ -360,46 +359,46 @@ static const short yyrhs[] = {    -1,
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   239,   244,   258,   260,   260,   261,   263,   265,   266,   274,
-   278,   289,   294,   299,   301,   303,   304,   305,   310,   317,
-   319,   324,   329,   335,   337,   342,   347,   353,   355,   360,
-   367,   369,   372,   374,   376,   378,   380,   382,   384,   388,
-   392,   395,   398,   401,   405,   407,   410,   413,   417,   445,
-   451,   454,   457,   460,   462,   466,   470,   474,   476,   479,
-   483,   510,   512,   514,   516,   518,   520,   522,   524,   526,
-   528,   530,   532,   534,   536,   540,   542,   546,   548,   551,
-   555,   557,   564,   567,   570,   576,   675,   676,   678,   684,
-   686,   700,   723,   725,   727,   731,   737,   739,   744,   746,
-   751,   753,   754,   764,   769,   771,   772,   773,   780,   786,
-   791,   794,   802,   807,   809,   810,   811,   818,   829,   833,
-   839,   844,   849,   854,   856,   858,   867,   870,   874,   876,
-   878,   883,   887,   890,   894,   897,   899,   911,   914,   916,
-   918,   922,   926,   928,   931,   944,   947,   951,   953,   961,
-   962,   963,   967,   969,   975,   976,   977,   980,   982,   985,
-   987,   990,   993,   999,  1006,  1008,  1015,  1022,  1025,  1032,
-  1035,  1039,  1042,  1046,  1051,  1054,  1058,  1061,  1063,  1065,
-  1067,  1074,  1076,  1077,  1078,  1083,  1085,  1090,  1098,  1103,
-  1107,  1110,  1112,  1117,  1120,  1122,  1124,  1128,  1131,  1131,
-  1134,  1134,  1137,  1137,  1140,  1140,  1143,  1145,  1156,  1164,
-  1168,  1179,  1187,  1194,  1196,  1201,  1204,  1209,  1211,  1213,
-  1220,  1222,  1230,  1236,  1238,  1240,  1247,  1249,  1255,  1261,
-  1263,  1265,  1267,  1274,  1276,  1279,  1284,  1286,  1290,  1292,
-  1294,  1296,  1300,  1302,  1305,  1308,  1311,  1314,  1318,  1320,
-  1323,  1325,  1329,  1332,  1337,  1339,  1341,  1355,  1362,  1367,
-  1373,  1378,  1380,  1385,  1387,  1391,  1395,  1399,  1409,  1411,
-  1416,  1421,  1424,  1428,  1431,  1435,  1438,  1441,  1444,  1448,
-  1451,  1455,  1459,  1461,  1463,  1465,  1467,  1469,  1471,  1473,
-  1483,  1491,  1493,  1495,  1499,  1501,  1504,  1507,  1518,  1520,
-  1525,  1527,  1530,  1544,  1547,  1550,  1552,  1554,  1562,  1570,
-  1581,  1586,  1589,  1603,  1612,  1616,  1620,  1624,  1630,  1634,
-  1639,  1642,  1647,  1650,  1651,  1668,  1673,  1676,  1688,  1690,
-  1700,  1710,  1711,  1719,  1722,  1734,  1738,  1755,  1765,  1774,
-  1779,  1784,  1789,  1793,  1797,  1808,  1815,  1822,  1829,  1840,
-  1846,  1849,  1854,  1877,  1911,  1936,  1967,  1982,  1993,  1997,
-  2001,  2004,  2009,  2011,  2014,  2016,  2020,  2025,  2028,  2034,
-  2039,  2044,  2046,  2055,  2056,  2062,  2064,  2074,  2076,  2080,
-  2083,  2089,  2099,  2108,  2117,  2127,  2141,  2146,  2151,  2153,
-  2162,  2165,  2170,  2173,  2177
+   238,   243,   257,   259,   259,   260,   262,   264,   265,   273,
+   277,   288,   293,   298,   300,   302,   303,   304,   309,   316,
+   318,   323,   328,   334,   336,   341,   346,   352,   354,   359,
+   366,   368,   371,   373,   375,   377,   379,   381,   383,   387,
+   391,   394,   397,   400,   404,   406,   409,   412,   416,   444,
+   450,   453,   456,   459,   461,   465,   469,   473,   475,   478,
+   482,   509,   511,   513,   515,   517,   519,   521,   523,   525,
+   527,   529,   531,   533,   535,   539,   541,   545,   547,   550,
+   554,   556,   563,   566,   569,   575,   674,   675,   677,   683,
+   685,   699,   722,   724,   726,   730,   736,   738,   743,   745,
+   750,   752,   753,   763,   768,   770,   771,   772,   779,   785,
+   790,   793,   801,   806,   808,   809,   810,   817,   828,   832,
+   838,   843,   848,   853,   855,   857,   866,   869,   873,   875,
+   877,   882,   886,   889,   893,   896,   898,   910,   913,   915,
+   917,   921,   925,   927,   930,   943,   946,   950,   952,   960,
+   961,   962,   966,   968,   974,   975,   976,   979,   981,   984,
+   986,   989,   992,   998,  1005,  1007,  1014,  1021,  1024,  1031,
+  1034,  1038,  1041,  1045,  1050,  1053,  1057,  1060,  1062,  1064,
+  1066,  1073,  1075,  1076,  1077,  1082,  1084,  1089,  1097,  1102,
+  1106,  1109,  1111,  1116,  1119,  1121,  1123,  1127,  1130,  1130,
+  1133,  1133,  1136,  1136,  1139,  1139,  1142,  1144,  1155,  1163,
+  1167,  1178,  1186,  1193,  1195,  1200,  1203,  1208,  1210,  1212,
+  1219,  1221,  1229,  1235,  1237,  1239,  1246,  1248,  1254,  1260,
+  1262,  1264,  1266,  1273,  1275,  1278,  1283,  1285,  1289,  1291,
+  1293,  1295,  1299,  1301,  1304,  1307,  1310,  1313,  1317,  1319,
+  1322,  1324,  1328,  1331,  1336,  1338,  1340,  1354,  1361,  1366,
+  1372,  1377,  1379,  1384,  1386,  1390,  1394,  1398,  1408,  1410,
+  1415,  1420,  1423,  1427,  1430,  1434,  1437,  1440,  1443,  1447,
+  1450,  1454,  1458,  1460,  1462,  1464,  1466,  1468,  1470,  1472,
+  1482,  1490,  1492,  1494,  1498,  1500,  1503,  1506,  1517,  1519,
+  1524,  1526,  1529,  1543,  1546,  1549,  1551,  1553,  1561,  1569,
+  1580,  1585,  1588,  1602,  1611,  1615,  1619,  1623,  1629,  1633,
+  1638,  1641,  1646,  1649,  1650,  1667,  1672,  1675,  1687,  1689,
+  1699,  1709,  1710,  1718,  1721,  1733,  1737,  1754,  1764,  1773,
+  1778,  1783,  1788,  1792,  1796,  1807,  1814,  1821,  1828,  1839,
+  1845,  1848,  1853,  1876,  1910,  1935,  1966,  1981,  1992,  1996,
+  2000,  2003,  2008,  2010,  2013,  2015,  2019,  2024,  2027,  2033,
+  2038,  2043,  2045,  2054,  2055,  2061,  2063,  2073,  2075,  2079,
+  2082,  2088,  2098,  2107,  2116,  2126,  2140,  2145,  2150,  2152,
+  2161,  2164,  2169,  2172,  2176
 };
 #endif
 
@@ -1170,7 +1169,7 @@ static const short yycheck[] = {    40,
     48,    49,    50,    51,    52
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison.simple"
+#line 3 "/usr/cygnus/latest-940103/share/bison.simple"
 
 /* Skeleton output parser for bison,
    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -1363,7 +1362,7 @@ __yy_memcpy (char *to, char *from, int count)
 #endif
 #endif
 
-#line 196 "/usr/share/bison.simple"
+#line 196 "/usr/cygnus/latest-940103/share/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 *.
@@ -1668,14 +1667,14 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 240 "c-parse.y"
+#line 239 "c-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids an empty source file");
 		  finish_file ();
 		;
     break;}
 case 2:
-#line 245 "c-parse.y"
+#line 244 "c-parse.y"
 {
 		  /* In case there were missing closebraces,
 		     get us back to the global binding level.  */
@@ -1685,15 +1684,15 @@ case 2:
 		;
     break;}
 case 3:
-#line 259 "c-parse.y"
+#line 258 "c-parse.y"
 {yyval.ttype = NULL_TREE; ;
     break;}
 case 5:
-#line 260 "c-parse.y"
+#line 259 "c-parse.y"
 {yyval.ttype = NULL_TREE; ;
     break;}
 case 9:
-#line 267 "c-parse.y"
+#line 266 "c-parse.y"
 { STRIP_NOPS (yyvsp[-2].ttype);
 		  if ((TREE_CODE (yyvsp[-2].ttype) == ADDR_EXPR
 		       && TREE_CODE (TREE_OPERAND (yyvsp[-2].ttype, 0)) == STRING_CST)
@@ -1703,11 +1702,11 @@ case 9:
 		    error ("argument of `asm' is not a constant string"); ;
     break;}
 case 10:
-#line 275 "c-parse.y"
+#line 274 "c-parse.y"
 { pedantic = yyvsp[-1].itype; ;
     break;}
 case 11:
-#line 280 "c-parse.y"
+#line 279 "c-parse.y"
 { if (pedantic)
 		    error ("ANSI C forbids data definition with no type or storage class");
 		  else if (!flag_traditional)
@@ -1719,45 +1718,45 @@ case 11:
 		  resume_momentary (yyvsp[-2].itype); ;
     break;}
 case 12:
-#line 290 "c-parse.y"
+#line 289 "c-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary (yyvsp[-2].itype); ;
     break;}
 case 13:
-#line 295 "c-parse.y"
+#line 294 "c-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary (yyvsp[-2].itype);  ;
     break;}
 case 14:
-#line 300 "c-parse.y"
+#line 299 "c-parse.y"
 { pedwarn ("empty declaration"); ;
     break;}
 case 15:
-#line 302 "c-parse.y"
+#line 301 "c-parse.y"
 { shadow_tag (yyvsp[-1].ttype); ;
     break;}
 case 18:
-#line 306 "c-parse.y"
+#line 305 "c-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C does not allow extra `;' outside of a function"); ;
     break;}
 case 19:
-#line 312 "c-parse.y"
+#line 311 "c-parse.y"
 { if (! start_function (current_declspecs, yyvsp[0].ttype,
 					prefix_attributes, NULL_TREE, 0))
 		    YYERROR1;
 		  reinit_parse_for_function (); ;
     break;}
 case 20:
-#line 317 "c-parse.y"
+#line 316 "c-parse.y"
 { store_parm_decls (); ;
     break;}
 case 21:
-#line 319 "c-parse.y"
+#line 318 "c-parse.y"
 { finish_function (0); 
 		  current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
@@ -1765,25 +1764,25 @@ case 21:
 		  resume_momentary (yyvsp[-5].itype); ;
     break;}
 case 22:
-#line 325 "c-parse.y"
+#line 324 "c-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary (yyvsp[-2].itype); ;
     break;}
 case 23:
-#line 330 "c-parse.y"
+#line 329 "c-parse.y"
 { if (! start_function (current_declspecs, yyvsp[0].ttype,
 					prefix_attributes, NULL_TREE, 0))
 		    YYERROR1;
 		  reinit_parse_for_function (); ;
     break;}
 case 24:
-#line 335 "c-parse.y"
+#line 334 "c-parse.y"
 { store_parm_decls (); ;
     break;}
 case 25:
-#line 337 "c-parse.y"
+#line 336 "c-parse.y"
 { finish_function (0); 
 		  current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
@@ -1791,25 +1790,25 @@ case 25:
 		  resume_momentary (yyvsp[-5].itype); ;
     break;}
 case 26:
-#line 343 "c-parse.y"
+#line 342 "c-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary (yyvsp[-2].itype); ;
     break;}
 case 27:
-#line 348 "c-parse.y"
+#line 347 "c-parse.y"
 { if (! start_function (NULL_TREE, yyvsp[0].ttype,
 					prefix_attributes, NULL_TREE, 0))
 		    YYERROR1;
 		  reinit_parse_for_function (); ;
     break;}
 case 28:
-#line 353 "c-parse.y"
+#line 352 "c-parse.y"
 { store_parm_decls (); ;
     break;}
 case 29:
-#line 355 "c-parse.y"
+#line 354 "c-parse.y"
 { finish_function (0); 
 		  current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
@@ -1817,72 +1816,72 @@ case 29:
 		  resume_momentary (yyvsp[-5].itype); ;
     break;}
 case 30:
-#line 361 "c-parse.y"
+#line 360 "c-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary (yyvsp[-2].itype); ;
     break;}
 case 33:
-#line 373 "c-parse.y"
+#line 372 "c-parse.y"
 { yyval.code = ADDR_EXPR; ;
     break;}
 case 34:
-#line 375 "c-parse.y"
+#line 374 "c-parse.y"
 { yyval.code = NEGATE_EXPR; ;
     break;}
 case 35:
-#line 377 "c-parse.y"
+#line 376 "c-parse.y"
 { yyval.code = CONVERT_EXPR; ;
     break;}
 case 36:
-#line 379 "c-parse.y"
+#line 378 "c-parse.y"
 { yyval.code = PREINCREMENT_EXPR; ;
     break;}
 case 37:
-#line 381 "c-parse.y"
+#line 380 "c-parse.y"
 { yyval.code = PREDECREMENT_EXPR; ;
     break;}
 case 38:
-#line 383 "c-parse.y"
+#line 382 "c-parse.y"
 { yyval.code = BIT_NOT_EXPR; ;
     break;}
 case 39:
-#line 385 "c-parse.y"
+#line 384 "c-parse.y"
 { yyval.code = TRUTH_NOT_EXPR; ;
     break;}
 case 40:
-#line 389 "c-parse.y"
+#line 388 "c-parse.y"
 { yyval.ttype = build_compound_expr (yyvsp[0].ttype); ;
     break;}
 case 41:
-#line 394 "c-parse.y"
+#line 393 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 43:
-#line 400 "c-parse.y"
+#line 399 "c-parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 44:
-#line 402 "c-parse.y"
+#line 401 "c-parse.y"
 { chainon (yyvsp[-2].ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 46:
-#line 408 "c-parse.y"
+#line 407 "c-parse.y"
 { yyval.ttype = build_indirect_ref (yyvsp[0].ttype, "unary *"); ;
     break;}
 case 47:
-#line 411 "c-parse.y"
+#line 410 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  pedantic = yyvsp[-1].itype; ;
     break;}
 case 48:
-#line 414 "c-parse.y"
+#line 413 "c-parse.y"
 { yyval.ttype = build_unary_op (yyvsp[-1].code, yyvsp[0].ttype, 0);
 		  overflow_warning (yyval.ttype); ;
     break;}
 case 49:
-#line 418 "c-parse.y"
+#line 417 "c-parse.y"
 { tree label = lookup_label (yyvsp[0].ttype);
 		  if (pedantic)
 		    pedwarn ("ANSI C forbids `&&'");
@@ -1897,7 +1896,7 @@ case 49:
 		;
     break;}
 case 50:
-#line 446 "c-parse.y"
+#line 445 "c-parse.y"
 { skip_evaluation--;
 		  if (TREE_CODE (yyvsp[0].ttype) == COMPONENT_REF
 		      && DECL_C_BIT_FIELD (TREE_OPERAND (yyvsp[0].ttype, 1)))
@@ -1905,49 +1904,49 @@ case 50:
 		  yyval.ttype = c_sizeof (TREE_TYPE (yyvsp[0].ttype)); ;
     break;}
 case 51:
-#line 452 "c-parse.y"
+#line 451 "c-parse.y"
 { skip_evaluation--;
 		  yyval.ttype = c_sizeof (groktypename (yyvsp[-1].ttype)); ;
     break;}
 case 52:
-#line 455 "c-parse.y"
+#line 454 "c-parse.y"
 { skip_evaluation--;
 		  yyval.ttype = c_alignof_expr (yyvsp[0].ttype); ;
     break;}
 case 53:
-#line 458 "c-parse.y"
+#line 457 "c-parse.y"
 { skip_evaluation--;
 		  yyval.ttype = c_alignof (groktypename (yyvsp[-1].ttype)); ;
     break;}
 case 54:
-#line 461 "c-parse.y"
+#line 460 "c-parse.y"
 { yyval.ttype = build_unary_op (REALPART_EXPR, yyvsp[0].ttype, 0); ;
     break;}
 case 55:
-#line 463 "c-parse.y"
+#line 462 "c-parse.y"
 { yyval.ttype = build_unary_op (IMAGPART_EXPR, yyvsp[0].ttype, 0); ;
     break;}
 case 56:
-#line 467 "c-parse.y"
+#line 466 "c-parse.y"
 { skip_evaluation++; ;
     break;}
 case 57:
-#line 471 "c-parse.y"
+#line 470 "c-parse.y"
 { skip_evaluation++; ;
     break;}
 case 59:
-#line 477 "c-parse.y"
+#line 476 "c-parse.y"
 { tree type = groktypename (yyvsp[-2].ttype);
 		  yyval.ttype = build_c_cast (type, yyvsp[0].ttype); ;
     break;}
 case 60:
-#line 480 "c-parse.y"
+#line 479 "c-parse.y"
 { start_init (NULL_TREE, NULL, 0);
 		  yyvsp[-2].ttype = groktypename (yyvsp[-2].ttype);
 		  really_start_incremental_init (yyvsp[-2].ttype); ;
     break;}
 case 61:
-#line 484 "c-parse.y"
+#line 483 "c-parse.y"
 { char *name;
 		  tree result = pop_init_level (0);
 		  tree type = yyvsp[-5].ttype;
@@ -1974,90 +1973,90 @@ case 61:
 		;
     break;}
 case 63:
-#line 513 "c-parse.y"
+#line 512 "c-parse.y"
 { yyval.ttype = parser_build_binary_op (yyvsp[-1].code, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 64:
-#line 515 "c-parse.y"
+#line 514 "c-parse.y"
 { yyval.ttype = parser_build_binary_op (yyvsp[-1].code, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 65:
-#line 517 "c-parse.y"
+#line 516 "c-parse.y"
 { yyval.ttype = parser_build_binary_op (yyvsp[-1].code, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 66:
-#line 519 "c-parse.y"
+#line 518 "c-parse.y"
 { yyval.ttype = parser_build_binary_op (yyvsp[-1].code, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 67:
-#line 521 "c-parse.y"
+#line 520 "c-parse.y"
 { yyval.ttype = parser_build_binary_op (yyvsp[-1].code, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 68:
-#line 523 "c-parse.y"
+#line 522 "c-parse.y"
 { yyval.ttype = parser_build_binary_op (yyvsp[-1].code, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 69:
-#line 525 "c-parse.y"
+#line 524 "c-parse.y"
 { yyval.ttype = parser_build_binary_op (yyvsp[-1].code, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 70:
-#line 527 "c-parse.y"
+#line 526 "c-parse.y"
 { yyval.ttype = parser_build_binary_op (yyvsp[-1].code, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 71:
-#line 529 "c-parse.y"
+#line 528 "c-parse.y"
 { yyval.ttype = parser_build_binary_op (yyvsp[-1].code, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 72:
-#line 531 "c-parse.y"
+#line 530 "c-parse.y"
 { yyval.ttype = parser_build_binary_op (yyvsp[-1].code, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 73:
-#line 533 "c-parse.y"
+#line 532 "c-parse.y"
 { yyval.ttype = parser_build_binary_op (yyvsp[-1].code, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 74:
-#line 535 "c-parse.y"
+#line 534 "c-parse.y"
 { yyval.ttype = parser_build_binary_op (yyvsp[-1].code, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 75:
-#line 537 "c-parse.y"
+#line 536 "c-parse.y"
 { yyvsp[-1].ttype = truthvalue_conversion (default_conversion (yyvsp[-1].ttype));
 		  skip_evaluation += yyvsp[-1].ttype == boolean_false_node; ;
     break;}
 case 76:
-#line 540 "c-parse.y"
+#line 539 "c-parse.y"
 { skip_evaluation -= yyvsp[-3].ttype == boolean_false_node;
 		  yyval.ttype = parser_build_binary_op (TRUTH_ANDIF_EXPR, yyvsp[-3].ttype, yyvsp[0].ttype); ;
     break;}
 case 77:
-#line 543 "c-parse.y"
+#line 542 "c-parse.y"
 { yyvsp[-1].ttype = truthvalue_conversion (default_conversion (yyvsp[-1].ttype));
 		  skip_evaluation += yyvsp[-1].ttype == boolean_true_node; ;
     break;}
 case 78:
-#line 546 "c-parse.y"
+#line 545 "c-parse.y"
 { skip_evaluation -= yyvsp[-3].ttype == boolean_true_node;
 		  yyval.ttype = parser_build_binary_op (TRUTH_ORIF_EXPR, yyvsp[-3].ttype, yyvsp[0].ttype); ;
     break;}
 case 79:
-#line 549 "c-parse.y"
+#line 548 "c-parse.y"
 { yyvsp[-1].ttype = truthvalue_conversion (default_conversion (yyvsp[-1].ttype));
 		  skip_evaluation += yyvsp[-1].ttype == boolean_false_node; ;
     break;}
 case 80:
-#line 552 "c-parse.y"
+#line 551 "c-parse.y"
 { skip_evaluation += ((yyvsp[-4].ttype == boolean_true_node)
 				      - (yyvsp[-4].ttype == boolean_false_node)); ;
     break;}
 case 81:
-#line 555 "c-parse.y"
+#line 554 "c-parse.y"
 { skip_evaluation -= yyvsp[-6].ttype == boolean_true_node;
 		  yyval.ttype = build_conditional_expr (yyvsp[-6].ttype, yyvsp[-3].ttype, yyvsp[0].ttype); ;
     break;}
 case 82:
-#line 558 "c-parse.y"
+#line 557 "c-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids omitting the middle term of a ?: expression");
 		  /* Make sure first operand is calculated only once.  */
@@ -2066,23 +2065,23 @@ case 82:
 		  skip_evaluation += yyvsp[-1].ttype == boolean_true_node; ;
     break;}
 case 83:
-#line 565 "c-parse.y"
+#line 564 "c-parse.y"
 { skip_evaluation -= yyvsp[-4].ttype == boolean_true_node;
 		  yyval.ttype = build_conditional_expr (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[0].ttype); ;
     break;}
 case 84:
-#line 568 "c-parse.y"
+#line 567 "c-parse.y"
 { yyval.ttype = build_modify_expr (yyvsp[-2].ttype, NOP_EXPR, yyvsp[0].ttype);
 		  C_SET_EXP_ORIGINAL_CODE (yyval.ttype, MODIFY_EXPR); ;
     break;}
 case 85:
-#line 571 "c-parse.y"
+#line 570 "c-parse.y"
 { yyval.ttype = build_modify_expr (yyvsp[-2].ttype, yyvsp[-1].code, yyvsp[0].ttype);
 		  /* This inhibits warnings in truthvalue_conversion.  */
 		  C_SET_EXP_ORIGINAL_CODE (yyval.ttype, ERROR_MARK); ;
     break;}
 case 86:
-#line 578 "c-parse.y"
+#line 577 "c-parse.y"
 {
 		  yyval.ttype = lastiddecl;
 		  if (!yyval.ttype || yyval.ttype == error_mark_node)
@@ -2182,11 +2181,11 @@ case 86:
 		;
     break;}
 case 88:
-#line 677 "c-parse.y"
+#line 676 "c-parse.y"
 { yyval.ttype = combine_strings (yyvsp[0].ttype); ;
     break;}
 case 89:
-#line 679 "c-parse.y"
+#line 678 "c-parse.y"
 { char class = TREE_CODE_CLASS (TREE_CODE (yyvsp[-1].ttype));
 		  if (class == 'e' || class == '1'
 		      || class == '2' || class == '<')
@@ -2194,11 +2193,11 @@ case 89:
 		  yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 90:
-#line 685 "c-parse.y"
+#line 684 "c-parse.y"
 { yyval.ttype = error_mark_node; ;
     break;}
 case 91:
-#line 687 "c-parse.y"
+#line 686 "c-parse.y"
 { if (current_function_decl == 0)
 		    {
 		      error ("braced-group within expression allowed only inside a function");
@@ -2214,7 +2213,7 @@ case 91:
 		  yyval.ttype = expand_start_stmt_expr (); ;
     break;}
 case 92:
-#line 701 "c-parse.y"
+#line 700 "c-parse.y"
 { tree rtl_exp;
 		  if (pedantic)
 		    pedwarn ("ANSI C forbids braced-groups within expressions");
@@ -2239,21 +2238,21 @@ case 92:
 		;
     break;}
 case 93:
-#line 724 "c-parse.y"
+#line 723 "c-parse.y"
 { yyval.ttype = build_function_call (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 94:
-#line 726 "c-parse.y"
+#line 725 "c-parse.y"
 { yyval.ttype = build_array_ref (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 95:
-#line 728 "c-parse.y"
+#line 727 "c-parse.y"
 {
 		    yyval.ttype = build_component_ref (yyvsp[-2].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 96:
-#line 732 "c-parse.y"
+#line 731 "c-parse.y"
 {
                   tree expr = build_indirect_ref (yyvsp[-2].ttype, "->");
 
@@ -2261,56 +2260,56 @@ case 96:
 		;
     break;}
 case 97:
-#line 738 "c-parse.y"
+#line 737 "c-parse.y"
 { yyval.ttype = build_unary_op (POSTINCREMENT_EXPR, yyvsp[-1].ttype, 0); ;
     break;}
 case 98:
-#line 740 "c-parse.y"
+#line 739 "c-parse.y"
 { yyval.ttype = build_unary_op (POSTDECREMENT_EXPR, yyvsp[-1].ttype, 0); ;
     break;}
 case 100:
-#line 747 "c-parse.y"
+#line 746 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 103:
-#line 756 "c-parse.y"
+#line 755 "c-parse.y"
 { c_mark_varargs ();
 		  if (pedantic)
 		    pedwarn ("ANSI C does not permit use of `varargs.h'"); ;
     break;}
 case 104:
-#line 766 "c-parse.y"
+#line 765 "c-parse.y"
 { ;
     break;}
 case 109:
-#line 782 "c-parse.y"
+#line 781 "c-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary (yyvsp[-2].itype); ;
     break;}
 case 110:
-#line 787 "c-parse.y"
+#line 786 "c-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);	
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary (yyvsp[-2].itype); ;
     break;}
 case 111:
-#line 792 "c-parse.y"
+#line 791 "c-parse.y"
 { shadow_tag_warned (yyvsp[-1].ttype, 1);
 		  pedwarn ("empty declaration"); ;
     break;}
 case 112:
-#line 795 "c-parse.y"
+#line 794 "c-parse.y"
 { pedwarn ("empty declaration"); ;
     break;}
 case 113:
-#line 804 "c-parse.y"
+#line 803 "c-parse.y"
 { ;
     break;}
 case 118:
-#line 819 "c-parse.y"
+#line 818 "c-parse.y"
 { yyval.itype = suspend_momentary ();
 		  pending_xref_error ();
 		  declspec_stack = tree_cons (prefix_attributes,
@@ -2320,131 +2319,131 @@ case 118:
 				     &current_declspecs, &prefix_attributes); ;
     break;}
 case 119:
-#line 830 "c-parse.y"
+#line 829 "c-parse.y"
 { prefix_attributes = chainon (prefix_attributes, yyvsp[0].ttype); ;
     break;}
 case 120:
-#line 835 "c-parse.y"
+#line 834 "c-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary (yyvsp[-2].itype); ;
     break;}
 case 121:
-#line 840 "c-parse.y"
+#line 839 "c-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary (yyvsp[-2].itype); ;
     break;}
 case 122:
-#line 845 "c-parse.y"
+#line 844 "c-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary (yyvsp[-1].itype); ;
     break;}
 case 123:
-#line 850 "c-parse.y"
+#line 849 "c-parse.y"
 { current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
 		  declspec_stack = TREE_CHAIN (declspec_stack);
 		  resume_momentary (yyvsp[-1].itype); ;
     break;}
 case 124:
-#line 855 "c-parse.y"
+#line 854 "c-parse.y"
 { shadow_tag (yyvsp[-1].ttype); ;
     break;}
 case 125:
-#line 857 "c-parse.y"
+#line 856 "c-parse.y"
 { pedwarn ("empty declaration"); ;
     break;}
 case 126:
-#line 859 "c-parse.y"
+#line 858 "c-parse.y"
 { pedantic = yyvsp[-1].itype; ;
     break;}
 case 127:
-#line 869 "c-parse.y"
+#line 868 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 128:
-#line 871 "c-parse.y"
+#line 870 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[0].ttype, tree_cons (NULL_TREE, yyvsp[-1].ttype, yyvsp[-2].ttype)); ;
     break;}
 case 129:
-#line 875 "c-parse.y"
+#line 874 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 130:
-#line 877 "c-parse.y"
+#line 876 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 131:
-#line 879 "c-parse.y"
+#line 878 "c-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 132:
-#line 884 "c-parse.y"
+#line 883 "c-parse.y"
 { yyval.ttype = tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 133:
-#line 889 "c-parse.y"
+#line 888 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 134:
-#line 891 "c-parse.y"
+#line 890 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[0].ttype, tree_cons (NULL_TREE, yyvsp[-1].ttype, yyvsp[-2].ttype)); ;
     break;}
 case 135:
-#line 896 "c-parse.y"
+#line 895 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 136:
-#line 898 "c-parse.y"
+#line 897 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 137:
-#line 900 "c-parse.y"
+#line 899 "c-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 138:
-#line 913 "c-parse.y"
+#line 912 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 139:
-#line 915 "c-parse.y"
+#line 914 "c-parse.y"
 { yyval.ttype = tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); ;
     break;}
 case 140:
-#line 917 "c-parse.y"
+#line 916 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 141:
-#line 919 "c-parse.y"
+#line 918 "c-parse.y"
 { yyval.ttype = tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 142:
-#line 924 "c-parse.y"
+#line 923 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, NULL_TREE);
 		  TREE_STATIC (yyval.ttype) = 1; ;
     break;}
 case 143:
-#line 927 "c-parse.y"
+#line 926 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 144:
-#line 929 "c-parse.y"
+#line 928 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype);
 		  TREE_STATIC (yyval.ttype) = 1; ;
     break;}
 case 145:
-#line 932 "c-parse.y"
+#line 931 "c-parse.y"
 { if (extra_warnings && TREE_STATIC (yyvsp[-1].ttype))
 		    warning ("`%s' is not at beginning of declaration",
 			     IDENTIFIER_POINTER (yyvsp[0].ttype));
@@ -2452,138 +2451,138 @@ case 145:
 		  TREE_STATIC (yyval.ttype) = TREE_STATIC (yyvsp[-1].ttype); ;
     break;}
 case 146:
-#line 946 "c-parse.y"
+#line 945 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 147:
-#line 948 "c-parse.y"
+#line 947 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[0].ttype, tree_cons (NULL_TREE, yyvsp[-1].ttype, yyvsp[-2].ttype)); ;
     break;}
 case 148:
-#line 952 "c-parse.y"
+#line 951 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 149:
-#line 954 "c-parse.y"
+#line 953 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 152:
-#line 964 "c-parse.y"
+#line 963 "c-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 153:
-#line 968 "c-parse.y"
+#line 967 "c-parse.y"
 { yyval.ttype = TREE_TYPE (yyvsp[-1].ttype); ;
     break;}
 case 154:
-#line 970 "c-parse.y"
+#line 969 "c-parse.y"
 { yyval.ttype = groktypename (yyvsp[-1].ttype); ;
     break;}
 case 162:
-#line 992 "c-parse.y"
+#line 991 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 163:
-#line 994 "c-parse.y"
+#line 993 "c-parse.y"
 { if (TREE_CHAIN (yyvsp[-1].ttype)) yyvsp[-1].ttype = combine_strings (yyvsp[-1].ttype);
 		  yyval.ttype = yyvsp[-1].ttype;
 		;
     break;}
 case 164:
-#line 1001 "c-parse.y"
+#line 1000 "c-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 165:
-#line 1006 "c-parse.y"
+#line 1005 "c-parse.y"
 { finish_init ();
 		  finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype); ;
     break;}
 case 166:
-#line 1009 "c-parse.y"
+#line 1008 "c-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 167:
-#line 1017 "c-parse.y"
+#line 1016 "c-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 168:
-#line 1022 "c-parse.y"
+#line 1021 "c-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 169:
-#line 1026 "c-parse.y"
+#line 1025 "c-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 170:
-#line 1034 "c-parse.y"
+#line 1033 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 171:
-#line 1036 "c-parse.y"
+#line 1035 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 172:
-#line 1041 "c-parse.y"
+#line 1040 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 173:
-#line 1043 "c-parse.y"
+#line 1042 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 174:
-#line 1048 "c-parse.y"
+#line 1047 "c-parse.y"
 { yyval.ttype = yyvsp[-2].ttype; ;
     break;}
 case 175:
-#line 1053 "c-parse.y"
+#line 1052 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 176:
-#line 1055 "c-parse.y"
+#line 1054 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 177:
-#line 1060 "c-parse.y"
+#line 1059 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 178:
-#line 1062 "c-parse.y"
+#line 1061 "c-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 179:
-#line 1064 "c-parse.y"
+#line 1063 "c-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-3].ttype, build_tree_list (NULL_TREE, yyvsp[-1].ttype)); ;
     break;}
 case 180:
-#line 1066 "c-parse.y"
+#line 1065 "c-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-5].ttype, tree_cons (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype)); ;
     break;}
 case 181:
-#line 1068 "c-parse.y"
+#line 1067 "c-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 187:
-#line 1086 "c-parse.y"
+#line 1085 "c-parse.y"
 { really_start_incremental_init (NULL_TREE);
 		  /* Note that the call to clear_momentary
 		     is in process_init_element.  */
 		  push_momentary (); ;
     break;}
 case 188:
-#line 1091 "c-parse.y"
+#line 1090 "c-parse.y"
 { yyval.ttype = pop_init_level (0);
 		  if (yyval.ttype == error_mark_node
 		      && ! (yychar == STRING || yychar == CONSTANT))
@@ -2592,48 +2591,48 @@ case 188:
 		    pop_momentary_nofree (); ;
     break;}
 case 189:
-#line 1099 "c-parse.y"
+#line 1098 "c-parse.y"
 { yyval.ttype = error_mark_node; ;
     break;}
 case 190:
-#line 1105 "c-parse.y"
+#line 1104 "c-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids empty initializer braces"); ;
     break;}
 case 194:
-#line 1119 "c-parse.y"
+#line 1118 "c-parse.y"
 { process_init_element (yyvsp[0].ttype); ;
     break;}
 case 195:
-#line 1121 "c-parse.y"
+#line 1120 "c-parse.y"
 { push_init_level (0); ;
     break;}
 case 196:
-#line 1123 "c-parse.y"
+#line 1122 "c-parse.y"
 { process_init_element (pop_init_level (0)); ;
     break;}
 case 198:
-#line 1129 "c-parse.y"
+#line 1128 "c-parse.y"
 { set_init_index (yyvsp[-4].ttype, yyvsp[-2].ttype); ;
     break;}
 case 200:
-#line 1132 "c-parse.y"
+#line 1131 "c-parse.y"
 { set_init_index (yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 202:
-#line 1135 "c-parse.y"
+#line 1134 "c-parse.y"
 { set_init_index (yyvsp[-1].ttype, NULL_TREE); ;
     break;}
 case 204:
-#line 1138 "c-parse.y"
+#line 1137 "c-parse.y"
 { set_init_label (yyvsp[-1].ttype); ;
     break;}
 case 206:
-#line 1141 "c-parse.y"
+#line 1140 "c-parse.y"
 { set_init_label (yyvsp[-1].ttype); ;
     break;}
 case 208:
-#line 1147 "c-parse.y"
+#line 1146 "c-parse.y"
 { push_c_function_context ();
 		  if (! start_function (current_declspecs, yyvsp[0].ttype,
 					prefix_attributes, NULL_TREE, 1))
@@ -2644,16 +2643,16 @@ case 208:
 		  reinit_parse_for_function (); ;
     break;}
 case 209:
-#line 1156 "c-parse.y"
+#line 1155 "c-parse.y"
 { store_parm_decls (); ;
     break;}
 case 210:
-#line 1164 "c-parse.y"
+#line 1163 "c-parse.y"
 { finish_function (1);
 		  pop_c_function_context (); ;
     break;}
 case 211:
-#line 1170 "c-parse.y"
+#line 1169 "c-parse.y"
 { push_c_function_context ();
 		  if (! start_function (current_declspecs, yyvsp[0].ttype,
 					prefix_attributes, NULL_TREE, 1))
@@ -2664,172 +2663,172 @@ case 211:
 		  reinit_parse_for_function (); ;
     break;}
 case 212:
-#line 1179 "c-parse.y"
+#line 1178 "c-parse.y"
 { store_parm_decls (); ;
     break;}
 case 213:
-#line 1187 "c-parse.y"
+#line 1186 "c-parse.y"
 { finish_function (1);
 		  pop_c_function_context (); ;
     break;}
 case 216:
-#line 1203 "c-parse.y"
+#line 1202 "c-parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 217:
-#line 1205 "c-parse.y"
+#line 1204 "c-parse.y"
 { yyval.ttype = build_nt (CALL_EXPR, yyvsp[-2].ttype, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 218:
-#line 1210 "c-parse.y"
+#line 1209 "c-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 219:
-#line 1212 "c-parse.y"
+#line 1211 "c-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 220:
-#line 1214 "c-parse.y"
+#line 1213 "c-parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 221:
-#line 1221 "c-parse.y"
+#line 1220 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 223:
-#line 1232 "c-parse.y"
+#line 1231 "c-parse.y"
 { yyval.ttype = build_nt (CALL_EXPR, yyvsp[-2].ttype, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 224:
-#line 1237 "c-parse.y"
+#line 1236 "c-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 225:
-#line 1239 "c-parse.y"
+#line 1238 "c-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 226:
-#line 1241 "c-parse.y"
+#line 1240 "c-parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 227:
-#line 1248 "c-parse.y"
+#line 1247 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 229:
-#line 1257 "c-parse.y"
+#line 1256 "c-parse.y"
 { yyval.ttype = build_nt (CALL_EXPR, yyvsp[-2].ttype, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 230:
-#line 1262 "c-parse.y"
+#line 1261 "c-parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 231:
-#line 1264 "c-parse.y"
+#line 1263 "c-parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 232:
-#line 1266 "c-parse.y"
+#line 1265 "c-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 233:
-#line 1268 "c-parse.y"
+#line 1267 "c-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 234:
-#line 1275 "c-parse.y"
+#line 1274 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 236:
-#line 1281 "c-parse.y"
+#line 1280 "c-parse.y"
 { yyval.ttype = start_struct (RECORD_TYPE, yyvsp[-1].ttype);
 		  /* Start scope of tag before parsing components.  */
 		;
     break;}
 case 237:
-#line 1285 "c-parse.y"
+#line 1284 "c-parse.y"
 { yyval.ttype = finish_struct (yyvsp[-3].ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 238:
-#line 1287 "c-parse.y"
+#line 1286 "c-parse.y"
 { yyval.ttype = finish_struct (start_struct (RECORD_TYPE, NULL_TREE),
 				      yyvsp[-2].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 239:
-#line 1291 "c-parse.y"
+#line 1290 "c-parse.y"
 { yyval.ttype = xref_tag (RECORD_TYPE, yyvsp[0].ttype); ;
     break;}
 case 240:
-#line 1293 "c-parse.y"
+#line 1292 "c-parse.y"
 { yyval.ttype = start_struct (UNION_TYPE, yyvsp[-1].ttype); ;
     break;}
 case 241:
-#line 1295 "c-parse.y"
+#line 1294 "c-parse.y"
 { yyval.ttype = finish_struct (yyvsp[-3].ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 242:
-#line 1297 "c-parse.y"
+#line 1296 "c-parse.y"
 { yyval.ttype = finish_struct (start_struct (UNION_TYPE, NULL_TREE),
 				      yyvsp[-2].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 243:
-#line 1301 "c-parse.y"
+#line 1300 "c-parse.y"
 { yyval.ttype = xref_tag (UNION_TYPE, yyvsp[0].ttype); ;
     break;}
 case 244:
-#line 1303 "c-parse.y"
+#line 1302 "c-parse.y"
 { yyvsp[0].itype = suspend_momentary ();
 		  yyval.ttype = start_enum (yyvsp[-1].ttype); ;
     break;}
 case 245:
-#line 1306 "c-parse.y"
+#line 1305 "c-parse.y"
 { yyval.ttype = finish_enum (yyvsp[-4].ttype, nreverse (yyvsp[-3].ttype), yyvsp[0].ttype);
 		  resume_momentary (yyvsp[-5].itype); ;
     break;}
 case 246:
-#line 1309 "c-parse.y"
+#line 1308 "c-parse.y"
 { yyvsp[0].itype = suspend_momentary ();
 		  yyval.ttype = start_enum (NULL_TREE); ;
     break;}
 case 247:
-#line 1312 "c-parse.y"
+#line 1311 "c-parse.y"
 { yyval.ttype = finish_enum (yyvsp[-4].ttype, nreverse (yyvsp[-3].ttype), yyvsp[0].ttype);
 		  resume_momentary (yyvsp[-5].itype); ;
     break;}
 case 248:
-#line 1315 "c-parse.y"
+#line 1314 "c-parse.y"
 { yyval.ttype = xref_tag (ENUMERAL_TYPE, yyvsp[0].ttype); ;
     break;}
 case 252:
-#line 1326 "c-parse.y"
+#line 1325 "c-parse.y"
 { if (pedantic) pedwarn ("comma at end of enumerator list"); ;
     break;}
 case 253:
-#line 1331 "c-parse.y"
+#line 1330 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 254:
-#line 1333 "c-parse.y"
+#line 1332 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype);
 		  pedwarn ("no semicolon at end of struct or union"); ;
     break;}
 case 255:
-#line 1338 "c-parse.y"
+#line 1337 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 256:
-#line 1340 "c-parse.y"
+#line 1339 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 257:
-#line 1342 "c-parse.y"
+#line 1341 "c-parse.y"
 { if (pedantic)
 		    pedwarn ("extra semicolon in struct or union specified"); ;
     break;}
 case 258:
-#line 1357 "c-parse.y"
+#line 1356 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
@@ -2837,14 +2836,14 @@ case 258:
 		  resume_momentary (yyvsp[-1].itype); ;
     break;}
 case 259:
-#line 1363 "c-parse.y"
+#line 1362 "c-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids member declarations with no members");
 		  shadow_tag(yyvsp[0].ttype);
 		  yyval.ttype = NULL_TREE; ;
     break;}
 case 260:
-#line 1368 "c-parse.y"
+#line 1367 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  current_declspecs = TREE_VALUE (declspec_stack);
 		  prefix_attributes = TREE_PURPOSE (declspec_stack);
@@ -2852,140 +2851,140 @@ case 260:
 		  resume_momentary (yyvsp[-1].itype); ;
     break;}
 case 261:
-#line 1374 "c-parse.y"
+#line 1373 "c-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids member declarations with no members");
 		  shadow_tag(yyvsp[0].ttype);
 		  yyval.ttype = NULL_TREE; ;
     break;}
 case 262:
-#line 1379 "c-parse.y"
+#line 1378 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 263:
-#line 1381 "c-parse.y"
+#line 1380 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  pedantic = yyvsp[-1].itype; ;
     break;}
 case 265:
-#line 1388 "c-parse.y"
+#line 1387 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 266:
-#line 1393 "c-parse.y"
+#line 1392 "c-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 267:
-#line 1397 "c-parse.y"
+#line 1396 "c-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 268:
-#line 1400 "c-parse.y"
+#line 1399 "c-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 270:
-#line 1412 "c-parse.y"
+#line 1411 "c-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 271:
-#line 1417 "c-parse.y"
+#line 1416 "c-parse.y"
 { yyval.ttype = error_mark_node; ;
     break;}
 case 272:
-#line 1423 "c-parse.y"
+#line 1422 "c-parse.y"
 { yyval.ttype = build_enumerator (yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 273:
-#line 1425 "c-parse.y"
+#line 1424 "c-parse.y"
 { yyval.ttype = build_enumerator (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 274:
-#line 1430 "c-parse.y"
+#line 1429 "c-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 275:
-#line 1432 "c-parse.y"
+#line 1431 "c-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 276:
-#line 1437 "c-parse.y"
+#line 1436 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 278:
-#line 1443 "c-parse.y"
+#line 1442 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 279:
-#line 1445 "c-parse.y"
+#line 1444 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 280:
-#line 1450 "c-parse.y"
+#line 1449 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 281:
-#line 1452 "c-parse.y"
+#line 1451 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 282:
-#line 1457 "c-parse.y"
+#line 1456 "c-parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 283:
-#line 1460 "c-parse.y"
+#line 1459 "c-parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 284:
-#line 1462 "c-parse.y"
+#line 1461 "c-parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 285:
-#line 1464 "c-parse.y"
+#line 1463 "c-parse.y"
 { yyval.ttype = build_nt (CALL_EXPR, yyvsp[-2].ttype, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 286:
-#line 1466 "c-parse.y"
+#line 1465 "c-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 287:
-#line 1468 "c-parse.y"
+#line 1467 "c-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 288:
-#line 1470 "c-parse.y"
+#line 1469 "c-parse.y"
 { yyval.ttype = build_nt (CALL_EXPR, NULL_TREE, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 289:
-#line 1472 "c-parse.y"
+#line 1471 "c-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 290:
-#line 1474 "c-parse.y"
+#line 1473 "c-parse.y"
 { yyval.ttype = build_nt (ARRAY_REF, NULL_TREE, NULL_TREE); ;
     break;}
 case 291:
-#line 1485 "c-parse.y"
+#line 1484 "c-parse.y"
 {
 		  if (pedantic && yyvsp[0].ends_in_label)
 		    pedwarn ("ANSI C forbids label at end of compound statement");
 		;
     break;}
 case 293:
-#line 1494 "c-parse.y"
+#line 1493 "c-parse.y"
 { yyval.ends_in_label = yyvsp[0].ends_in_label; ;
     break;}
 case 294:
-#line 1496 "c-parse.y"
+#line 1495 "c-parse.y"
 { yyval.ends_in_label = 0; ;
     break;}
 case 298:
-#line 1508 "c-parse.y"
+#line 1507 "c-parse.y"
 { emit_line_note (input_filename, lineno);
 		  pushlevel (0);
 		  clear_last_expr ();
@@ -2994,12 +2993,12 @@ case 298:
 		;
     break;}
 case 300:
-#line 1521 "c-parse.y"
+#line 1520 "c-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids label declarations"); ;
     break;}
 case 303:
-#line 1532 "c-parse.y"
+#line 1531 "c-parse.y"
 { tree link;
 		  for (link = yyvsp[-1].ttype; link; link = TREE_CHAIN (link))
 		    {
@@ -3010,19 +3009,19 @@ case 303:
 		;
     break;}
 case 304:
-#line 1546 "c-parse.y"
+#line 1545 "c-parse.y"
 {;
     break;}
 case 306:
-#line 1550 "c-parse.y"
+#line 1549 "c-parse.y"
 { compstmt_count++; ;
     break;}
 case 307:
-#line 1553 "c-parse.y"
+#line 1552 "c-parse.y"
 { yyval.ttype = convert (void_type_node, integer_zero_node); ;
     break;}
 case 308:
-#line 1555 "c-parse.y"
+#line 1554 "c-parse.y"
 { emit_line_note (input_filename, lineno);
 		  expand_end_bindings (getdecls (), 1, 0);
 		  yyval.ttype = poplevel (1, 1, 0);
@@ -3032,7 +3031,7 @@ case 308:
 		    pop_momentary (); ;
     break;}
 case 309:
-#line 1563 "c-parse.y"
+#line 1562 "c-parse.y"
 { emit_line_note (input_filename, lineno);
 		  expand_end_bindings (getdecls (), kept_level_p (), 0);
 		  yyval.ttype = poplevel (kept_level_p (), 0, 0);
@@ -3042,7 +3041,7 @@ case 309:
 		    pop_momentary (); ;
     break;}
 case 310:
-#line 1571 "c-parse.y"
+#line 1570 "c-parse.y"
 { emit_line_note (input_filename, lineno);
 		  expand_end_bindings (getdecls (), kept_level_p (), 0);
 		  yyval.ttype = poplevel (kept_level_p (), 0, 0);
@@ -3052,7 +3051,7 @@ case 310:
 		    pop_momentary (); ;
     break;}
 case 313:
-#line 1591 "c-parse.y"
+#line 1590 "c-parse.y"
 { emit_line_note (yyvsp[-5].filename, yyvsp[-4].lineno);
 		  c_expand_start_cond (truthvalue_conversion (yyvsp[-1].ttype), 0, 
 				       compstmt_count);
@@ -3062,7 +3061,7 @@ case 313:
 		  position_after_white_space (); ;
     break;}
 case 314:
-#line 1605 "c-parse.y"
+#line 1604 "c-parse.y"
 { stmt_count++;
 		  compstmt_count++;
 		  emit_line_note (yyvsp[-2].filename, yyvsp[-1].lineno);
@@ -3072,43 +3071,43 @@ case 314:
 		  position_after_white_space (); ;
     break;}
 case 315:
-#line 1613 "c-parse.y"
+#line 1612 "c-parse.y"
 { expand_loop_continue_here (); ;
     break;}
 case 316:
-#line 1617 "c-parse.y"
+#line 1616 "c-parse.y"
 { yyval.filename = input_filename; ;
     break;}
 case 317:
-#line 1621 "c-parse.y"
+#line 1620 "c-parse.y"
 { yyval.lineno = lineno; ;
     break;}
 case 318:
-#line 1626 "c-parse.y"
+#line 1625 "c-parse.y"
 { ;
     break;}
 case 319:
-#line 1631 "c-parse.y"
+#line 1630 "c-parse.y"
 { ;
     break;}
 case 320:
-#line 1636 "c-parse.y"
+#line 1635 "c-parse.y"
 { yyval.ends_in_label = yyvsp[0].ends_in_label; ;
     break;}
 case 321:
-#line 1641 "c-parse.y"
+#line 1640 "c-parse.y"
 { yyval.ends_in_label = 0; ;
     break;}
 case 322:
-#line 1643 "c-parse.y"
+#line 1642 "c-parse.y"
 { yyval.ends_in_label = 1; ;
     break;}
 case 323:
-#line 1649 "c-parse.y"
+#line 1648 "c-parse.y"
 { stmt_count++; ;
     break;}
 case 325:
-#line 1652 "c-parse.y"
+#line 1651 "c-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
@@ -3127,19 +3126,19 @@ case 325:
 		  clear_momentary (); ;
     break;}
 case 326:
-#line 1669 "c-parse.y"
+#line 1668 "c-parse.y"
 { c_expand_start_else ();
 		  yyvsp[-1].itype = stmt_count;
 		  position_after_white_space (); ;
     break;}
 case 327:
-#line 1673 "c-parse.y"
+#line 1672 "c-parse.y"
 { c_expand_end_cond ();
 		  if (extra_warnings && stmt_count == yyvsp[-3].itype)
 		    warning ("empty body in an else-statement"); ;
     break;}
 case 328:
-#line 1677 "c-parse.y"
+#line 1676 "c-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
@@ -3150,11 +3149,11 @@ case 328:
 						"empty body in an if-statement"); ;
     break;}
 case 329:
-#line 1689 "c-parse.y"
+#line 1688 "c-parse.y"
 { c_expand_end_cond (); ;
     break;}
 case 330:
-#line 1691 "c-parse.y"
+#line 1690 "c-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-2].filename, yyvsp[-1].lineno);
 		  /* The emit_nop used to come before emit_line_note,
@@ -3166,7 +3165,7 @@ case 330:
 		  emit_nop (); ;
     break;}
 case 331:
-#line 1701 "c-parse.y"
+#line 1700 "c-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.  */
@@ -3177,11 +3176,11 @@ case 331:
 		  position_after_white_space (); ;
     break;}
 case 332:
-#line 1710 "c-parse.y"
+#line 1709 "c-parse.y"
 { expand_end_loop (); ;
     break;}
 case 333:
-#line 1713 "c-parse.y"
+#line 1712 "c-parse.y"
 { emit_line_note (input_filename, lineno);
 		  expand_exit_loop_if_false (NULL_PTR,
 					     truthvalue_conversion (yyvsp[-2].ttype));
@@ -3189,12 +3188,12 @@ case 333:
 		  clear_momentary (); ;
     break;}
 case 334:
-#line 1720 "c-parse.y"
+#line 1719 "c-parse.y"
 { expand_end_loop ();
 		  clear_momentary (); ;
     break;}
 case 335:
-#line 1724 "c-parse.y"
+#line 1723 "c-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-5].filename, yyvsp[-4].lineno);
 		  /* See comment in `while' alternative, above.  */
@@ -3207,12 +3206,12 @@ case 335:
 		;
     break;}
 case 336:
-#line 1736 "c-parse.y"
+#line 1735 "c-parse.y"
 { yyvsp[0].lineno = lineno;
 		  yyval.filename = input_filename; ;
     break;}
 case 337:
-#line 1739 "c-parse.y"
+#line 1738 "c-parse.y"
 { 
 		  /* Start the loop.  Doing this after parsing
 		     all the expressions ensures we will end the loop.  */
@@ -3230,7 +3229,7 @@ case 337:
 		  position_after_white_space (); ;
     break;}
 case 338:
-#line 1755 "c-parse.y"
+#line 1754 "c-parse.y"
 { /* Emit the increment expression, with a line number.  */
 		  emit_line_note (yyvsp[-4].filename, yyvsp[-5].lineno);
 		  expand_loop_continue_here ();
@@ -3243,7 +3242,7 @@ case 338:
 		  expand_end_loop (); ;
     break;}
 case 339:
-#line 1766 "c-parse.y"
+#line 1765 "c-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-5].filename, yyvsp[-4].lineno);
 		  c_expand_start_case (yyvsp[-1].ttype);
@@ -3253,7 +3252,7 @@ case 339:
 		  position_after_white_space (); ;
     break;}
 case 340:
-#line 1774 "c-parse.y"
+#line 1773 "c-parse.y"
 { expand_end_case (yyvsp[-3].ttype);
 		  if (yychar == CONSTANT || yychar == STRING)
 		    pop_momentary_nofree ();
@@ -3261,33 +3260,33 @@ case 340:
 		    pop_momentary (); ;
     break;}
 case 341:
-#line 1780 "c-parse.y"
+#line 1779 "c-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 342:
-#line 1785 "c-parse.y"
+#line 1784 "c-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 343:
-#line 1790 "c-parse.y"
+#line 1789 "c-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-3].filename, yyvsp[-2].lineno);
 		  c_expand_return (NULL_TREE); ;
     break;}
 case 344:
-#line 1794 "c-parse.y"
+#line 1793 "c-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-4].filename, yyvsp[-3].lineno);
 		  c_expand_return (yyvsp[-1].ttype); ;
     break;}
 case 345:
-#line 1798 "c-parse.y"
+#line 1797 "c-parse.y"
 { stmt_count++;
 		  emit_line_note (yyvsp[-7].filename, yyvsp[-6].lineno);
 		  STRIP_NOPS (yyvsp[-2].ttype);
@@ -3299,7 +3298,7 @@ case 345:
 		    error ("argument of `asm' is not a constant string"); ;
     break;}
 case 346:
-#line 1809 "c-parse.y"
+#line 1808 "c-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,
@@ -3307,7 +3306,7 @@ case 346:
 					 input_filename, lineno); ;
     break;}
 case 347:
-#line 1816 "c-parse.y"
+#line 1815 "c-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,
@@ -3315,7 +3314,7 @@ case 347:
 					 input_filename, lineno); ;
     break;}
 case 348:
-#line 1824 "c-parse.y"
+#line 1823 "c-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,
@@ -3323,7 +3322,7 @@ case 348:
 					 input_filename, lineno); ;
     break;}
 case 349:
-#line 1830 "c-parse.y"
+#line 1829 "c-parse.y"
 { tree decl;
 		  stmt_count++;
 		  emit_line_note (yyvsp[-4].filename, yyvsp[-3].lineno);
@@ -3336,7 +3335,7 @@ case 349:
 		;
     break;}
 case 350:
-#line 1841 "c-parse.y"
+#line 1840 "c-parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C forbids `goto *expr;'");
 		  stmt_count++;
@@ -3344,7 +3343,7 @@ case 350:
 		  expand_computed_goto (convert (ptr_type_node, yyvsp[-1].ttype)); ;
     break;}
 case 353:
-#line 1856 "c-parse.y"
+#line 1855 "c-parse.y"
 {
 	    /* The value returned by this action is  */
 	    /*      1 if everything is OK */ 
@@ -3367,14 +3366,14 @@ case 353:
 	  ;
     break;}
 case 354:
-#line 1877 "c-parse.y"
+#line 1876 "c-parse.y"
 {
 	    if (yyvsp[-1].itype)
 	      iterator_for_loop_end (yyvsp[-3].ttype);
 	  ;
     break;}
 case 355:
-#line 1912 "c-parse.y"
+#line 1911 "c-parse.y"
 { register tree value = check_case_value (yyvsp[-1].ttype);
 		  register tree label
 		    = build_decl (LABEL_DECL, NULL_TREE, NULL_TREE);
@@ -3401,7 +3400,7 @@ case 355:
 		  position_after_white_space (); ;
     break;}
 case 356:
-#line 1937 "c-parse.y"
+#line 1936 "c-parse.y"
 { register tree value1 = check_case_value (yyvsp[-3].ttype);
 		  register tree value2 = check_case_value (yyvsp[-1].ttype);
 		  register tree label
@@ -3434,7 +3433,7 @@ case 356:
 		  position_after_white_space (); ;
     break;}
 case 357:
-#line 1968 "c-parse.y"
+#line 1967 "c-parse.y"
 {
 		  tree duplicate;
 		  register tree label
@@ -3451,7 +3450,7 @@ case 357:
 		  position_after_white_space (); ;
     break;}
 case 358:
-#line 1983 "c-parse.y"
+#line 1982 "c-parse.y"
 { tree label = define_label (input_filename, lineno, yyvsp[-1].ttype);
 		  stmt_count++;
 		  emit_nop ();
@@ -3460,52 +3459,52 @@ case 358:
 		  position_after_white_space (); ;
     break;}
 case 359:
-#line 1995 "c-parse.y"
+#line 1994 "c-parse.y"
 { emit_line_note (input_filename, lineno);
 		  yyval.ttype = NULL_TREE; ;
     break;}
 case 360:
-#line 1998 "c-parse.y"
+#line 1997 "c-parse.y"
 { emit_line_note (input_filename, lineno); ;
     break;}
 case 361:
-#line 2003 "c-parse.y"
+#line 2002 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 363:
-#line 2010 "c-parse.y"
+#line 2009 "c-parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 366:
-#line 2017 "c-parse.y"
+#line 2016 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 367:
-#line 2022 "c-parse.y"
+#line 2021 "c-parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 368:
-#line 2027 "c-parse.y"
+#line 2026 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, combine_strings (yyvsp[0].ttype), NULL_TREE); ;
     break;}
 case 369:
-#line 2029 "c-parse.y"
+#line 2028 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, combine_strings (yyvsp[0].ttype), yyvsp[-2].ttype); ;
     break;}
 case 370:
-#line 2035 "c-parse.y"
+#line 2034 "c-parse.y"
 { pushlevel (0);
 		  clear_parm_order ();
 		  declare_parm_level (0); ;
     break;}
 case 371:
-#line 2039 "c-parse.y"
+#line 2038 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  parmlist_tags_warning ();
 		  poplevel (0, 0, 0); ;
     break;}
 case 373:
-#line 2047 "c-parse.y"
+#line 2046 "c-parse.y"
 { tree parm;
 		  if (pedantic)
 		    pedwarn ("ANSI C forbids forward parameter declarations");
@@ -3515,19 +3514,19 @@ case 373:
 		  clear_parm_order (); ;
     break;}
 case 374:
-#line 2055 "c-parse.y"
+#line 2054 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 375:
-#line 2057 "c-parse.y"
+#line 2056 "c-parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, NULL_TREE, NULL_TREE); ;
     break;}
 case 376:
-#line 2063 "c-parse.y"
+#line 2062 "c-parse.y"
 { yyval.ttype = get_parm_info (0); ;
     break;}
 case 377:
-#line 2065 "c-parse.y"
+#line 2064 "c-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.
@@ -3539,23 +3538,23 @@ case 377:
 		;
     break;}
 case 378:
-#line 2075 "c-parse.y"
+#line 2074 "c-parse.y"
 { yyval.ttype = get_parm_info (1); ;
     break;}
 case 379:
-#line 2077 "c-parse.y"
+#line 2076 "c-parse.y"
 { yyval.ttype = get_parm_info (0); ;
     break;}
 case 380:
-#line 2082 "c-parse.y"
+#line 2081 "c-parse.y"
 { push_parm_decl (yyvsp[0].ttype); ;
     break;}
 case 381:
-#line 2084 "c-parse.y"
+#line 2083 "c-parse.y"
 { push_parm_decl (yyvsp[0].ttype); ;
     break;}
 case 382:
-#line 2091 "c-parse.y"
+#line 2090 "c-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
@@ -3566,7 +3565,7 @@ case 382:
 		  resume_momentary (yyvsp[-2].itype); ;
     break;}
 case 383:
-#line 2100 "c-parse.y"
+#line 2099 "c-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
@@ -3577,7 +3576,7 @@ case 383:
 		  resume_momentary (yyvsp[-2].itype); ;
     break;}
 case 384:
-#line 2109 "c-parse.y"
+#line 2108 "c-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
@@ -3588,7 +3587,7 @@ case 384:
 		  resume_momentary (yyvsp[-2].itype); ;
     break;}
 case 385:
-#line 2118 "c-parse.y"
+#line 2117 "c-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
@@ -3599,7 +3598,7 @@ case 385:
 		  resume_momentary (yyvsp[-2].itype);  ;
     break;}
 case 386:
-#line 2128 "c-parse.y"
+#line 2127 "c-parse.y"
 { yyval.ttype = build_tree_list (build_tree_list (current_declspecs,
 							 yyvsp[-1].ttype),
 					build_tree_list (prefix_attributes,
@@ -3610,19 +3609,19 @@ case 386:
 		  resume_momentary (yyvsp[-2].itype);  ;
     break;}
 case 387:
-#line 2142 "c-parse.y"
+#line 2141 "c-parse.y"
 { pushlevel (0);
 		  clear_parm_order ();
 		  declare_parm_level (1); ;
     break;}
 case 388:
-#line 2146 "c-parse.y"
+#line 2145 "c-parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  parmlist_tags_warning ();
 		  poplevel (0, 0, 0); ;
     break;}
 case 390:
-#line 2154 "c-parse.y"
+#line 2153 "c-parse.y"
 { tree t;
 		  for (t = yyvsp[-1].ttype; t; t = TREE_CHAIN (t))
 		    if (TREE_VALUE (t) == NULL_TREE)
@@ -3630,29 +3629,29 @@ case 390:
 		  yyval.ttype = tree_cons (NULL_TREE, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 391:
-#line 2164 "c-parse.y"
+#line 2163 "c-parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 392:
-#line 2166 "c-parse.y"
+#line 2165 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 393:
-#line 2172 "c-parse.y"
+#line 2171 "c-parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 394:
-#line 2174 "c-parse.y"
+#line 2173 "c-parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 395:
-#line 2179 "c-parse.y"
+#line 2178 "c-parse.y"
 { yyval.itype = pedantic;
 		  pedantic = 0; ;
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/share/bison.simple"
+#line 498 "/usr/cygnus/latest-940103/share/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -3848,5 +3847,5 @@ yyerrhandle:
   yystate = yyn;
   goto yynewstate;
 }
-#line 2183 "c-parse.y"
+#line 2182 "c-parse.y"
 
diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index 47a3e29a536..c8705576243 100644
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -69,6 +69,7 @@ end ifc
 #include "c-lex.h"
 #include "c-tree.h"
 #include "flags.h"
+#include "output.h"
 
 #ifdef MULTIBYTE_CHARS
 #include <stdlib.h>
@@ -92,8 +93,6 @@ end ifc
 extern int errno;
 #endif
 
-void yyerror ();
-
 /* Like YYERROR but do call yyerror.  */
 #define YYERROR1 { yyerror ("syntax error"); YYERROR; }
 
@@ -270,7 +269,7 @@ end ifobjc
 /* Tell yyparse how to print a token's value, if yydebug is set.  */
 
 #define YYPRINT(FILE,YYCHAR,YYLVAL) yyprint(FILE,YYCHAR,YYLVAL)
-extern void yyprint ();
+extern void yyprint			PROTO ((FILE *, int, YYSTYPE));
 %}
 
 %%
@@ -2726,20 +2725,28 @@ semi_or_error:
 methodproto:
 	  '+'
 		{
+		  /* Remember protocol qualifiers in prototypes.  */
+		  remember_protocol_qualifiers ();
 		  objc_inherit_code = CLASS_METHOD_DECL;
 		}
 	  methoddecl
 		{
+		  /* Forget protocol qualifiers here.  */
+		  forget_protocol_qualifiers ();
 		  add_class_method (objc_interface_context, $3);
 		}
 	  semi_or_error
 
 	| '-'
 		{
+		  /* Remember protocol qualifiers in prototypes.  */
+		  remember_protocol_qualifiers ();
 		  objc_inherit_code = INSTANCE_METHOD_DECL;
 		}
 	  methoddecl
 		{
+		  /* Forget protocol qualifiers here.  */
+		  forget_protocol_qualifiers ();
 		  add_instance_method (objc_interface_context, $3);
 		}
 	  semi_or_error
diff --git a/gcc/c-parse.y b/gcc/c-parse.y
index 68d38e0983a..bb783f0acf6 100644
--- a/gcc/c-parse.y
+++ b/gcc/c-parse.y
@@ -65,6 +65,7 @@ State 434 contains 2 shift/reduce conflicts.  (Four ways to parse this.)  */
 #include "c-lex.h"
 #include "c-tree.h"
 #include "flags.h"
+#include "output.h"
 
 #ifdef MULTIBYTE_CHARS
 #include <stdlib.h>
@@ -80,8 +81,6 @@ char *language_string = "GNU C";
 extern int errno;
 #endif
 
-void yyerror ();
-
 /* Like YYERROR but do call yyerror.  */
 #define YYERROR1 { yyerror ("syntax error"); YYERROR; }
 
@@ -232,7 +231,7 @@ static int undeclared_variable_notice;
 /* Tell yyparse how to print a token's value, if yydebug is set.  */
 
 #define YYPRINT(FILE,YYCHAR,YYLVAL) yyprint(FILE,YYCHAR,YYLVAL)
-extern void yyprint ();
+extern void yyprint			PROTO ((FILE *, int, YYSTYPE));
 %}
 
 %%
diff --git a/gcc/objc/objc-parse.c b/gcc/objc/objc-parse.c
index 9678549e4a8..dde94809539 100644
--- a/gcc/objc/objc-parse.c
+++ b/gcc/objc/objc-parse.c
@@ -141,7 +141,7 @@ int objc_public_flag;
 /* Tell yyparse how to print a token's value, if yydebug is set.  */
 
 #define YYPRINT(FILE,YYCHAR,YYLVAL) yyprint(FILE,YYCHAR,YYLVAL)
-extern void yyprint 			PROTO ((FILE *, int, YYSTYPE));
+extern void yyprint			PROTO ((FILE *, int, YYSTYPE));
 #include <stdio.h>
 
 #ifndef __cplusplus
@@ -1638,7 +1638,7 @@ static const short yycheck[] = {     9,
     48,    49,    50,    51,    52
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/share/bison.simple"
+#line 3 "/usr/cygnus/latest-940103/share/bison.simple"
 
 /* Skeleton output parser for bison,
    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -1831,7 +1831,7 @@ __yy_memcpy (char *to, char *from, int count)
 #endif
 #endif
 
-#line 196 "/usr/share/bison.simple"
+#line 196 "/usr/cygnus/latest-940103/share/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 *.
@@ -2609,7 +2609,7 @@ case 89:
 			      if (IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype) != error_mark_node
 				  || IDENTIFIER_ERROR_LOCUS (yyvsp[0].ttype) != current_function_decl)
 				{
-				  error ("`%s' undeclared (first use this function)",
+				  error ("`%s' undeclared (first use in this function)",
 					 IDENTIFIER_POINTER (yyvsp[0].ttype));
 
 				  if (! undeclared_variable_notice)
@@ -4911,7 +4911,7 @@ case 556:
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/share/bison.simple"
+#line 498 "/usr/cygnus/latest-940103/share/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
diff --git a/gcc/objc/objc-parse.y b/gcc/objc/objc-parse.y
index a4884b37e41..115547325d4 100644
--- a/gcc/objc/objc-parse.y
+++ b/gcc/objc/objc-parse.y
@@ -231,7 +231,7 @@ int objc_public_flag;
 /* Tell yyparse how to print a token's value, if yydebug is set.  */
 
 #define YYPRINT(FILE,YYCHAR,YYLVAL) yyprint(FILE,YYCHAR,YYLVAL)
-extern void yyprint 			PROTO ((FILE *, int, YYSTYPE));
+extern void yyprint			PROTO ((FILE *, int, YYSTYPE));
 %}
 
 %%
@@ -635,7 +635,7 @@ primary:
 			      if (IDENTIFIER_GLOBAL_VALUE ($1) != error_mark_node
 				  || IDENTIFIER_ERROR_LOCUS ($1) != current_function_decl)
 				{
-				  error ("`%s' undeclared (first use this function)",
+				  error ("`%s' undeclared (first use in this function)",
 					 IDENTIFIER_POINTER ($1));
 
 				  if (! undeclared_variable_notice)