parse.y (DIR_SEPARATOR): New define.

	* parse.y (DIR_SEPARATOR): New define.
	(check_class_interface_creation): Use it.

From-SVN: r24367

gcc/java/ChangeLog

 1998-12-17  Tom Tromey  <tromey@cygnus.com>
 
+	* parse.y (DIR_SEPARATOR): New define.
+	(check_class_interface_creation): Use it.
+
 	* parse-scan.y (report_main_declaration): Recognize
 	`java.lang.String' in argument to main.
 

gcc/java/parse.c

@@ -146,6 +146,10 @@
 #include "convert.h"
 #include "buffer.h"
 
+#ifndef DIR_SEPARATOR
+#define DIR_SEPARATOR '/'
+#endif
+
 /* Local function prototypes */
 static char *java_accstring_lookup PROTO ((int));
 static void  classitf_redefinition_error PROTO ((char *,tree, tree, tree));
@@ -362,7 +366,7 @@ static tree wfl_append = NULL_TREE;
 /* The "toString" identifier used for String `+' operator. */
 static tree wfl_to_string = NULL_TREE;
 
-#line 290 "./parse.y"
+#line 294 "./parse.y"
 typedef union {
   tree node;
   int sub_token;
@@ -666,56 +670,56 @@ static const short yyrhs[] = {   123,
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   440,   446,   448,   449,   450,   451,   452,   456,   458,   461,
-   463,   464,   467,   469,   472,   476,   480,   484,   490,   492,
-   494,   496,   501,   503,   506,   510,   515,   520,   522,   523,
-   524,   525,   526,   527,   528,   531,   536,   542,   544,   547,
-   550,   552,   556,   558,   561,   588,   590,   594,   603,   605,
-   609,   616,   617,   619,   629,   634,   649,   653,   656,   659,
-   662,   664,   666,   668,   672,   674,   676,   678,   682,   684,
-   686,   693,   699,   704,   708,   711,   715,   717,   720,   722,
-   723,   724,   728,   730,   731,   733,   738,   741,   751,   754,
-   756,   760,   763,   770,   776,   784,   786,   788,   790,   792,
-   796,   798,   802,   809,   810,   814,   817,   819,   821,   823,
-   825,   827,   829,   831,   838,   841,   843,   852,   854,   858,
-   863,   868,   872,   877,   879,   881,   888,   890,   892,   896,
-   899,   901,   905,   907,   908,   913,   918,   924,   932,   939,
-   942,   945,   949,   952,   956,   965,   967,   969,   974,   981,
-   989,   991,   995,  1003,  1014,  1018,  1021,  1024,  1027,  1030,
-  1033,  1036,  1039,  1041,  1045,  1051,  1056,  1058,  1062,  1065,
-  1069,  1071,  1074,  1076,  1077,  1079,  1083,  1087,  1093,  1098,
-  1101,  1103,  1107,  1113,  1117,  1122,  1125,  1129,  1134,  1142,
-  1144,  1147,  1149,  1151,  1155,  1159,  1162,  1166,  1168,  1169,
-  1170,  1171,  1172,  1182,  1184,  1185,  1186,  1187,  1190,  1192,
-  1193,  1194,  1195,  1196,  1197,  1198,  1199,  1200,  1201,  1204,
-  1209,  1220,  1227,  1231,  1242,  1252,  1258,  1264,  1270,  1272,
-  1278,  1280,  1286,  1288,  1290,  1292,  1294,  1298,  1300,  1301,
-  1302,  1303,  1304,  1305,  1308,  1311,  1313,  1315,  1319,  1324,
-  1329,  1335,  1345,  1351,  1353,  1355,  1362,  1365,  1367,  1369,
-  1373,  1375,  1378,  1382,  1384,  1387,  1394,  1400,  1402,  1404,
-  1408,  1416,  1419,  1421,  1423,  1427,  1432,  1441,  1446,  1449,
-  1456,  1458,  1460,  1464,  1467,  1476,  1483,  1485,  1489,  1502,
-  1504,  1510,  1516,  1520,  1522,  1526,  1529,  1531,  1535,  1538,
-  1540,  1542,  1546,  1549,  1551,  1553,  1557,  1560,  1562,  1564,
-  1568,  1574,  1576,  1580,  1587,  1589,  1591,  1593,  1597,  1605,
-  1608,  1610,  1612,  1616,  1618,  1625,  1633,  1650,  1652,  1654,
-  1658,  1664,  1669,  1671,  1674,  1676,  1678,  1680,  1681,  1682,
-  1683,  1687,  1689,  1691,  1696,  1698,  1700,  1702,  1704,  1708,
-  1711,  1716,  1718,  1723,  1724,  1725,  1726,  1727,  1729,  1731,
-  1733,  1735,  1737,  1741,  1743,  1746,  1752,  1757,  1761,  1764,
-  1766,  1768,  1772,  1774,  1776,  1778,  1782,  1785,  1789,  1795,
-  1797,  1805,  1808,  1810,  1814,  1819,  1827,  1831,  1834,  1836,
-  1847,  1858,  1863,  1872,  1874,  1878,  1881,  1883,  1888,  1893,
-  1898,  1905,  1907,  1908,  1909,  1912,  1917,  1922,  1924,  1925,
-  1927,  1929,  1930,  1932,  1936,  1939,  1943,  1946,  1950,  1952,
-  1954,  1956,  1957,  1959,  1963,  1971,  1973,  1975,  1987,  1989,
-  1995,  1997,  1999,  2003,  2005,  2010,  2015,  2020,  2022,  2024,
-  2028,  2030,  2035,  2040,  2042,  2046,  2048,  2053,  2058,  2063,
-  2065,  2067,  2071,  2073,  2078,  2083,  2088,  2093,  2095,  2097,
-  2099,  2101,  2103,  2107,  2109,  2114,  2119,  2121,  2125,  2127,
-  2132,  2136,  2138,  2143,  2147,  2149,  2154,  2158,  2160,  2165,
-  2169,  2171,  2176,  2180,  2182,  2187,  2193,  2195,  2199,  2201,
-  2204,  2207,  2215,  2217,  2218,  2221,  2223,  2226,  2230
+   444,   450,   452,   453,   454,   455,   456,   460,   462,   465,
+   467,   468,   471,   473,   476,   480,   484,   488,   494,   496,
+   498,   500,   505,   507,   510,   514,   519,   524,   526,   527,
+   528,   529,   530,   531,   532,   535,   540,   546,   548,   551,
+   554,   556,   560,   562,   565,   592,   594,   598,   607,   609,
+   613,   620,   621,   623,   633,   638,   653,   657,   660,   663,
+   666,   668,   670,   672,   676,   678,   680,   682,   686,   688,
+   690,   697,   703,   708,   712,   715,   719,   721,   724,   726,
+   727,   728,   732,   734,   735,   737,   742,   745,   755,   758,
+   760,   764,   767,   774,   780,   788,   790,   792,   794,   796,
+   800,   802,   806,   813,   814,   818,   821,   823,   825,   827,
+   829,   831,   833,   835,   842,   845,   847,   856,   858,   862,
+   867,   872,   876,   881,   883,   885,   892,   894,   896,   900,
+   903,   905,   909,   911,   912,   917,   922,   928,   936,   943,
+   946,   949,   953,   956,   960,   969,   971,   973,   978,   985,
+   993,   995,   999,  1007,  1018,  1022,  1025,  1028,  1031,  1034,
+  1037,  1040,  1043,  1045,  1049,  1055,  1060,  1062,  1066,  1069,
+  1073,  1075,  1078,  1080,  1081,  1083,  1087,  1091,  1097,  1102,
+  1105,  1107,  1111,  1117,  1121,  1126,  1129,  1133,  1138,  1146,
+  1148,  1151,  1153,  1155,  1159,  1163,  1166,  1170,  1172,  1173,
+  1174,  1175,  1176,  1186,  1188,  1189,  1190,  1191,  1194,  1196,
+  1197,  1198,  1199,  1200,  1201,  1202,  1203,  1204,  1205,  1208,
+  1213,  1224,  1231,  1235,  1246,  1256,  1262,  1268,  1274,  1276,
+  1282,  1284,  1290,  1292,  1294,  1296,  1298,  1302,  1304,  1305,
+  1306,  1307,  1308,  1309,  1312,  1315,  1317,  1319,  1323,  1328,
+  1333,  1339,  1349,  1355,  1357,  1359,  1366,  1369,  1371,  1373,
+  1377,  1379,  1382,  1386,  1388,  1391,  1398,  1404,  1406,  1408,
+  1412,  1420,  1423,  1425,  1427,  1431,  1436,  1445,  1450,  1453,
+  1460,  1462,  1464,  1468,  1471,  1480,  1487,  1489,  1493,  1506,
+  1508,  1514,  1520,  1524,  1526,  1530,  1533,  1535,  1539,  1542,
+  1544,  1546,  1550,  1553,  1555,  1557,  1561,  1564,  1566,  1568,
+  1572,  1578,  1580,  1584,  1591,  1593,  1595,  1597,  1601,  1609,
+  1612,  1614,  1616,  1620,  1622,  1629,  1637,  1654,  1656,  1658,
+  1662,  1668,  1673,  1675,  1678,  1680,  1682,  1684,  1685,  1686,
+  1687,  1691,  1693,  1695,  1700,  1702,  1704,  1706,  1708,  1712,
+  1715,  1720,  1722,  1727,  1728,  1729,  1730,  1731,  1733,  1735,
+  1737,  1739,  1741,  1745,  1747,  1750,  1756,  1761,  1765,  1768,
+  1770,  1772,  1776,  1778,  1780,  1782,  1786,  1789,  1793,  1799,
+  1801,  1809,  1812,  1814,  1818,  1823,  1831,  1835,  1838,  1840,
+  1851,  1862,  1867,  1876,  1878,  1882,  1885,  1887,  1892,  1897,
+  1902,  1909,  1911,  1912,  1913,  1916,  1921,  1926,  1928,  1929,
+  1931,  1933,  1934,  1936,  1940,  1943,  1947,  1950,  1954,  1956,
+  1958,  1960,  1961,  1963,  1967,  1975,  1977,  1979,  1991,  1993,
+  1999,  2001,  2003,  2007,  2009,  2014,  2019,  2024,  2026,  2028,
+  2032,  2034,  2039,  2044,  2046,  2050,  2052,  2057,  2062,  2067,
+  2069,  2071,  2075,  2077,  2082,  2087,  2092,  2097,  2099,  2101,
+  2103,  2105,  2107,  2111,  2113,  2118,  2123,  2125,  2129,  2131,
+  2136,  2140,  2142,  2147,  2151,  2153,  2158,  2162,  2164,  2169,
+  2173,  2175,  2180,  2184,  2186,  2191,  2197,  2199,  2203,  2205,
+  2208,  2211,  2219,  2221,  2222,  2225,  2227,  2230,  2234
 };
 #endif
 
@@ -2251,7 +2255,7 @@ static const short yycheck[] = {     3,
 #define YYPURE 1
 
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/cygnus/gnupro-98r1/share/bison.simple"
+#line 3 "/usr/share/misc/bison.simple"
 
 /* Skeleton output parser for bison,
    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -2268,7 +2272,7 @@ static const short yycheck[] = {     3,
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -2444,7 +2448,7 @@ __yy_memcpy (char *to, char *from, int count)
 #endif
 #endif
 
-#line 196 "/usr/cygnus/gnupro-98r1/share/bison.simple"
+#line 196 "/usr/share/misc/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 *.
@@ -2749,66 +2753,66 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 442 "./parse.y"
+#line 446 "./parse.y"
 {;
     break;}
 case 18:
-#line 486 "./parse.y"
+#line 490 "./parse.y"
 { 
 		  yyval.node = build_java_array_type (yyvsp[-2].node, -1);
 		  CLASS_LOADED_P (yyval.node) = 1;
 		;
     break;}
 case 19:
-#line 491 "./parse.y"
+#line 495 "./parse.y"
 { yyval.node = build_unresolved_array_type (yyvsp[-2].node); ;
     break;}
 case 20:
-#line 493 "./parse.y"
+#line 497 "./parse.y"
 { yyval.node = build_unresolved_array_type (yyvsp[-2].node); ;
     break;}
 case 21:
-#line 495 "./parse.y"
+#line 499 "./parse.y"
 {RULE ("']' expected"); RECOVER;;
     break;}
 case 22:
-#line 497 "./parse.y"
+#line 501 "./parse.y"
 {RULE ("']' expected"); RECOVER;;
     break;}
 case 26:
-#line 512 "./parse.y"
+#line 516 "./parse.y"
 { yyval.node = make_qualified_name (yyvsp[-2].node, yyvsp[0].node, yyvsp[-1].operator.location); ;
     break;}
 case 28:
-#line 521 "./parse.y"
+#line 525 "./parse.y"
 {yyval.node = NULL;;
     break;}
 case 36:
-#line 533 "./parse.y"
+#line 537 "./parse.y"
 {
 		  yyval.node = NULL;
 		;
     break;}
 case 37:
-#line 537 "./parse.y"
+#line 541 "./parse.y"
 {
 		  yyval.node = NULL;
 		;
     break;}
 case 40:
-#line 549 "./parse.y"
+#line 553 "./parse.y"
 { ctxp->package = EXPR_WFL_NODE (yyvsp[-1].node); ;
     break;}
 case 41:
-#line 551 "./parse.y"
+#line 555 "./parse.y"
 {yyerror ("Missing name"); RECOVER;;
     break;}
 case 42:
-#line 553 "./parse.y"
+#line 557 "./parse.y"
 {yyerror ("';' expected"); RECOVER;;
     break;}
 case 45:
-#line 563 "./parse.y"
+#line 567 "./parse.y"
 {
 		  tree name = EXPR_WFL_NODE (yyvsp[-1].node), node, last_name;
 		  int   i = IDENTIFIER_LENGTH (name)-1;
@@ -2836,15 +2840,15 @@ case 45:
 		;
     break;}
 case 46:
-#line 589 "./parse.y"
+#line 593 "./parse.y"
 {yyerror ("Missing name"); RECOVER;;
     break;}
 case 47:
-#line 591 "./parse.y"
+#line 595 "./parse.y"
 {yyerror ("';' expected"); RECOVER;;
     break;}
 case 48:
-#line 596 "./parse.y"
+#line 600 "./parse.y"
 {
 		  tree name = EXPR_WFL_NODE (yyvsp[-3].node);
 		  tree node = build_tree_list (yyvsp[-3].node, NULL_TREE);
@@ -2854,15 +2858,15 @@ case 48:
 		;
     break;}
 case 49:
-#line 604 "./parse.y"
+#line 608 "./parse.y"
 {yyerror ("'*' expected"); RECOVER;;
     break;}
 case 50:
-#line 606 "./parse.y"
+#line 610 "./parse.y"
 {yyerror ("';' expected"); RECOVER;;
     break;}
 case 51:
-#line 611 "./parse.y"
+#line 615 "./parse.y"
 {
 		  maybe_generate_finit ();
 		  maybe_generate_clinit ();
@@ -2870,24 +2874,24 @@ case 51:
 		;
     break;}
 case 53:
-#line 618 "./parse.y"
+#line 622 "./parse.y"
 { yyval.node = NULL; ;
     break;}
 case 54:
-#line 620 "./parse.y"
+#line 624 "./parse.y"
 {
 		  YYERROR_NOW;
 		  yyerror ("Class or interface declaration expected");
 		;
     break;}
 case 55:
-#line 631 "./parse.y"
+#line 635 "./parse.y"
 {
 		  yyval.value = (1 << yyvsp[0].value);
 		;
     break;}
 case 56:
-#line 635 "./parse.y"
+#line 639 "./parse.y"
 {
 		  int acc = (1 << yyvsp[0].value);
 		  if (yyval.value & acc)
@@ -2901,116 +2905,116 @@ case 56:
 		;
     break;}
 case 57:
-#line 651 "./parse.y"
+#line 655 "./parse.y"
 { create_class (yyvsp[-4].value, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
     break;}
 case 58:
-#line 653 "./parse.y"
+#line 657 "./parse.y"
 { 
 		  yyval.node = yyvsp[0].node;
 		;
     break;}
 case 59:
-#line 657 "./parse.y"
+#line 661 "./parse.y"
 { create_class (0, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
     break;}
 case 60:
-#line 659 "./parse.y"
+#line 663 "./parse.y"
 { 	
 		  yyval.node = yyvsp[0].node;
 		;
     break;}
 case 61:
-#line 663 "./parse.y"
+#line 667 "./parse.y"
 {yyerror ("Missing class name"); RECOVER;;
     break;}
 case 62:
-#line 665 "./parse.y"
+#line 669 "./parse.y"
 {yyerror ("Missing class name"); RECOVER;;
     break;}
 case 63:
-#line 667 "./parse.y"
+#line 671 "./parse.y"
 {if (!ctxp->class_err) yyerror ("'{' expected"); DRECOVER(class1);;
     break;}
 case 64:
-#line 669 "./parse.y"
+#line 673 "./parse.y"
 {if (!ctxp->class_err) yyerror ("'{' expected"); RECOVER;;
     break;}
 case 65:
-#line 673 "./parse.y"
+#line 677 "./parse.y"
 { yyval.node = NULL; ;
     break;}
 case 66:
-#line 675 "./parse.y"
+#line 679 "./parse.y"
 { yyval.node = yyvsp[0].node; ;
     break;}
 case 67:
-#line 677 "./parse.y"
+#line 681 "./parse.y"
 {yyerror ("'{' expected"); ctxp->class_err=1;;
     break;}
 case 68:
-#line 679 "./parse.y"
+#line 683 "./parse.y"
 {yyerror ("Missing super class name"); ctxp->class_err=1;;
     break;}
 case 69:
-#line 683 "./parse.y"
+#line 687 "./parse.y"
 { yyval.node = NULL_TREE; ;
     break;}
 case 70:
-#line 685 "./parse.y"
+#line 689 "./parse.y"
 { yyval.node = yyvsp[0].node; ;
     break;}
 case 71:
-#line 687 "./parse.y"
+#line 691 "./parse.y"
 {
 		  ctxp->class_err=1;
 		  yyerror ("Missing interface name"); 
 		;
     break;}
 case 72:
-#line 695 "./parse.y"
+#line 699 "./parse.y"
 { 
 		  ctxp->interface_number = 1;
 		  yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE);
 		;
     break;}
 case 73:
-#line 700 "./parse.y"
+#line 704 "./parse.y"
 { 
 		  ctxp->interface_number++;
 		  yyval.node = chainon (yyvsp[-2].node, build_tree_list (yyvsp[0].node, NULL_TREE));
 		;
     break;}
 case 74:
-#line 705 "./parse.y"
+#line 709 "./parse.y"
 {yyerror ("Missing interface name"); RECOVER;;
     break;}
 case 75:
-#line 710 "./parse.y"
+#line 714 "./parse.y"
 { yyval.node = ctxp->current_parsed_class; ;
     break;}
 case 76:
-#line 712 "./parse.y"
+#line 716 "./parse.y"
 { yyval.node = ctxp->current_parsed_class; ;
     break;}
 case 82:
-#line 725 "./parse.y"
+#line 729 "./parse.y"
 { yyval.node = parse_jdk1_1_error ("instance initializer"); ;
     break;}
 case 85:
-#line 732 "./parse.y"
+#line 736 "./parse.y"
 { yyval.node = parse_jdk1_1_error ("inner classe declaration"); ;
     break;}
 case 86:
-#line 734 "./parse.y"
+#line 738 "./parse.y"
 { yyval.node = parse_jdk1_1_error ("inner interface declaration"); ;
     break;}
 case 87:
-#line 740 "./parse.y"
+#line 744 "./parse.y"
 { register_fields (0, yyvsp[-2].node, yyvsp[-1].node); ;
     break;}
 case 88:
-#line 742 "./parse.y"
+#line 746 "./parse.y"
 {
 		  check_modifiers 
 		    ("Illegal modifier `%s' for field declaration",
@@ -3020,19 +3024,19 @@ case 88:
 		;
     break;}
 case 90:
-#line 755 "./parse.y"
+#line 759 "./parse.y"
 { yyval.node = chainon (yyvsp[-2].node, yyvsp[0].node); ;
     break;}
 case 91:
-#line 757 "./parse.y"
+#line 761 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 92:
-#line 762 "./parse.y"
+#line 766 "./parse.y"
 { yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE); ;
     break;}
 case 93:
-#line 764 "./parse.y"
+#line 768 "./parse.y"
 { 
 		  if (java_error_count)
 		    yyvsp[0].node = NULL_TREE;
@@ -3041,7 +3045,7 @@ case 93:
 		;
     break;}
 case 94:
-#line 771 "./parse.y"
+#line 775 "./parse.y"
 {
 		  yyerror ("Missing variable initializer");
 		  yyval.node = build_tree_list (yyvsp[-2].node, NULL_TREE);
@@ -3049,7 +3053,7 @@ case 94:
 		;
     break;}
 case 95:
-#line 777 "./parse.y"
+#line 781 "./parse.y"
 {
 		  yyerror ("';' expected");
 		  yyval.node = build_tree_list (yyvsp[-3].node, NULL_TREE);
@@ -3057,85 +3061,85 @@ case 95:
 		;
     break;}
 case 97:
-#line 787 "./parse.y"
+#line 791 "./parse.y"
 { yyval.node = build_unresolved_array_type (yyvsp[-2].node); ;
     break;}
 case 98:
-#line 789 "./parse.y"
+#line 793 "./parse.y"
 {yyerror ("Invalid declaration"); DRECOVER(vdi);;
     break;}
 case 99:
-#line 791 "./parse.y"
+#line 795 "./parse.y"
 {yyerror ("']' expected"); DRECOVER(vdi);;
     break;}
 case 100:
-#line 793 "./parse.y"
+#line 797 "./parse.y"
 {yyerror ("Unbalanced ']'"); DRECOVER(vdi);;
     break;}
 case 103:
-#line 804 "./parse.y"
+#line 808 "./parse.y"
 {
 		  current_function_decl = yyvsp[0].node;
 		  source_start_java_method (current_function_decl);
 		;
     break;}
 case 104:
-#line 809 "./parse.y"
+#line 813 "./parse.y"
 { complete_method_declaration (yyvsp[0].node); ;
     break;}
 case 105:
-#line 811 "./parse.y"
+#line 815 "./parse.y"
 {YYNOT_TWICE yyerror ("'{' expected"); RECOVER;;
     break;}
 case 106:
-#line 816 "./parse.y"
+#line 820 "./parse.y"
 { yyval.node = method_header (0, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
     break;}
 case 107:
-#line 818 "./parse.y"
+#line 822 "./parse.y"
 { yyval.node = method_header (0, void_type_node, yyvsp[-1].node, yyvsp[0].node); ;
     break;}
 case 108:
-#line 820 "./parse.y"
+#line 824 "./parse.y"
 { yyval.node = method_header (yyvsp[-3].value, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
     break;}
 case 109:
-#line 822 "./parse.y"
+#line 826 "./parse.y"
 { yyval.node = method_header (yyvsp[-3].value, void_type_node, yyvsp[-1].node, yyvsp[0].node); ;
     break;}
 case 110:
-#line 824 "./parse.y"
+#line 828 "./parse.y"
 {RECOVER;;
     break;}
 case 111:
-#line 826 "./parse.y"
+#line 830 "./parse.y"
 {RECOVER;;
     break;}
 case 112:
-#line 828 "./parse.y"
+#line 832 "./parse.y"
 {yyerror ("Identifier expected"); RECOVER;;
     break;}
 case 113:
-#line 830 "./parse.y"
+#line 834 "./parse.y"
 {yyerror ("Identifier expected"); RECOVER;;
     break;}
 case 114:
-#line 832 "./parse.y"
+#line 836 "./parse.y"
 {
 		  yyerror ("Invalid method declaration, return type required");
 		  RECOVER;
 		;
     break;}
 case 115:
-#line 840 "./parse.y"
+#line 844 "./parse.y"
 { yyval.node = method_declarator (yyvsp[-2].node, NULL_TREE); ;
     break;}
 case 116:
-#line 842 "./parse.y"
+#line 846 "./parse.y"
 { yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ;
     break;}
 case 117:
-#line 844 "./parse.y"
+#line 848 "./parse.y"
 {
 		  EXPR_WFL_LINECOL (wfl_operator) = yyvsp[-1].operator.location;
 		  TREE_PURPOSE (yyvsp[-2].node) = 
@@ -3146,145 +3150,145 @@ case 117:
 		;
     break;}
 case 118:
-#line 853 "./parse.y"
+#line 857 "./parse.y"
 {yyerror ("')' expected"); DRECOVER(method_declarator);;
     break;}
 case 119:
-#line 855 "./parse.y"
+#line 859 "./parse.y"
 {yyerror ("']' expected"); RECOVER;;
     break;}
 case 120:
-#line 860 "./parse.y"
+#line 864 "./parse.y"
 {
 		  ctxp->formal_parameter_number = 1;
 		;
     break;}
 case 121:
-#line 864 "./parse.y"
+#line 868 "./parse.y"
 {
 		  ctxp->formal_parameter_number += 1;
 		  yyval.node = chainon (yyvsp[-2].node, yyvsp[0].node);
 		;
     break;}
 case 122:
-#line 869 "./parse.y"
+#line 873 "./parse.y"
 {yyerror ("Missing formal parameter term"); RECOVER;;
     break;}
 case 123:
-#line 874 "./parse.y"
+#line 878 "./parse.y"
 {
 		  yyval.node = build_tree_list (yyvsp[0].node, yyvsp[-1].node);
 		;
     break;}
 case 124:
-#line 878 "./parse.y"
+#line 882 "./parse.y"
 { yyval.node = parse_jdk1_1_error ("final parameters"); ;
     break;}
 case 125:
-#line 880 "./parse.y"
+#line 884 "./parse.y"
 {yyerror ("Missing identifier"); RECOVER;;
     break;}
 case 126:
-#line 882 "./parse.y"
+#line 886 "./parse.y"
 {
 		  SOURCE_FRONTEND_DEBUG (("Modifiers: %d", yyvsp[-2].value));
 		  yyerror ("Missing identifier"); RECOVER;
 		;
     break;}
 case 127:
-#line 889 "./parse.y"
+#line 893 "./parse.y"
 { yyval.node = NULL_TREE; ;
     break;}
 case 128:
-#line 891 "./parse.y"
+#line 895 "./parse.y"
 { yyval.node = yyvsp[0].node; ;
     break;}
 case 129:
-#line 893 "./parse.y"
+#line 897 "./parse.y"
 {yyerror ("Missing class type term"); RECOVER;;
     break;}
 case 130:
-#line 898 "./parse.y"
+#line 902 "./parse.y"
 { yyval.node = build_tree_list (yyvsp[0].node, yyvsp[0].node); ;
     break;}
 case 131:
-#line 900 "./parse.y"
+#line 904 "./parse.y"
 { yyval.node = tree_cons (yyvsp[0].node, yyvsp[0].node, yyvsp[-2].node); ;
     break;}
 case 132:
-#line 902 "./parse.y"
+#line 906 "./parse.y"
 {yyerror ("Missing class type term"); RECOVER;;
     break;}
 case 135:
-#line 909 "./parse.y"
+#line 913 "./parse.y"
 { yyval.node = NULL_TREE; ;
     break;}
 case 136:
-#line 915 "./parse.y"
+#line 919 "./parse.y"
 {
 		  RULE ("STATIC_INITIALIZER");
 		;
     break;}
 case 137:
-#line 919 "./parse.y"
+#line 923 "./parse.y"
 {
 		  RULE ("STATIC_INITIALIZER");
 		;
     break;}
 case 138:
-#line 926 "./parse.y"
+#line 930 "./parse.y"
 {
 		  SOURCE_FRONTEND_DEBUG (("Modifiers: %d", yyvsp[0].value));
 		;
     break;}
 case 139:
-#line 934 "./parse.y"
+#line 938 "./parse.y"
 {
 		  current_function_decl = yyvsp[0].node;
 		  source_start_java_method (current_function_decl);
 		;
     break;}
 case 140:
-#line 939 "./parse.y"
+#line 943 "./parse.y"
 { complete_method_declaration (yyvsp[0].node); ;
     break;}
 case 141:
-#line 944 "./parse.y"
+#line 948 "./parse.y"
 { yyval.node = method_header (0, NULL_TREE, yyvsp[-1].node, yyvsp[0].node); ;
     break;}
 case 142:
-#line 946 "./parse.y"
+#line 950 "./parse.y"
 { yyval.node = method_header (yyvsp[-2].value, NULL_TREE, yyvsp[-1].node, yyvsp[0].node); ;
     break;}
 case 143:
-#line 951 "./parse.y"
+#line 955 "./parse.y"
 { yyval.node = method_declarator (yyvsp[-2].node, NULL_TREE); ;
     break;}
 case 144:
-#line 953 "./parse.y"
+#line 957 "./parse.y"
 { yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ;
     break;}
 case 145:
-#line 961 "./parse.y"
+#line 965 "./parse.y"
 { 
 		  BLOCK_EXPR_BODY (yyvsp[0].node) = empty_stmt_node;
 		  yyval.node = yyvsp[0].node;
 		;
     break;}
 case 146:
-#line 966 "./parse.y"
+#line 970 "./parse.y"
 { yyval.node = yyvsp[0].node; ;
     break;}
 case 147:
-#line 968 "./parse.y"
+#line 972 "./parse.y"
 { yyval.node = yyvsp[0].node; ;
     break;}
 case 148:
-#line 970 "./parse.y"
+#line 974 "./parse.y"
 { yyval.node = yyvsp[0].node; ;
     break;}
 case 149:
-#line 976 "./parse.y"
+#line 980 "./parse.y"
 { 
 		  yyval.node = build_method_invocation (yyvsp[-3].node, NULL_TREE); 
 		  yyval.node = build_debugable_stmt (EXPR_WFL_LINECOL (yyvsp[-3].node), yyval.node);
@@ -3292,7 +3296,7 @@ case 149:
 		;
     break;}
 case 150:
-#line 982 "./parse.y"
+#line 986 "./parse.y"
 { 
 		  yyval.node = build_method_invocation (yyvsp[-4].node, yyvsp[-2].node); 
 		  yyval.node = build_debugable_stmt (EXPR_WFL_LINECOL (yyvsp[-4].node), yyval.node);
@@ -3300,15 +3304,15 @@ case 150:
 		;
     break;}
 case 151:
-#line 990 "./parse.y"
+#line 994 "./parse.y"
 {yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ;
     break;}
 case 152:
-#line 992 "./parse.y"
+#line 996 "./parse.y"
 {yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ;
     break;}
 case 153:
-#line 997 "./parse.y"
+#line 1001 "./parse.y"
 {
 		  tree wfl = build_wfl_node (this_identifier_node, 
 					     input_filename, 0, 0);
@@ -3317,7 +3321,7 @@ case 153:
 		;
     break;}
 case 154:
-#line 1004 "./parse.y"
+#line 1008 "./parse.y"
 {
 		  tree wfl = build_wfl_node (super_identifier_node,
 					     input_filename, 0, 0);
@@ -3326,168 +3330,168 @@ case 154:
 		;
     break;}
 case 155:
-#line 1016 "./parse.y"
+#line 1020 "./parse.y"
 { create_interface (0, yyvsp[0].node, NULL_TREE); ;
     break;}
 case 156:
-#line 1018 "./parse.y"
+#line 1022 "./parse.y"
 {
 		  yyval.node = yyvsp[0].node;
 		;
     break;}
 case 157:
-#line 1022 "./parse.y"
+#line 1026 "./parse.y"
 { create_interface (yyvsp[-2].value, yyvsp[0].node, NULL_TREE); ;
     break;}
 case 158:
-#line 1024 "./parse.y"
+#line 1028 "./parse.y"
 {
 		  yyval.node = yyvsp[0].node;
 		;
     break;}
 case 159:
-#line 1028 "./parse.y"
+#line 1032 "./parse.y"
 { create_interface (0, yyvsp[-1].node, yyvsp[0].node);	;
     break;}
 case 160:
-#line 1030 "./parse.y"
+#line 1034 "./parse.y"
 {
 		  yyval.node = yyvsp[0].node;
 		;
     break;}
 case 161:
-#line 1034 "./parse.y"
+#line 1038 "./parse.y"
 { create_interface (yyvsp[-3].value, yyvsp[-1].node, yyvsp[0].node); ;
     break;}
 case 162:
-#line 1036 "./parse.y"
+#line 1040 "./parse.y"
 {
 		  yyval.node = yyvsp[0].node;
 		;
     break;}
 case 163:
-#line 1040 "./parse.y"
+#line 1044 "./parse.y"
 {yyerror ("(here)'{' expected"); RECOVER;;
     break;}
 case 164:
-#line 1042 "./parse.y"
+#line 1046 "./parse.y"
 {yyerror ("(there)'{' expected"); RECOVER;;
     break;}
 case 165:
-#line 1047 "./parse.y"
+#line 1051 "./parse.y"
 { 
 		  ctxp->interface_number = 1;
 		  yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE);
 		;
     break;}
 case 166:
-#line 1052 "./parse.y"
+#line 1056 "./parse.y"
 { 
 		  ctxp->interface_number++;
 		  yyval.node = chainon (yyvsp[-2].node, build_tree_list (yyvsp[0].node, NULL_TREE));
 		;
     break;}
 case 167:
-#line 1057 "./parse.y"
+#line 1061 "./parse.y"
 {yyerror ("Invalid interface type"); RECOVER;;
     break;}
 case 168:
-#line 1059 "./parse.y"
+#line 1063 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 169:
-#line 1064 "./parse.y"
+#line 1068 "./parse.y"
 { yyval.node = NULL_TREE; ;
     break;}
 case 170:
-#line 1066 "./parse.y"
+#line 1070 "./parse.y"
 { yyval.node = NULL_TREE; ;
     break;}
 case 175:
-#line 1078 "./parse.y"
+#line 1082 "./parse.y"
 { yyval.node = parse_jdk1_1_error ("inner class declaration"); ;
     break;}
 case 176:
-#line 1080 "./parse.y"
+#line 1084 "./parse.y"
 { yyval.node = parse_jdk1_1_error ("inner interface declaration"); ;
     break;}
 case 178:
-#line 1089 "./parse.y"
+#line 1093 "./parse.y"
 { 
 		  check_abstract_method_header (yyvsp[-1].node);
 		  current_function_decl = NULL_TREE; /* FIXME ? */
 		;
     break;}
 case 179:
-#line 1094 "./parse.y"
+#line 1098 "./parse.y"
 {yyerror ("';' expected"); RECOVER;;
     break;}
 case 180:
-#line 1100 "./parse.y"
+#line 1104 "./parse.y"
 { yyval.node = build_new_array_init (yyvsp[-1].operator.location, NULL_TREE); ;
     break;}
 case 181:
-#line 1102 "./parse.y"
+#line 1106 "./parse.y"
 { yyval.node = build_new_array_init (yyvsp[-2].operator.location, yyvsp[-1].node); ;
     break;}
 case 182:
-#line 1104 "./parse.y"
+#line 1108 "./parse.y"
 { yyval.node = build_new_array_init (yyvsp[-3].operator.location, yyvsp[-2].node); ;
     break;}
 case 183:
-#line 1109 "./parse.y"
+#line 1113 "./parse.y"
 { 
 		  yyval.node = tree_cons (maybe_build_array_element_wfl (yyvsp[0].node), 
 				  yyvsp[0].node, NULL_TREE);
 		;
     break;}
 case 184:
-#line 1114 "./parse.y"
+#line 1118 "./parse.y"
 {
 		  yyval.node = tree_cons (maybe_build_array_element_wfl (yyvsp[0].node), yyvsp[0].node, yyvsp[-2].node);
 		;
     break;}
 case 185:
-#line 1118 "./parse.y"
+#line 1122 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 186:
-#line 1124 "./parse.y"
+#line 1128 "./parse.y"
 { yyval.node = empty_stmt_node; ;
     break;}
 case 187:
-#line 1126 "./parse.y"
+#line 1130 "./parse.y"
 { yyval.node = yyvsp[0].node; ;
     break;}
 case 188:
-#line 1131 "./parse.y"
+#line 1135 "./parse.y"
 { enter_block (); ;
     break;}
 case 189:
-#line 1136 "./parse.y"
+#line 1140 "./parse.y"
 { 
 		  maybe_absorb_scoping_blocks ();
 		  yyval.node = exit_block ();
 		;
     break;}
 case 193:
-#line 1150 "./parse.y"
+#line 1154 "./parse.y"
 { java_method_add_stmt (current_function_decl, yyvsp[0].node); ;
     break;}
 case 194:
-#line 1152 "./parse.y"
+#line 1156 "./parse.y"
 { parse_jdk1_1_error ("inner class declaration"); ;
     break;}
 case 196:
-#line 1161 "./parse.y"
+#line 1165 "./parse.y"
 { declare_local_variables (0, yyvsp[-1].node, yyvsp[0].node); ;
     break;}
 case 197:
-#line 1163 "./parse.y"
+#line 1167 "./parse.y"
 { declare_local_variables (yyvsp[-2].value, yyvsp[-1].node, yyvsp[0].node); ;
     break;}
 case 203:
-#line 1173 "./parse.y"
+#line 1177 "./parse.y"
 { 
 		  /* If the for loop is unlabeled, we must return the
 		     block it was defined it. It our last chance to
@@ -3497,11 +3501,11 @@ case 203:
 		;
     break;}
 case 220:
-#line 1206 "./parse.y"
+#line 1210 "./parse.y"
 { yyval.node = empty_stmt_node; ;
     break;}
 case 221:
-#line 1211 "./parse.y"
+#line 1215 "./parse.y"
 {
 		  yyval.node = build_labeled_block (EXPR_WFL_LINECOL (yyvsp[-1].node), 
 					    EXPR_WFL_NODE (yyvsp[-1].node));
@@ -3511,7 +3515,7 @@ case 221:
 		;
     break;}
 case 222:
-#line 1222 "./parse.y"
+#line 1226 "./parse.y"
 { 
 		  yyval.node = complete_labeled_statement (yyvsp[-1].node, yyvsp[0].node);
 		  pop_labeled_block ();
@@ -3519,11 +3523,11 @@ case 222:
 		;
     break;}
 case 223:
-#line 1228 "./parse.y"
+#line 1232 "./parse.y"
 {yyerror ("':' expected"); RECOVER;;
     break;}
 case 224:
-#line 1233 "./parse.y"
+#line 1237 "./parse.y"
 { 
 		  yyval.node = complete_labeled_statement (yyvsp[-1].node, yyvsp[0].node);
 		  pop_labeled_block ();
@@ -3531,7 +3535,7 @@ case 224:
 		;
     break;}
 case 225:
-#line 1244 "./parse.y"
+#line 1248 "./parse.y"
 {
 		  /* We have a statement. Generate a WFL around it so
 		     we can debug it */
@@ -3542,7 +3546,7 @@ case 225:
 		;
     break;}
 case 226:
-#line 1253 "./parse.y"
+#line 1257 "./parse.y"
 {
 		  if (ctxp->prevent_ese != lineno)
 		    yyerror ("Invalid expression statement");
@@ -3550,7 +3554,7 @@ case 226:
 		;
     break;}
 case 227:
-#line 1259 "./parse.y"
+#line 1263 "./parse.y"
 {
 		  if (ctxp->prevent_ese != lineno)
 		    yyerror ("Invalid expression statement");
@@ -3558,7 +3562,7 @@ case 227:
 		;
     break;}
 case 228:
-#line 1265 "./parse.y"
+#line 1269 "./parse.y"
 {
 		  if (ctxp->prevent_ese != lineno)
 		    yyerror ("Invalid expression statement");
@@ -3566,11 +3570,11 @@ case 228:
 		;
     break;}
 case 229:
-#line 1271 "./parse.y"
+#line 1275 "./parse.y"
 {yyerror ("')' expected"); RECOVER;;
     break;}
 case 230:
-#line 1273 "./parse.y"
+#line 1277 "./parse.y"
 {
 		  yyerror ("Constructor invocation must be first "
 			   "thing in a constructor"); 
@@ -3578,11 +3582,11 @@ case 230:
 		;
     break;}
 case 231:
-#line 1279 "./parse.y"
+#line 1283 "./parse.y"
 {yyerror ("')' expected"); RECOVER;;
     break;}
 case 232:
-#line 1281 "./parse.y"
+#line 1285 "./parse.y"
 {
 		  yyerror ("Constructor invocation must be first "
 			   "thing in a constructor"); 
@@ -3590,57 +3594,57 @@ case 232:
 		;
     break;}
 case 233:
-#line 1287 "./parse.y"
+#line 1291 "./parse.y"
 {yyerror ("'(' expected"); RECOVER;;
     break;}
 case 234:
-#line 1289 "./parse.y"
+#line 1293 "./parse.y"
 {yyerror ("')' expected"); RECOVER;;
     break;}
 case 235:
-#line 1291 "./parse.y"
+#line 1295 "./parse.y"
 {yyerror ("')' expected"); RECOVER;;
     break;}
 case 236:
-#line 1293 "./parse.y"
+#line 1297 "./parse.y"
 {yyerror ("';' expected"); RECOVER;;
     break;}
 case 237:
-#line 1295 "./parse.y"
+#line 1299 "./parse.y"
 {yyerror ("';' expected"); RECOVER;;
     break;}
 case 245:
-#line 1310 "./parse.y"
+#line 1314 "./parse.y"
 { yyval.node = build_if_else_statement (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node, NULL_TREE); ;
     break;}
 case 246:
-#line 1312 "./parse.y"
+#line 1316 "./parse.y"
 {yyerror ("'(' expected"); RECOVER;;
     break;}
 case 247:
-#line 1314 "./parse.y"
+#line 1318 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 248:
-#line 1316 "./parse.y"
+#line 1320 "./parse.y"
 {yyerror ("')' expected"); RECOVER;;
     break;}
 case 249:
-#line 1321 "./parse.y"
+#line 1325 "./parse.y"
 { yyval.node = build_if_else_statement (yyvsp[-5].operator.location, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ;
     break;}
 case 250:
-#line 1326 "./parse.y"
+#line 1330 "./parse.y"
 { yyval.node = build_if_else_statement (yyvsp[-5].operator.location, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ;
     break;}
 case 251:
-#line 1331 "./parse.y"
+#line 1335 "./parse.y"
 {
 		  enter_block ();
 		;
     break;}
 case 252:
-#line 1335 "./parse.y"
+#line 1339 "./parse.y"
 { 
 		  /* Make into "proper list" of COMPOUND_EXPRs.
 		     I.e. make the last statment also have its own
@@ -3651,42 +3655,42 @@ case 252:
 		;
     break;}
 case 253:
-#line 1347 "./parse.y"
+#line 1351 "./parse.y"
 { 
 		  yyval.node = build (SWITCH_EXPR, NULL_TREE, yyvsp[-1].node, NULL_TREE);
 		  EXPR_WFL_LINECOL (yyval.node) = yyvsp[-2].operator.location;
 		;
     break;}
 case 254:
-#line 1352 "./parse.y"
+#line 1356 "./parse.y"
 {yyerror ("'(' expected"); RECOVER;;
     break;}
 case 255:
-#line 1354 "./parse.y"
+#line 1358 "./parse.y"
 {yyerror ("Missing term or ')'"); DRECOVER(switch_statement);;
     break;}
 case 256:
-#line 1356 "./parse.y"
+#line 1360 "./parse.y"
 {yyerror ("'{' expected"); RECOVER;;
     break;}
 case 257:
-#line 1364 "./parse.y"
+#line 1368 "./parse.y"
 { yyval.node = NULL_TREE; ;
     break;}
 case 258:
-#line 1366 "./parse.y"
+#line 1370 "./parse.y"
 { yyval.node = NULL_TREE; ;
     break;}
 case 259:
-#line 1368 "./parse.y"
+#line 1372 "./parse.y"
 { yyval.node = NULL_TREE; ;
     break;}
 case 260:
-#line 1370 "./parse.y"
+#line 1374 "./parse.y"
 { yyval.node = NULL_TREE; ;
     break;}
 case 266:
-#line 1389 "./parse.y"
+#line 1393 "./parse.y"
 { 
 		  tree lab = build1 (CASE_EXPR, NULL_TREE, yyvsp[-1].node);
 		  EXPR_WFL_LINECOL (lab) = yyvsp[-2].operator.location;
@@ -3694,7 +3698,7 @@ case 266:
 		;
     break;}
 case 267:
-#line 1395 "./parse.y"
+#line 1399 "./parse.y"
 { 
 		  tree lab = build1 (DEFAULT_EXPR, NULL_TREE, NULL_TREE);
 		  EXPR_WFL_LINECOL (lab) = yyvsp[-1].operator.location;
@@ -3702,61 +3706,61 @@ case 267:
 		;
     break;}
 case 268:
-#line 1401 "./parse.y"
+#line 1405 "./parse.y"
 {yyerror ("Missing or invalid constant expression"); RECOVER;;
     break;}
 case 269:
-#line 1403 "./parse.y"
+#line 1407 "./parse.y"
 {yyerror ("':' expected"); RECOVER;;
     break;}
 case 270:
-#line 1405 "./parse.y"
+#line 1409 "./parse.y"
 {yyerror ("':' expected"); RECOVER;;
     break;}
 case 271:
-#line 1410 "./parse.y"
+#line 1414 "./parse.y"
 { 
 		  tree body = build_loop_body (yyvsp[-2].operator.location, yyvsp[-1].node, 0);
 		  yyval.node = build_new_loop (body);
 		;
     break;}
 case 272:
-#line 1418 "./parse.y"
+#line 1422 "./parse.y"
 { yyval.node = complete_loop_body (0, NULL_TREE, yyvsp[0].node, 0); ;
     break;}
 case 273:
-#line 1420 "./parse.y"
+#line 1424 "./parse.y"
 {YYERROR_NOW; yyerror ("'(' expected"); RECOVER;;
     break;}
 case 274:
-#line 1422 "./parse.y"
+#line 1426 "./parse.y"
 {yyerror ("Missing term and ')' expected"); RECOVER;;
     break;}
 case 275:
-#line 1424 "./parse.y"
+#line 1428 "./parse.y"
 {yyerror ("')' expected"); RECOVER;;
     break;}
 case 276:
-#line 1429 "./parse.y"
+#line 1433 "./parse.y"
 { yyval.node = complete_loop_body (0, NULL_TREE, yyvsp[0].node, 0); ;
     break;}
 case 277:
-#line 1434 "./parse.y"
+#line 1438 "./parse.y"
 { 
 		  tree body = build_loop_body (0, NULL_TREE, 1);
 		  yyval.node = build_new_loop (body);
 		;
     break;}
 case 278:
-#line 1443 "./parse.y"
+#line 1447 "./parse.y"
 { yyval.node = complete_loop_body (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[-5].node, 1); ;
     break;}
 case 279:
-#line 1448 "./parse.y"
+#line 1452 "./parse.y"
 { yyval.node = complete_for_loop (EXPR_WFL_LINECOL (yyvsp[-4].node), yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node);;
     break;}
 case 280:
-#line 1450 "./parse.y"
+#line 1454 "./parse.y"
 { 
 		  yyval.node = complete_for_loop (0, NULL_TREE, yyvsp[-2].node, yyvsp[0].node);
 		  /* We have not condition, so we get rid of the EXIT_EXPR */
@@ -3765,23 +3769,23 @@ case 280:
 		;
     break;}
 case 281:
-#line 1457 "./parse.y"
+#line 1461 "./parse.y"
 {yyerror ("Invalid control expression"); RECOVER;;
     break;}
 case 282:
-#line 1459 "./parse.y"
+#line 1463 "./parse.y"
 {yyerror ("Invalid update expression"); RECOVER;;
     break;}
 case 283:
-#line 1461 "./parse.y"
+#line 1465 "./parse.y"
 {yyerror ("Invalid update expression"); RECOVER;;
     break;}
 case 284:
-#line 1466 "./parse.y"
+#line 1470 "./parse.y"
 { yyval.node = complete_for_loop (EXPR_WFL_LINECOL (yyvsp[-4].node), yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node);;
     break;}
 case 285:
-#line 1468 "./parse.y"
+#line 1472 "./parse.y"
 { 
 		  yyval.node = complete_for_loop (0, NULL_TREE, yyvsp[-2].node, yyvsp[0].node);
 		  /* We have not condition, so we get rid of the EXIT_EXPR */
@@ -3790,7 +3794,7 @@ case 285:
 		;
     break;}
 case 286:
-#line 1478 "./parse.y"
+#line 1482 "./parse.y"
 { 
 		  /* This scope defined for local variable that may be
                      defined within the scope of the for loop */
@@ -3798,15 +3802,15 @@ case 286:
 		;
     break;}
 case 287:
-#line 1484 "./parse.y"
+#line 1488 "./parse.y"
 {yyerror ("'(' expected"); DRECOVER(for_1);;
     break;}
 case 288:
-#line 1486 "./parse.y"
+#line 1490 "./parse.y"
 {yyerror ("Invalid init statement"); RECOVER;;
     break;}
 case 289:
-#line 1491 "./parse.y"
+#line 1495 "./parse.y"
 { 
 		  /* We now declare the loop body. The loop is
                      declared as a for loop. */
@@ -3819,11 +3823,11 @@ case 289:
 		;
     break;}
 case 290:
-#line 1503 "./parse.y"
+#line 1507 "./parse.y"
 { yyval.node = empty_stmt_node; ;
     break;}
 case 291:
-#line 1505 "./parse.y"
+#line 1509 "./parse.y"
 { 
 		  /* Init statement recorded within the previously
                      defined block scope */
@@ -3831,7 +3835,7 @@ case 291:
 		;
     break;}
 case 292:
-#line 1511 "./parse.y"
+#line 1515 "./parse.y"
 { 
 		  /* Local variable are recorded within the previously
 		     defined block scope */
@@ -3839,94 +3843,94 @@ case 292:
 		;
     break;}
 case 293:
-#line 1517 "./parse.y"
+#line 1521 "./parse.y"
 {yyerror ("';' expected"); DRECOVER(for_init_1);;
     break;}
 case 294:
-#line 1521 "./parse.y"
+#line 1525 "./parse.y"
 {yyval.node = empty_stmt_node;;
     break;}
 case 295:
-#line 1523 "./parse.y"
+#line 1527 "./parse.y"
 { yyval.node = build_debugable_stmt (BUILD_LOCATION (), yyvsp[0].node); ;
     break;}
 case 296:
-#line 1528 "./parse.y"
+#line 1532 "./parse.y"
 { yyval.node = add_stmt_to_compound (NULL_TREE, NULL_TREE, yyvsp[0].node); ;
     break;}
 case 297:
-#line 1530 "./parse.y"
+#line 1534 "./parse.y"
 { yyval.node = add_stmt_to_compound (yyvsp[-2].node, NULL_TREE, yyvsp[0].node); ;
     break;}
 case 298:
-#line 1532 "./parse.y"
+#line 1536 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 299:
-#line 1537 "./parse.y"
+#line 1541 "./parse.y"
 { yyval.node = build_bc_statement (yyvsp[-1].operator.location, 1, NULL_TREE); ;
     break;}
 case 300:
-#line 1539 "./parse.y"
+#line 1543 "./parse.y"
 { yyval.node = build_bc_statement (yyvsp[-2].operator.location, 1, yyvsp[-1].node); ;
     break;}
 case 301:
-#line 1541 "./parse.y"
+#line 1545 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 302:
-#line 1543 "./parse.y"
+#line 1547 "./parse.y"
 {yyerror ("';' expected"); RECOVER;;
     break;}
 case 303:
-#line 1548 "./parse.y"
+#line 1552 "./parse.y"
 { yyval.node = build_bc_statement (yyvsp[-1].operator.location, 0, NULL_TREE); ;
     break;}
 case 304:
-#line 1550 "./parse.y"
+#line 1554 "./parse.y"
 { yyval.node = build_bc_statement (yyvsp[-2].operator.location, 0, yyvsp[-1].node); ;
     break;}
 case 305:
-#line 1552 "./parse.y"
+#line 1556 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 306:
-#line 1554 "./parse.y"
+#line 1558 "./parse.y"
 {yyerror ("';' expected"); RECOVER;;
     break;}
 case 307:
-#line 1559 "./parse.y"
+#line 1563 "./parse.y"
 { yyval.node = build_return (yyvsp[-1].operator.location, NULL_TREE); ;
     break;}
 case 308:
-#line 1561 "./parse.y"
+#line 1565 "./parse.y"
 { yyval.node = build_return (yyvsp[-2].operator.location, yyvsp[-1].node); ;
     break;}
 case 309:
-#line 1563 "./parse.y"
+#line 1567 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 310:
-#line 1565 "./parse.y"
+#line 1569 "./parse.y"
 {yyerror ("';' expected"); RECOVER;;
     break;}
 case 311:
-#line 1570 "./parse.y"
+#line 1574 "./parse.y"
 { 
 		  yyval.node = build1 (THROW_EXPR, NULL_TREE, yyvsp[-1].node);
 		  EXPR_WFL_LINECOL (yyval.node) = yyvsp[-2].operator.location;
 		;
     break;}
 case 312:
-#line 1575 "./parse.y"
+#line 1579 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 313:
-#line 1577 "./parse.y"
+#line 1581 "./parse.y"
 {yyerror ("';' expected"); RECOVER;;
     break;}
 case 314:
-#line 1582 "./parse.y"
+#line 1586 "./parse.y"
 { 
 		  yyval.node = build (SYNCHRONIZED_EXPR, NULL_TREE, yyvsp[-2].node, yyvsp[0].node);
 		  EXPR_WFL_LINECOL (yyval.node) = 
@@ -3934,53 +3938,53 @@ case 314:
 		;
     break;}
 case 315:
-#line 1588 "./parse.y"
+#line 1592 "./parse.y"
 {yyerror ("'{' expected"); RECOVER;;
     break;}
 case 316:
-#line 1590 "./parse.y"
+#line 1594 "./parse.y"
 {yyerror ("'(' expected"); RECOVER;;
     break;}
 case 317:
-#line 1592 "./parse.y"
+#line 1596 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 318:
-#line 1594 "./parse.y"
+#line 1598 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 319:
-#line 1599 "./parse.y"
+#line 1603 "./parse.y"
 {
 		  if ((1 << yyvsp[0].value) != ACC_SYNCHRONIZED)
 		    fatal ("synchronized was '%d' - yyparse", (1 << yyvsp[0].value));
 		;
     break;}
 case 320:
-#line 1607 "./parse.y"
+#line 1611 "./parse.y"
 { yyval.node = build_try_statement (yyvsp[-2].operator.location, yyvsp[-1].node, yyvsp[0].node, NULL_TREE); ;
     break;}
 case 321:
-#line 1609 "./parse.y"
+#line 1613 "./parse.y"
 { yyval.node = build_try_statement (yyvsp[-2].operator.location, yyvsp[-1].node, NULL_TREE, yyvsp[0].node); ;
     break;}
 case 322:
-#line 1611 "./parse.y"
+#line 1615 "./parse.y"
 { yyval.node = build_try_statement (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
     break;}
 case 323:
-#line 1613 "./parse.y"
+#line 1617 "./parse.y"
 {yyerror ("'{' expected"); DRECOVER (try_statement);;
     break;}
 case 325:
-#line 1619 "./parse.y"
+#line 1623 "./parse.y"
 { 
 		  TREE_CHAIN (yyvsp[0].node) = yyvsp[-1].node;
 		  yyval.node = yyvsp[0].node;
 		;
     break;}
 case 326:
-#line 1627 "./parse.y"
+#line 1631 "./parse.y"
 { 
 		  java_method_add_stmt (current_function_decl, yyvsp[0].node);
 		  exit_block ();
@@ -3988,7 +3992,7 @@ case 326:
 		;
     break;}
 case 327:
-#line 1635 "./parse.y"
+#line 1639 "./parse.y"
 { 
 		  /* We add a block to define a scope for
 		     formal_parameter (CCBP). The formal parameter is
@@ -4006,179 +4010,179 @@ case 327:
 		;
     break;}
 case 328:
-#line 1651 "./parse.y"
+#line 1655 "./parse.y"
 {yyerror ("'(' expected"); RECOVER;;
     break;}
 case 329:
-#line 1653 "./parse.y"
+#line 1657 "./parse.y"
 {yyerror ("Missing term or ')' expected"); DRECOVER (2);;
     break;}
 case 330:
-#line 1655 "./parse.y"
+#line 1659 "./parse.y"
 {yyerror ("')' expected"); DRECOVER (1);;
     break;}
 case 331:
-#line 1660 "./parse.y"
+#line 1664 "./parse.y"
 { 
 		  yyval.node = build (FINALLY_EXPR, NULL_TREE,
 			      create_label_decl (generate_name ()), yyvsp[0].node);
 		;
     break;}
 case 332:
-#line 1665 "./parse.y"
+#line 1669 "./parse.y"
 {yyerror ("'{' expected"); RECOVER; ;
     break;}
 case 336:
-#line 1677 "./parse.y"
+#line 1681 "./parse.y"
 { yyval.node = build_this (yyvsp[0].operator.location); ;
     break;}
 case 337:
-#line 1679 "./parse.y"
+#line 1683 "./parse.y"
 {yyval.node = yyvsp[-1].node;;
     break;}
 case 342:
-#line 1688 "./parse.y"
+#line 1692 "./parse.y"
 { yyval.node = parse_jdk1_1_error ("named class literals"); ;
     break;}
 case 343:
-#line 1690 "./parse.y"
+#line 1694 "./parse.y"
 { yyval.node = build_class_ref (yyvsp[-2].node); ;
     break;}
 case 344:
-#line 1692 "./parse.y"
+#line 1696 "./parse.y"
 { yyval.node = build_class_ref (void_type_node); ;
     break;}
 case 345:
-#line 1697 "./parse.y"
+#line 1701 "./parse.y"
 { yyval.node = parse_jdk1_1_error ("class literals"); ;
     break;}
 case 346:
-#line 1699 "./parse.y"
+#line 1703 "./parse.y"
 {yyerror ("')' expected"); RECOVER;;
     break;}
 case 347:
-#line 1701 "./parse.y"
+#line 1705 "./parse.y"
 {yyerror ("'class' or 'this' expected" ); RECOVER;;
     break;}
 case 348:
-#line 1703 "./parse.y"
+#line 1707 "./parse.y"
 {yyerror ("'class' expected" ); RECOVER;;
     break;}
 case 349:
-#line 1705 "./parse.y"
+#line 1709 "./parse.y"
 {yyerror ("'class' expected" ); RECOVER;;
     break;}
 case 350:
-#line 1710 "./parse.y"
+#line 1714 "./parse.y"
 { yyval.node = build_new_invocation (yyvsp[-3].node, yyvsp[-1].node); ;
     break;}
 case 351:
-#line 1712 "./parse.y"
+#line 1716 "./parse.y"
 { yyval.node = build_new_invocation (yyvsp[-2].node, NULL_TREE); ;
     break;}
 case 352:
-#line 1717 "./parse.y"
+#line 1721 "./parse.y"
 { yyval.node = parse_jdk1_1_error ("inner class instance creation"); ;
     break;}
 case 353:
-#line 1719 "./parse.y"
+#line 1723 "./parse.y"
 { yyval.node = parse_jdk1_1_error ("inner class instance creation"); ;
     break;}
 case 358:
-#line 1728 "./parse.y"
+#line 1732 "./parse.y"
 {yyerror ("'(' expected"); DRECOVER(new_1);;
     break;}
 case 359:
-#line 1730 "./parse.y"
+#line 1734 "./parse.y"
 {yyerror ("'(' expected"); RECOVER;;
     break;}
 case 360:
-#line 1732 "./parse.y"
+#line 1736 "./parse.y"
 {yyerror ("')' or term expected"); RECOVER;;
     break;}
 case 361:
-#line 1734 "./parse.y"
+#line 1738 "./parse.y"
 {yyerror ("')' expected"); RECOVER;;
     break;}
 case 362:
-#line 1736 "./parse.y"
+#line 1740 "./parse.y"
 {YYERROR_NOW; yyerror ("Identifier expected"); RECOVER;;
     break;}
 case 363:
-#line 1738 "./parse.y"
+#line 1742 "./parse.y"
 {yyerror ("'(' expected"); RECOVER;;
     break;}
 case 366:
-#line 1748 "./parse.y"
+#line 1752 "./parse.y"
 { 
 		  yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, NULL_TREE);
 		  ctxp->formal_parameter_number = 1; 
 		;
     break;}
 case 367:
-#line 1753 "./parse.y"
+#line 1757 "./parse.y"
 {
 		  ctxp->formal_parameter_number += 1;
 		  yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, yyvsp[-2].node);
 		;
     break;}
 case 368:
-#line 1758 "./parse.y"
+#line 1762 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 369:
-#line 1763 "./parse.y"
+#line 1767 "./parse.y"
 { yyval.node = build_newarray_node (yyvsp[-1].node, yyvsp[0].node, 0); ;
     break;}
 case 370:
-#line 1765 "./parse.y"
+#line 1769 "./parse.y"
 { yyval.node = build_newarray_node (yyvsp[-1].node, yyvsp[0].node, 0); ;
     break;}
 case 371:
-#line 1767 "./parse.y"
+#line 1771 "./parse.y"
 { yyval.node = build_newarray_node (yyvsp[-2].node, yyvsp[-1].node, ctxp->osb_number); ;
     break;}
 case 372:
-#line 1769 "./parse.y"
+#line 1773 "./parse.y"
 { yyval.node = build_newarray_node (yyvsp[-2].node, yyvsp[-1].node, ctxp->osb_number); ;
     break;}
 case 373:
-#line 1773 "./parse.y"
+#line 1777 "./parse.y"
 { yyval.node = parse_jdk1_1_error ("anonymous array"); ;
     break;}
 case 374:
-#line 1775 "./parse.y"
+#line 1779 "./parse.y"
 { yyval.node = parse_jdk1_1_error ("anonymous array"); ;
     break;}
 case 375:
-#line 1777 "./parse.y"
+#line 1781 "./parse.y"
 {yyerror ("'[' expected"); DRECOVER ("]");;
     break;}
 case 376:
-#line 1779 "./parse.y"
+#line 1783 "./parse.y"
 {yyerror ("']' expected"); RECOVER;;
     break;}
 case 377:
-#line 1784 "./parse.y"
+#line 1788 "./parse.y"
 { yyval.node = build_tree_list (NULL_TREE, yyvsp[0].node); ;
     break;}
 case 378:
-#line 1786 "./parse.y"
+#line 1790 "./parse.y"
 { yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, yyval.node); ;
     break;}
 case 379:
-#line 1791 "./parse.y"
+#line 1795 "./parse.y"
 { 
 		  EXPR_WFL_LINECOL (yyvsp[-1].node) = yyvsp[-2].operator.location;
 		  yyval.node = yyvsp[-1].node;
 		;
     break;}
 case 380:
-#line 1796 "./parse.y"
+#line 1800 "./parse.y"
 {yyerror ("']' expected"); RECOVER;;
     break;}
 case 381:
-#line 1798 "./parse.y"
+#line 1802 "./parse.y"
 {
 		  yyerror ("Missing term");
 		  yyerror ("']' expected");
@@ -4186,23 +4190,23 @@ case 381:
 		;
     break;}
 case 382:
-#line 1807 "./parse.y"
+#line 1811 "./parse.y"
 { ctxp->osb_number = 1; ;
     break;}
 case 383:
-#line 1809 "./parse.y"
+#line 1813 "./parse.y"
 { ctxp->osb_number++; ;
     break;}
 case 384:
-#line 1811 "./parse.y"
+#line 1815 "./parse.y"
 { yyerror ("']' expected"); RECOVER;;
     break;}
 case 385:
-#line 1816 "./parse.y"
+#line 1820 "./parse.y"
 { yyval.node = make_qualified_primary (yyvsp[-2].node, yyvsp[0].node, yyvsp[-1].operator.location); ;
     break;}
 case 386:
-#line 1820 "./parse.y"
+#line 1824 "./parse.y"
 {
 		  tree super_wfl = 
 		    build_wfl_node (super_identifier_node, 
@@ -4212,19 +4216,19 @@ case 386:
 		;
     break;}
 case 387:
-#line 1828 "./parse.y"
+#line 1832 "./parse.y"
 {yyerror ("Field expected"); DRECOVER (super_field_acces);;
     break;}
 case 388:
-#line 1833 "./parse.y"
+#line 1837 "./parse.y"
 { yyval.node = build_method_invocation (yyvsp[-2].node, NULL_TREE); ;
     break;}
 case 389:
-#line 1835 "./parse.y"
+#line 1839 "./parse.y"
 { yyval.node = build_method_invocation (yyvsp[-3].node, yyvsp[-1].node); ;
     break;}
 case 390:
-#line 1837 "./parse.y"
+#line 1841 "./parse.y"
 { 
 		  if (TREE_CODE (yyvsp[-4].node) == THIS_EXPR)
 		    yyval.node = build_this_super_qualified_invocation 
@@ -4237,7 +4241,7 @@ case 390:
 		;
     break;}
 case 391:
-#line 1848 "./parse.y"
+#line 1852 "./parse.y"
 { 
 		  if (TREE_CODE (yyvsp[-5].node) == THIS_EXPR)
 		    yyval.node = build_this_super_qualified_invocation 
@@ -4250,121 +4254,121 @@ case 391:
 		;
     break;}
 case 392:
-#line 1859 "./parse.y"
+#line 1863 "./parse.y"
 { 
 		  yyval.node = build_this_super_qualified_invocation 
 		    (0, yyvsp[-2].node, NULL_TREE, yyvsp[-4].operator.location, yyvsp[-3].operator.location);
 		;
     break;}
 case 393:
-#line 1864 "./parse.y"
+#line 1868 "./parse.y"
 {
 		  yyval.node = build_this_super_qualified_invocation 
 		    (0, yyvsp[-3].node, yyvsp[-1].node, yyvsp[-5].operator.location, yyvsp[-4].operator.location);
 		;
     break;}
 case 394:
-#line 1873 "./parse.y"
+#line 1877 "./parse.y"
 { yyerror ("'(' expected"); DRECOVER (method_invocation); ;
     break;}
 case 395:
-#line 1875 "./parse.y"
+#line 1879 "./parse.y"
 { yyerror ("'(' expected"); DRECOVER (method_invocation); ;
     break;}
 case 396:
-#line 1880 "./parse.y"
+#line 1884 "./parse.y"
 { yyval.node = build_array_ref (yyvsp[-2].operator.location, yyvsp[-3].node, yyvsp[-1].node); ;
     break;}
 case 397:
-#line 1882 "./parse.y"
+#line 1886 "./parse.y"
 { yyval.node = build_array_ref (yyvsp[-2].operator.location, yyvsp[-3].node, yyvsp[-1].node); ;
     break;}
 case 398:
-#line 1884 "./parse.y"
+#line 1888 "./parse.y"
 {
 		  yyerror ("Missing term and ']' expected");
 		  DRECOVER(array_access);
 		;
     break;}
 case 399:
-#line 1889 "./parse.y"
+#line 1893 "./parse.y"
 {
 		  yyerror ("']' expected");
 		  DRECOVER(array_access);
 		;
     break;}
 case 400:
-#line 1894 "./parse.y"
+#line 1898 "./parse.y"
 {
 		  yyerror ("Missing term and ']' expected");
 		  DRECOVER(array_access);
 		;
     break;}
 case 401:
-#line 1899 "./parse.y"
+#line 1903 "./parse.y"
 {
 		  yyerror ("']' expected");
 		  DRECOVER(array_access);
 		;
     break;}
 case 406:
-#line 1914 "./parse.y"
+#line 1918 "./parse.y"
 { yyval.node = build_incdec (yyvsp[0].operator.token, yyvsp[0].operator.location, yyvsp[-1].node, 1); ;
     break;}
 case 407:
-#line 1919 "./parse.y"
+#line 1923 "./parse.y"
 { yyval.node = build_incdec (yyvsp[0].operator.token, yyvsp[0].operator.location, yyvsp[-1].node, 1); ;
     break;}
 case 410:
-#line 1926 "./parse.y"
+#line 1930 "./parse.y"
 {yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ;
     break;}
 case 411:
-#line 1928 "./parse.y"
+#line 1932 "./parse.y"
 {yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ;
     break;}
 case 413:
-#line 1931 "./parse.y"
+#line 1935 "./parse.y"
 {yyerror ("Missing term"); RECOVER;
     break;}
 case 414:
-#line 1933 "./parse.y"
+#line 1937 "./parse.y"
 {yyerror ("Missing term"); RECOVER;
     break;}
 case 415:
-#line 1938 "./parse.y"
+#line 1942 "./parse.y"
 {yyval.node = build_incdec (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node, 0); ;
     break;}
 case 416:
-#line 1940 "./parse.y"
+#line 1944 "./parse.y"
 {yyerror ("Missing term"); RECOVER;
     break;}
 case 417:
-#line 1945 "./parse.y"
+#line 1949 "./parse.y"
 {yyval.node = build_incdec (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node, 0); ;
     break;}
 case 418:
-#line 1947 "./parse.y"
+#line 1951 "./parse.y"
 {yyerror ("Missing term"); RECOVER;
     break;}
 case 420:
-#line 1953 "./parse.y"
+#line 1957 "./parse.y"
 {yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ;
     break;}
 case 421:
-#line 1955 "./parse.y"
+#line 1959 "./parse.y"
 {yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ;
     break;}
 case 423:
-#line 1958 "./parse.y"
+#line 1962 "./parse.y"
 {yyerror ("Missing term"); RECOVER;
     break;}
 case 424:
-#line 1960 "./parse.y"
+#line 1964 "./parse.y"
 {yyerror ("Missing term"); RECOVER;
     break;}
 case 425:
-#line 1965 "./parse.y"
+#line 1969 "./parse.y"
 { 
 		  tree type = yyvsp[-3].node;
 		  while (ctxp->osb_number--)
@@ -4373,15 +4377,15 @@ case 425:
 		;
     break;}
 case 426:
-#line 1972 "./parse.y"
+#line 1976 "./parse.y"
 { yyval.node = build_cast (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node); ;
     break;}
 case 427:
-#line 1974 "./parse.y"
+#line 1978 "./parse.y"
 { yyval.node = build_cast (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node); ;
     break;}
 case 428:
-#line 1976 "./parse.y"
+#line 1980 "./parse.y"
 { 
 		  char *ptr;
 		  while (ctxp->osb_number--)
@@ -4395,11 +4399,11 @@ case 428:
 		;
     break;}
 case 429:
-#line 1988 "./parse.y"
+#line 1992 "./parse.y"
 {yyerror ("']' expected, invalid type expression");;
     break;}
 case 430:
-#line 1990 "./parse.y"
+#line 1994 "./parse.y"
 {
 	          if (ctxp->prevent_ese != lineno)
 		    yyerror ("Invalid type expression"); RECOVER;
@@ -4407,243 +4411,243 @@ case 430:
 		;
     break;}
 case 431:
-#line 1996 "./parse.y"
+#line 2000 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 432:
-#line 1998 "./parse.y"
+#line 2002 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 433:
-#line 2000 "./parse.y"
+#line 2004 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 435:
-#line 2006 "./parse.y"
+#line 2010 "./parse.y"
 { 
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), 
 				    yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node);
 		;
     break;}
 case 436:
-#line 2011 "./parse.y"
+#line 2015 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 437:
-#line 2016 "./parse.y"
+#line 2020 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 438:
-#line 2021 "./parse.y"
+#line 2025 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 439:
-#line 2023 "./parse.y"
+#line 2027 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 440:
-#line 2025 "./parse.y"
+#line 2029 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 442:
-#line 2031 "./parse.y"
+#line 2035 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 443:
-#line 2036 "./parse.y"
+#line 2040 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 444:
-#line 2041 "./parse.y"
+#line 2045 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 445:
-#line 2043 "./parse.y"
+#line 2047 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 447:
-#line 2049 "./parse.y"
+#line 2053 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 448:
-#line 2054 "./parse.y"
+#line 2058 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 449:
-#line 2059 "./parse.y"
+#line 2063 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 450:
-#line 2064 "./parse.y"
+#line 2068 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 451:
-#line 2066 "./parse.y"
+#line 2070 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 452:
-#line 2068 "./parse.y"
+#line 2072 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 454:
-#line 2074 "./parse.y"
+#line 2078 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 455:
-#line 2079 "./parse.y"
+#line 2083 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 456:
-#line 2084 "./parse.y"
+#line 2088 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 457:
-#line 2089 "./parse.y"
+#line 2093 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 458:
-#line 2094 "./parse.y"
+#line 2098 "./parse.y"
 { yyval.node = build_binop (INSTANCEOF_EXPR, yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ;
     break;}
 case 459:
-#line 2096 "./parse.y"
+#line 2100 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 460:
-#line 2098 "./parse.y"
+#line 2102 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 461:
-#line 2100 "./parse.y"
+#line 2104 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 462:
-#line 2102 "./parse.y"
+#line 2106 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 463:
-#line 2104 "./parse.y"
+#line 2108 "./parse.y"
 {yyerror ("Invalid reference type"); RECOVER;;
     break;}
 case 465:
-#line 2110 "./parse.y"
+#line 2114 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 466:
-#line 2115 "./parse.y"
+#line 2119 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 467:
-#line 2120 "./parse.y"
+#line 2124 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 468:
-#line 2122 "./parse.y"
+#line 2126 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 470:
-#line 2128 "./parse.y"
+#line 2132 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 471:
-#line 2133 "./parse.y"
+#line 2137 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 473:
-#line 2139 "./parse.y"
+#line 2143 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 474:
-#line 2144 "./parse.y"
+#line 2148 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 476:
-#line 2150 "./parse.y"
+#line 2154 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 477:
-#line 2155 "./parse.y"
+#line 2159 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 479:
-#line 2161 "./parse.y"
+#line 2165 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 480:
-#line 2166 "./parse.y"
+#line 2170 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 482:
-#line 2172 "./parse.y"
+#line 2176 "./parse.y"
 {
 		  yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
 				    yyvsp[-2].node, yyvsp[0].node); 
 		;
     break;}
 case 483:
-#line 2177 "./parse.y"
+#line 2181 "./parse.y"
 {yyerror ("Missing term"); RECOVER;;
     break;}
 case 485:
-#line 2183 "./parse.y"
+#line 2187 "./parse.y"
 {
 		  yyval.node = build (CONDITIONAL_EXPR, NULL_TREE, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node);
 		  EXPR_WFL_LINECOL (yyval.node) = yyvsp[-3].operator.location;
 		;
     break;}
 case 486:
-#line 2188 "./parse.y"
+#line 2192 "./parse.y"
 {
 		  YYERROR_NOW;
 		  yyerror ("Missing term");
@@ -4651,19 +4655,19 @@ case 486:
 		;
     break;}
 case 487:
-#line 2194 "./parse.y"
+#line 2198 "./parse.y"
 {yyerror ("Missing term"); DRECOVER (2);;
     break;}
 case 488:
-#line 2196 "./parse.y"
+#line 2200 "./parse.y"
 {yyerror ("Missing term"); DRECOVER (3);;
     break;}
 case 491:
-#line 2206 "./parse.y"
+#line 2210 "./parse.y"
 { yyval.node = build_assignment (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ;
     break;}
 case 492:
-#line 2208 "./parse.y"
+#line 2212 "./parse.y"
 {
 		  if (ctxp->prevent_ese != lineno)
 		    yyerror ("Missing term");
@@ -4672,7 +4676,7 @@ case 492:
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/cygnus/gnupro-98r1/share/bison.simple"
+#line 498 "/usr/share/misc/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -4868,7 +4872,7 @@ yyerrhandle:
   yystate = yyn;
   goto yynewstate;
 }
-#line 2234 "./parse.y"
+#line 2238 "./parse.y"
 
 
 
@@ -5416,7 +5420,9 @@ check_class_interface_creation (is_interface, flags, raw_name, qualified_name, d
 
       /* Contains OS dependent assumption on path separator. FIXME */
       for (f = &input_filename [strlen (input_filename)]; 
-	   f != input_filename && f[0] != '/'; f--);
+	   f != input_filename && f[0] != '/' && f[0] != DIR_SEPARATOR;
+	   f--)
+	;
       if (f[0] == '/')
 	f++;
       if (strncmp (IDENTIFIER_POINTER (raw_name), 

gcc/java/parse.y

@@ -70,6 +70,10 @@ definitions and other extensions.  */
 #include "convert.h"
 #include "buffer.h"
 
+#ifndef DIR_SEPARATOR
+#define DIR_SEPARATOR '/'
+#endif
+
 /* Local function prototypes */
 static char *java_accstring_lookup PROTO ((int));
 static void  classitf_redefinition_error PROTO ((char *,tree, tree, tree));
@@ -2778,7 +2782,9 @@ check_class_interface_creation (is_interface, flags, raw_name, qualified_name, d
 
       /* Contains OS dependent assumption on path separator. FIXME */
       for (f = &input_filename [strlen (input_filename)]; 
-	   f != input_filename && f[0] != '/'; f--);
+	   f != input_filename && f[0] != '/' && f[0] != DIR_SEPARATOR;
+	   f--)
+	;
       if (f[0] == '/')
 	f++;
       if (strncmp (IDENTIFIER_POINTER (raw_name),