Skip to content

R
riscv-gcc-1
Commit e85ac860 by Per Bothner
Options

*** empty log message *** 

From-SVN: r26016
parent b635eb2f
Showing with 526 additions and 578 deletions
gcc/java/parse.c
......@@ -262,16 +262,15 @@ static tree add_stmt_to_compound PROTO ((tree, tree, tree));
static tree add_stmt_to_block PROTO ((tree, tree, tree));
static tree patch_exit_expr PROTO ((tree));
static tree build_labeled_block PROTO ((int, tree));
static tree generate_labeled_block PROTO (());
static tree complete_labeled_statement PROTO ((tree, tree));
static tree finish_labeled_statement PROTO ((tree, tree));
static tree build_bc_statement PROTO ((int, int, tree));
static tree patch_bc_statement PROTO ((tree));
static tree patch_loop_statement PROTO ((tree));
static tree build_new_loop PROTO ((tree));
static tree build_loop_body PROTO ((int, tree, int));
static tree complete_loop_body PROTO ((int, tree, tree, int));
static tree finish_loop_body PROTO ((int, tree, tree, int));
static tree build_debugable_stmt PROTO ((int, tree));
static tree complete_for_loop PROTO ((int, tree, tree, tree));
static tree finish_for_loop PROTO ((int, tree, tree, tree));
static tree patch_switch_statement PROTO ((tree));
static tree string_constant_concatenation PROTO ((tree, tree));
static tree build_string_concatenation PROTO ((tree, tree));
......@@ -286,7 +285,7 @@ static void check_thrown_exceptions PROTO ((int, tree));
static int check_thrown_exceptions_do PROTO ((tree));
static void purge_unchecked_exceptions PROTO ((tree));
static void check_throws_clauses PROTO ((tree, tree, tree));
static void complete_method_declaration PROTO ((tree));
static void finish_method_declaration PROTO ((tree));
static tree build_super_invocation PROTO (());
static int verify_constructor_circularity PROTO ((tree, tree));
static char *constructor_circularity_msg PROTO ((tree, tree));
......@@ -368,7 +367,7 @@ static tree java_lang_id = NULL_TREE;
/* The "java.lang.Cloneable" qualified name. */
static tree java_lang_cloneable = NULL_TREE;
#line 296 "./parse.y"
#line 295 "./parse.y"
typedef union {
tree node;
int sub_token;
......@@ -378,7 +377,7 @@ typedef union {
} operator;
int value;
} YYSTYPE;
#line 306 "./parse.y"
#line 305 "./parse.y"
#include "lex.c"
#ifndef YYDEBUG
......@@ -675,56 +674,56 @@ static const short yyrhs[] = { 123,
#if YYDEBUG != 0
static const short yyrline[] = { 0,
450, 456, 458, 459, 460, 461, 462, 466, 468, 471,
473, 474, 477, 479, 482, 486, 490, 494, 500, 502,
504, 506, 511, 513, 516, 520, 525, 530, 532, 533,
534, 535, 536, 537, 538, 541, 546, 552, 554, 557,
560, 562, 566, 568, 571, 598, 600, 604, 617, 619,
623, 630, 631, 633, 643, 648, 663, 667, 670, 673,
676, 678, 680, 685, 689, 691, 693, 695, 699, 701,
703, 710, 716, 721, 725, 728, 732, 734, 737, 739,
740, 741, 745, 747, 749, 750, 752, 757, 760, 770,
773, 775, 779, 782, 789, 795, 803, 805, 807, 809,
811, 815, 817, 821, 828, 829, 833, 836, 838, 840,
842, 844, 846, 848, 850, 857, 860, 862, 871, 873,
877, 882, 887, 891, 896, 898, 900, 907, 909, 911,
915, 918, 920, 924, 926, 927, 932, 937, 943, 951,
958, 961, 964, 968, 971, 975, 984, 986, 988, 993,
1000, 1008, 1010, 1014, 1021, 1031, 1035, 1038, 1041, 1044,
1047, 1050, 1053, 1056, 1058, 1062, 1068, 1073, 1075, 1079,
1082, 1086, 1088, 1091, 1093, 1094, 1096, 1100, 1104, 1110,
1115, 1118, 1120, 1124, 1130, 1134, 1139, 1142, 1146, 1151,
1159, 1161, 1164, 1166, 1168, 1172, 1176, 1179, 1183, 1185,
1186, 1187, 1188, 1189, 1199, 1201, 1202, 1203, 1204, 1207,
1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218,
1221, 1226, 1237, 1244, 1248, 1259, 1269, 1275, 1281, 1287,
1289, 1295, 1297, 1303, 1305, 1307, 1309, 1311, 1315, 1317,
1318, 1319, 1320, 1321, 1322, 1325, 1331, 1333, 1335, 1339,
1344, 1349, 1355, 1365, 1371, 1373, 1375, 1382, 1385, 1387,
1389, 1393, 1395, 1398, 1402, 1404, 1407, 1414, 1420, 1422,
1424, 1428, 1436, 1439, 1441, 1443, 1447, 1452, 1461, 1466,
1469, 1476, 1478, 1480, 1484, 1487, 1496, 1503, 1505, 1509,
1522, 1524, 1530, 1536, 1540, 1542, 1546, 1549, 1551, 1555,
1558, 1560, 1562, 1566, 1569, 1571, 1573, 1577, 1580, 1582,
1584, 1588, 1594, 1596, 1600, 1607, 1609, 1611, 1613, 1617,
1625, 1628, 1630, 1635, 1639, 1641, 1648, 1656, 1673, 1675,
1677, 1681, 1684, 1689, 1691, 1694, 1696, 1698, 1700, 1701,
1702, 1703, 1707, 1709, 1711, 1716, 1718, 1720, 1722, 1724,
1728, 1731, 1736, 1738, 1743, 1744, 1745, 1746, 1747, 1749,
1751, 1753, 1755, 1757, 1761, 1763, 1766, 1772, 1777, 1781,
1784, 1786, 1788, 1792, 1794, 1796, 1798, 1802, 1805, 1809,
1815, 1817, 1825, 1852, 1854, 1858, 1863, 1870, 1874, 1877,
1879, 1890, 1901, 1906, 1915, 1917, 1921, 1924, 1926, 1931,
1936, 1941, 1948, 1950, 1951, 1952, 1955, 1960, 1965, 1967,
1968, 1970, 1972, 1973, 1975, 1979, 1982, 1986, 1989, 1993,
1995, 1997, 1999, 2000, 2002, 2006, 2015, 2017, 2019, 2032,
2034, 2040, 2042, 2044, 2048, 2050, 2055, 2060, 2065, 2067,
2069, 2073, 2075, 2080, 2085, 2087, 2091, 2093, 2098, 2103,
2108, 2110, 2112, 2116, 2118, 2123, 2128, 2133, 2138, 2140,
2142, 2144, 2146, 2148, 2152, 2154, 2159, 2164, 2166, 2170,
2172, 2177, 2181, 2183, 2188, 2192, 2194, 2199, 2203, 2205,
2210, 2214, 2216, 2221, 2225, 2227, 2232, 2238, 2240, 2244,
2246, 2249, 2252, 2260, 2262, 2263, 2266, 2268, 2271, 2275
449, 455, 457, 458, 459, 460, 461, 465, 467, 470,
472, 473, 476, 478, 481, 485, 489, 493, 499, 501,
503, 505, 510, 512, 515, 519, 524, 529, 531, 532,
533, 534, 535, 536, 537, 540, 545, 551, 553, 556,
559, 561, 565, 567, 570, 597, 599, 603, 616, 618,
622, 629, 630, 632, 642, 647, 662, 666, 669, 672,
675, 677, 679, 684, 688, 690, 692, 694, 698, 700,
702, 709, 715, 720, 724, 727, 731, 733, 736, 738,
739, 740, 744, 746, 748, 749, 751, 756, 759, 769,
772, 774, 778, 781, 788, 794, 802, 804, 806, 808,
810, 814, 816, 820, 827, 828, 832, 835, 837, 839,
841, 843, 845, 847, 849, 856, 859, 861, 870, 872,
876, 881, 886, 890, 895, 897, 899, 906, 908, 910,
914, 917, 919, 923, 925, 926, 931, 936, 942, 950,
957, 960, 963, 967, 970, 974, 983, 985, 987, 992,
999, 1007, 1009, 1013, 1020, 1030, 1034, 1037, 1040, 1043,
1046, 1049, 1052, 1055, 1057, 1061, 1067, 1072, 1074, 1078,
1081, 1085, 1087, 1090, 1092, 1093, 1095, 1099, 1103, 1109,
1114, 1117, 1119, 1123, 1129, 1133, 1138, 1141, 1145, 1150,
1158, 1160, 1163, 1165, 1167, 1171, 1175, 1178, 1182, 1184,
1185, 1186, 1187, 1188, 1198, 1200, 1201, 1202, 1203, 1206,
1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217,
1220, 1225, 1236, 1239, 1243, 1250, 1260, 1266, 1272, 1278,
1280, 1286, 1288, 1294, 1296, 1298, 1300, 1302, 1306, 1308,
1309, 1310, 1311, 1312, 1313, 1316, 1322, 1324, 1326, 1330,
1335, 1340, 1346, 1356, 1362, 1364, 1366, 1373, 1376, 1378,
1380, 1384, 1386, 1389, 1393, 1395, 1398, 1405, 1411, 1413,
1415, 1419, 1427, 1430, 1432, 1434, 1438, 1443, 1452, 1457,
1460, 1467, 1469, 1471, 1475, 1478, 1487, 1494, 1496, 1500,
1513, 1515, 1521, 1527, 1531, 1533, 1537, 1540, 1542, 1546,
1549, 1551, 1553, 1557, 1560, 1562, 1564, 1568, 1571, 1573,
1575, 1579, 1585, 1587, 1591, 1598, 1600, 1602, 1604, 1608,
1616, 1619, 1621, 1626, 1630, 1632, 1639, 1647, 1664, 1666,
1668, 1672, 1675, 1680, 1682, 1685, 1687, 1689, 1691, 1692,
1693, 1694, 1698, 1700, 1702, 1707, 1709, 1711, 1713, 1715,
1719, 1722, 1727, 1729, 1734, 1735, 1736, 1737, 1738, 1740,
1742, 1744, 1746, 1748, 1752, 1754, 1757, 1763, 1768, 1772,
1775, 1777, 1779, 1783, 1785, 1787, 1789, 1793, 1796, 1800,
1806, 1808, 1816, 1843, 1845, 1849, 1854, 1861, 1865, 1868,
1870, 1881, 1892, 1897, 1906, 1908, 1912, 1915, 1917, 1922,
1927, 1932, 1939, 1941, 1942, 1943, 1946, 1951, 1956, 1958,
1959, 1961, 1963, 1964, 1966, 1970, 1973, 1977, 1980, 1984,
1986, 1988, 1990, 1991, 1993, 1997, 2006, 2008, 2010, 2023,
2025, 2031, 2033, 2035, 2039, 2041, 2046, 2051, 2056, 2058,
2060, 2064, 2066, 2071, 2076, 2078, 2082, 2084, 2089, 2094,
2099, 2101, 2103, 2107, 2109, 2114, 2119, 2124, 2129, 2131,
2133, 2135, 2137, 2139, 2143, 2145, 2150, 2155, 2157, 2161,
2163, 2168, 2172, 2174, 2179, 2183, 2185, 2190, 2194, 2196,
2201, 2205, 2207, 2212, 2216, 2218, 2223, 2229, 2231, 2235,
2237, 2240, 2243, 2251, 2253, 2254, 2257, 2259, 2262, 2266
};
#endif
......@@ -2720,66 +2719,66 @@ yyreduce:
switch (yyn) {
case 1:
#line 452 "./parse.y"
#line 451 "./parse.y"
{;
break;}
case 18:
#line 496 "./parse.y"
#line 495 "./parse.y"
{
yyval.node = build_java_array_type (yyvsp[-2].node, -1);
CLASS_LOADED_P (yyval.node) = 1;
;
break;}
case 19:
#line 501 "./parse.y"
#line 500 "./parse.y"
{ yyval.node = build_unresolved_array_type (yyvsp[-2].node); ;
break;}
case 20:
#line 503 "./parse.y"
#line 502 "./parse.y"
{ yyval.node = build_unresolved_array_type (yyvsp[-2].node); ;
break;}
case 21:
#line 505 "./parse.y"
#line 504 "./parse.y"
{RULE ("']' expected"); RECOVER;;
break;}
case 22:
#line 507 "./parse.y"
#line 506 "./parse.y"
{RULE ("']' expected"); RECOVER;;
break;}
case 26:
#line 522 "./parse.y"
#line 521 "./parse.y"
{ yyval.node = make_qualified_name (yyvsp[-2].node, yyvsp[0].node, yyvsp[-1].operator.location); ;
break;}
case 28:
#line 531 "./parse.y"
#line 530 "./parse.y"
{yyval.node = NULL;;
break;}
case 36:
#line 543 "./parse.y"
#line 542 "./parse.y"
{
yyval.node = NULL;
;
break;}
case 37:
#line 547 "./parse.y"
#line 546 "./parse.y"
{
yyval.node = NULL;
;
break;}
case 40:
#line 559 "./parse.y"
#line 558 "./parse.y"
{ ctxp->package = EXPR_WFL_NODE (yyvsp[-1].node); ;
break;}
case 41:
#line 561 "./parse.y"
#line 560 "./parse.y"
{yyerror ("Missing name"); RECOVER;;
break;}
case 42:
#line 563 "./parse.y"
#line 562 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 45:
#line 573 "./parse.y"
#line 572 "./parse.y"
{
tree name = EXPR_WFL_NODE (yyvsp[-1].node), node, last_name;
int i = IDENTIFIER_LENGTH (name)-1;
......@@ -2807,15 +2806,15 @@ case 45:
;
break;}
case 46:
#line 599 "./parse.y"
#line 598 "./parse.y"
{yyerror ("Missing name"); RECOVER;;
break;}
case 47:
#line 601 "./parse.y"
#line 600 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 48:
#line 606 "./parse.y"
#line 605 "./parse.y"
{
tree name = EXPR_WFL_NODE (yyvsp[-3].node);
/* Don't import java.lang.* twice. */
......@@ -2829,15 +2828,15 @@ case 48:
;
break;}
case 49:
#line 618 "./parse.y"
#line 617 "./parse.y"
{yyerror ("'*' expected"); RECOVER;;
break;}
case 50:
#line 620 "./parse.y"
#line 619 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 51:
#line 625 "./parse.y"
#line 624 "./parse.y"
{
maybe_generate_finit ();
maybe_generate_clinit ();
......@@ -2845,24 +2844,24 @@ case 51:
;
break;}
case 53:
#line 632 "./parse.y"
#line 631 "./parse.y"
{ yyval.node = NULL; ;
break;}
case 54:
#line 634 "./parse.y"
#line 633 "./parse.y"
{
YYERROR_NOW;
yyerror ("Class or interface declaration expected");
;
break;}
case 55:
#line 645 "./parse.y"
#line 644 "./parse.y"
{
yyval.value = (1 << yyvsp[0].value);
;
break;}
case 56:
#line 649 "./parse.y"
#line 648 "./parse.y"
{
int acc = (1 << yyvsp[0].value);
if (yyval.value & acc)
......@@ -2876,123 +2875,123 @@ case 56:
;
break;}
case 57:
#line 665 "./parse.y"
#line 664 "./parse.y"
{ create_class (yyvsp[-4].value, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 58:
#line 667 "./parse.y"
#line 666 "./parse.y"
{
yyval.node = yyvsp[0].node;
;
break;}
case 59:
#line 671 "./parse.y"
#line 670 "./parse.y"
{ create_class (0, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 60:
#line 673 "./parse.y"
#line 672 "./parse.y"
{
yyval.node = yyvsp[0].node;
;
break;}
case 61:
#line 677 "./parse.y"
#line 676 "./parse.y"
{yyerror ("Missing class name"); RECOVER;;
break;}
case 62:
#line 679 "./parse.y"
#line 678 "./parse.y"
{yyerror ("Missing class name"); RECOVER;;
break;}
case 63:
#line 681 "./parse.y"
#line 680 "./parse.y"
{
if (!ctxp->class_err) yyerror ("'{' expected");
DRECOVER(class1);
;
break;}
case 64:
#line 686 "./parse.y"
#line 685 "./parse.y"
{if (!ctxp->class_err) yyerror ("'{' expected"); RECOVER;;
break;}
case 65:
#line 690 "./parse.y"
#line 689 "./parse.y"
{ yyval.node = NULL; ;
break;}
case 66:
#line 692 "./parse.y"
#line 691 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 67:
#line 694 "./parse.y"
#line 693 "./parse.y"
{yyerror ("'{' expected"); ctxp->class_err=1;;
break;}
case 68:
#line 696 "./parse.y"
#line 695 "./parse.y"
{yyerror ("Missing super class name"); ctxp->class_err=1;;
break;}
case 69:
#line 700 "./parse.y"
#line 699 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 70:
#line 702 "./parse.y"
#line 701 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 71:
#line 704 "./parse.y"
#line 703 "./parse.y"
{
ctxp->class_err=1;
yyerror ("Missing interface name");
;
break;}
case 72:
#line 712 "./parse.y"
#line 711 "./parse.y"
{
ctxp->interface_number = 1;
yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE);
;
break;}
case 73:
#line 717 "./parse.y"
#line 716 "./parse.y"
{
ctxp->interface_number++;
yyval.node = chainon (yyvsp[-2].node, build_tree_list (yyvsp[0].node, NULL_TREE));
;
break;}
case 74:
#line 722 "./parse.y"
#line 721 "./parse.y"
{yyerror ("Missing interface name"); RECOVER;;
break;}
case 75:
#line 727 "./parse.y"
#line 726 "./parse.y"
{ yyval.node = ctxp->current_parsed_class; ;
break;}
case 76:
#line 729 "./parse.y"
#line 728 "./parse.y"
{ yyval.node = ctxp->current_parsed_class; ;
break;}
case 82:
#line 742 "./parse.y"
#line 741 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("instance initializer"); ;
break;}
case 84:
#line 748 "./parse.y"
#line 747 "./parse.y"
{ yyval.node = yyvsp[-1].node; ;
break;}
case 86:
#line 751 "./parse.y"
#line 750 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("inner classe declaration"); ;
break;}
case 87:
#line 753 "./parse.y"
#line 752 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("inner interface declaration"); ;
break;}
case 88:
#line 759 "./parse.y"
#line 758 "./parse.y"
{ register_fields (0, yyvsp[-2].node, yyvsp[-1].node); ;
break;}
case 89:
#line 761 "./parse.y"
#line 760 "./parse.y"
{
check_modifiers
("Illegal modifier `%s' for field declaration",
......@@ -3002,19 +3001,19 @@ case 89:
;
break;}
case 91:
#line 774 "./parse.y"
#line 773 "./parse.y"
{ yyval.node = chainon (yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 92:
#line 776 "./parse.y"
#line 775 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 93:
#line 781 "./parse.y"
#line 780 "./parse.y"
{ yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE); ;
break;}
case 94:
#line 783 "./parse.y"
#line 782 "./parse.y"
{
if (java_error_count)
yyvsp[0].node = NULL_TREE;
......@@ -3023,7 +3022,7 @@ case 94:
;
break;}
case 95:
#line 790 "./parse.y"
#line 789 "./parse.y"
{
yyerror ("Missing variable initializer");
yyval.node = build_tree_list (yyvsp[-2].node, NULL_TREE);
......@@ -3031,7 +3030,7 @@ case 95:
;
break;}
case 96:
#line 796 "./parse.y"
#line 795 "./parse.y"
{
yyerror ("';' expected");
yyval.node = build_tree_list (yyvsp[-3].node, NULL_TREE);
......@@ -3039,85 +3038,85 @@ case 96:
;
break;}
case 98:
#line 806 "./parse.y"
#line 805 "./parse.y"
{ yyval.node = build_unresolved_array_type (yyvsp[-2].node); ;
break;}
case 99:
#line 808 "./parse.y"
#line 807 "./parse.y"
{yyerror ("Invalid declaration"); DRECOVER(vdi);;
break;}
case 100:
#line 810 "./parse.y"
#line 809 "./parse.y"
{yyerror ("']' expected"); DRECOVER(vdi);;
break;}
case 101:
#line 812 "./parse.y"
#line 811 "./parse.y"
{yyerror ("Unbalanced ']'"); DRECOVER(vdi);;
break;}
case 104:
#line 823 "./parse.y"
#line 822 "./parse.y"
{
current_function_decl = yyvsp[0].node;
source_start_java_method (current_function_decl);
;
break;}
case 105:
#line 828 "./parse.y"
{ complete_method_declaration (yyvsp[0].node); ;
#line 827 "./parse.y"
{ finish_method_declaration (yyvsp[0].node); ;
break;}
case 106:
#line 830 "./parse.y"
#line 829 "./parse.y"
{YYNOT_TWICE yyerror ("'{' expected"); RECOVER;;
break;}
case 107:
#line 835 "./parse.y"
#line 834 "./parse.y"
{ yyval.node = method_header (0, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 108:
#line 837 "./parse.y"
#line 836 "./parse.y"
{ yyval.node = method_header (0, void_type_node, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 109:
#line 839 "./parse.y"
#line 838 "./parse.y"
{ yyval.node = method_header (yyvsp[-3].value, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 110:
#line 841 "./parse.y"
#line 840 "./parse.y"
{ yyval.node = method_header (yyvsp[-3].value, void_type_node, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 111:
#line 843 "./parse.y"
#line 842 "./parse.y"
{RECOVER;;
break;}
case 112:
#line 845 "./parse.y"
#line 844 "./parse.y"
{RECOVER;;
break;}
case 113:
#line 847 "./parse.y"
#line 846 "./parse.y"
{yyerror ("Identifier expected"); RECOVER;;
break;}
case 114:
#line 849 "./parse.y"
#line 848 "./parse.y"
{yyerror ("Identifier expected"); RECOVER;;
break;}
case 115:
#line 851 "./parse.y"
#line 850 "./parse.y"
{
yyerror ("Invalid method declaration, return type required");
RECOVER;
;
break;}
case 116:
#line 859 "./parse.y"
#line 858 "./parse.y"
{ yyval.node = method_declarator (yyvsp[-2].node, NULL_TREE); ;
break;}
case 117:
#line 861 "./parse.y"
#line 860 "./parse.y"
{ yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 118:
#line 863 "./parse.y"
#line 862 "./parse.y"
{
EXPR_WFL_LINECOL (wfl_operator) = yyvsp[-1].operator.location;
TREE_PURPOSE (yyvsp[-2].node) =
......@@ -3128,145 +3127,145 @@ case 118:
;
break;}
case 119:
#line 872 "./parse.y"
#line 871 "./parse.y"
{yyerror ("')' expected"); DRECOVER(method_declarator);;
break;}
case 120:
#line 874 "./parse.y"
#line 873 "./parse.y"
{yyerror ("']' expected"); RECOVER;;
break;}
case 121:
#line 879 "./parse.y"
#line 878 "./parse.y"
{
ctxp->formal_parameter_number = 1;
;
break;}
case 122:
#line 883 "./parse.y"
#line 882 "./parse.y"
{
ctxp->formal_parameter_number += 1;
yyval.node = chainon (yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 123:
#line 888 "./parse.y"
#line 887 "./parse.y"
{yyerror ("Missing formal parameter term"); RECOVER;;
break;}
case 124:
#line 893 "./parse.y"
#line 892 "./parse.y"
{
yyval.node = build_tree_list (yyvsp[0].node, yyvsp[-1].node);
;
break;}
case 125:
#line 897 "./parse.y"
#line 896 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("final parameters"); ;
break;}
case 126:
#line 899 "./parse.y"
#line 898 "./parse.y"
{yyerror ("Missing identifier"); RECOVER;;
break;}
case 127:
#line 901 "./parse.y"
#line 900 "./parse.y"
{
SOURCE_FRONTEND_DEBUG (("Modifiers: %d", yyvsp[-2].value));
yyerror ("Missing identifier"); RECOVER;
;
break;}
case 128:
#line 908 "./parse.y"
#line 907 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 129:
#line 910 "./parse.y"
#line 909 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 130:
#line 912 "./parse.y"
#line 911 "./parse.y"
{yyerror ("Missing class type term"); RECOVER;;
break;}
case 131:
#line 917 "./parse.y"
#line 916 "./parse.y"
{ yyval.node = build_tree_list (yyvsp[0].node, yyvsp[0].node); ;
break;}
case 132:
#line 919 "./parse.y"
#line 918 "./parse.y"
{ yyval.node = tree_cons (yyvsp[0].node, yyvsp[0].node, yyvsp[-2].node); ;
break;}
case 133:
#line 921 "./parse.y"
#line 920 "./parse.y"
{yyerror ("Missing class type term"); RECOVER;;
break;}
case 136:
#line 928 "./parse.y"
#line 927 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 137:
#line 934 "./parse.y"
#line 933 "./parse.y"
{
RULE ("STATIC_INITIALIZER");
;
break;}
case 138:
#line 938 "./parse.y"
#line 937 "./parse.y"
{
RULE ("STATIC_INITIALIZER");
;
break;}
case 139:
#line 945 "./parse.y"
#line 944 "./parse.y"
{
SOURCE_FRONTEND_DEBUG (("Modifiers: %d", yyvsp[0].value));
;
break;}
case 140:
#line 953 "./parse.y"
#line 952 "./parse.y"
{
current_function_decl = yyvsp[0].node;
source_start_java_method (current_function_decl);
;
break;}
case 141:
#line 958 "./parse.y"
{ complete_method_declaration (yyvsp[0].node); ;
#line 957 "./parse.y"
{ finish_method_declaration (yyvsp[0].node); ;
break;}
case 142:
#line 963 "./parse.y"
#line 962 "./parse.y"
{ yyval.node = method_header (0, NULL_TREE, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 143:
#line 965 "./parse.y"
#line 964 "./parse.y"
{ yyval.node = method_header (yyvsp[-2].value, NULL_TREE, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 144:
#line 970 "./parse.y"
#line 969 "./parse.y"
{ yyval.node = method_declarator (yyvsp[-2].node, NULL_TREE); ;
break;}
case 145:
#line 972 "./parse.y"
#line 971 "./parse.y"
{ yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 146:
#line 980 "./parse.y"
#line 979 "./parse.y"
{
BLOCK_EXPR_BODY (yyvsp[0].node) = empty_stmt_node;
yyval.node = yyvsp[0].node;
;
break;}
case 147:
#line 985 "./parse.y"
#line 984 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 148:
#line 987 "./parse.y"
#line 986 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 149:
#line 989 "./parse.y"
#line 988 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 150:
#line 995 "./parse.y"
#line 994 "./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);
......@@ -3274,7 +3273,7 @@ case 150:
;
break;}
case 151:
#line 1001 "./parse.y"
#line 1000 "./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);
......@@ -3282,15 +3281,15 @@ case 151:
;
break;}
case 152:
#line 1009 "./parse.y"
#line 1008 "./parse.y"
{yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ;
break;}
case 153:
#line 1011 "./parse.y"
#line 1010 "./parse.y"
{yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ;
break;}
case 154:
#line 1016 "./parse.y"
#line 1015 "./parse.y"
{
tree wfl = build_wfl_node (this_identifier_node);
EXPR_WFL_LINECOL (wfl) = yyvsp[0].operator.location;
......@@ -3298,7 +3297,7 @@ case 154:
;
break;}
case 155:
#line 1022 "./parse.y"
#line 1021 "./parse.y"
{
tree wfl = build_wfl_node (super_identifier_node);
EXPR_WFL_LINECOL (wfl) = yyvsp[0].operator.location;
......@@ -3306,168 +3305,168 @@ case 155:
;
break;}
case 156:
#line 1033 "./parse.y"
#line 1032 "./parse.y"
{ create_interface (0, yyvsp[0].node, NULL_TREE); ;
break;}
case 157:
#line 1035 "./parse.y"
#line 1034 "./parse.y"
{
yyval.node = yyvsp[0].node;
;
break;}
case 158:
#line 1039 "./parse.y"
#line 1038 "./parse.y"
{ create_interface (yyvsp[-2].value, yyvsp[0].node, NULL_TREE); ;
break;}
case 159:
#line 1041 "./parse.y"
#line 1040 "./parse.y"
{
yyval.node = yyvsp[0].node;
;
break;}
case 160:
#line 1045 "./parse.y"
#line 1044 "./parse.y"
{ create_interface (0, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 161:
#line 1047 "./parse.y"
#line 1046 "./parse.y"
{
yyval.node = yyvsp[0].node;
;
break;}
case 162:
#line 1051 "./parse.y"
#line 1050 "./parse.y"
{ create_interface (yyvsp[-3].value, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 163:
#line 1053 "./parse.y"
#line 1052 "./parse.y"
{
yyval.node = yyvsp[0].node;
;
break;}
case 164:
#line 1057 "./parse.y"
#line 1056 "./parse.y"
{yyerror ("'{' expected"); RECOVER;;
break;}
case 165:
#line 1059 "./parse.y"
#line 1058 "./parse.y"
{yyerror ("'{' expected"); RECOVER;;
break;}
case 166:
#line 1064 "./parse.y"
#line 1063 "./parse.y"
{
ctxp->interface_number = 1;
yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE);
;
break;}
case 167:
#line 1069 "./parse.y"
#line 1068 "./parse.y"
{
ctxp->interface_number++;
yyval.node = chainon (yyvsp[-2].node, build_tree_list (yyvsp[0].node, NULL_TREE));
;
break;}
case 168:
#line 1074 "./parse.y"
#line 1073 "./parse.y"
{yyerror ("Invalid interface type"); RECOVER;;
break;}
case 169:
#line 1076 "./parse.y"
#line 1075 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 170:
#line 1081 "./parse.y"
#line 1080 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 171:
#line 1083 "./parse.y"
#line 1082 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 176:
#line 1095 "./parse.y"
#line 1094 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("inner class declaration"); ;
break;}
case 177:
#line 1097 "./parse.y"
#line 1096 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("inner interface declaration"); ;
break;}
case 179:
#line 1106 "./parse.y"
#line 1105 "./parse.y"
{
check_abstract_method_header (yyvsp[-1].node);
current_function_decl = NULL_TREE; /* FIXME ? */
;
break;}
case 180:
#line 1111 "./parse.y"
#line 1110 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 181:
#line 1117 "./parse.y"
#line 1116 "./parse.y"
{ yyval.node = build_new_array_init (yyvsp[-1].operator.location, NULL_TREE); ;
break;}
case 182:
#line 1119 "./parse.y"
#line 1118 "./parse.y"
{ yyval.node = build_new_array_init (yyvsp[-2].operator.location, yyvsp[-1].node); ;
break;}
case 183:
#line 1121 "./parse.y"
#line 1120 "./parse.y"
{ yyval.node = build_new_array_init (yyvsp[-3].operator.location, yyvsp[-2].node); ;
break;}
case 184:
#line 1126 "./parse.y"
#line 1125 "./parse.y"
{
yyval.node = tree_cons (maybe_build_array_element_wfl (yyvsp[0].node),
yyvsp[0].node, NULL_TREE);
;
break;}
case 185:
#line 1131 "./parse.y"
#line 1130 "./parse.y"
{
yyval.node = tree_cons (maybe_build_array_element_wfl (yyvsp[0].node), yyvsp[0].node, yyvsp[-2].node);
;
break;}
case 186:
#line 1135 "./parse.y"
#line 1134 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 187:
#line 1141 "./parse.y"
#line 1140 "./parse.y"
{ yyval.node = empty_stmt_node; ;
break;}
case 188:
#line 1143 "./parse.y"
#line 1142 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 189:
#line 1148 "./parse.y"
#line 1147 "./parse.y"
{ enter_block (); ;
break;}
case 190:
#line 1153 "./parse.y"
#line 1152 "./parse.y"
{
maybe_absorb_scoping_blocks ();
yyval.node = exit_block ();
;
break;}
case 194:
#line 1167 "./parse.y"
#line 1166 "./parse.y"
{ java_method_add_stmt (current_function_decl, yyvsp[0].node); ;
break;}
case 195:
#line 1169 "./parse.y"
#line 1168 "./parse.y"
{ parse_jdk1_1_error ("inner class declaration"); ;
break;}
case 197:
#line 1178 "./parse.y"
#line 1177 "./parse.y"
{ declare_local_variables (0, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 198:
#line 1180 "./parse.y"
#line 1179 "./parse.y"
{ declare_local_variables (yyvsp[-2].value, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 204:
#line 1190 "./parse.y"
#line 1189 "./parse.y"
{
/* If the for loop is unlabeled, we must return the
block it was defined it. It our last chance to
......@@ -3477,11 +3476,11 @@ case 204:
;
break;}
case 221:
#line 1223 "./parse.y"
#line 1222 "./parse.y"
{ yyval.node = empty_stmt_node; ;
break;}
case 222:
#line 1228 "./parse.y"
#line 1227 "./parse.y"
{
yyval.node = build_labeled_block (EXPR_WFL_LINECOL (yyvsp[-1].node),
EXPR_WFL_NODE (yyvsp[-1].node));
......@@ -3491,27 +3490,19 @@ case 222:
;
break;}
case 223:
#line 1239 "./parse.y"
{
yyval.node = complete_labeled_statement (yyvsp[-1].node, yyvsp[0].node);
pop_labeled_block ();
POP_LABELED_BLOCK ();
;
#line 1238 "./parse.y"
{ yyval.node = finish_labeled_statement (yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 224:
#line 1245 "./parse.y"
#line 1240 "./parse.y"
{yyerror ("':' expected"); RECOVER;;
break;}
case 225:
#line 1250 "./parse.y"
{
yyval.node = complete_labeled_statement (yyvsp[-1].node, yyvsp[0].node);
pop_labeled_block ();
POP_LABELED_BLOCK ();
;
#line 1245 "./parse.y"
{ yyval.node = finish_labeled_statement (yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 226:
#line 1261 "./parse.y"
#line 1252 "./parse.y"
{
/* We have a statement. Generate a WFL around it so
we can debug it */
......@@ -3522,7 +3513,7 @@ case 226:
;
break;}
case 227:
#line 1270 "./parse.y"
#line 1261 "./parse.y"
{
if (ctxp->prevent_ese != lineno)
yyerror ("Invalid expression statement");
......@@ -3530,7 +3521,7 @@ case 227:
;
break;}
case 228:
#line 1276 "./parse.y"
#line 1267 "./parse.y"
{
if (ctxp->prevent_ese != lineno)
yyerror ("Invalid expression statement");
......@@ -3538,7 +3529,7 @@ case 228:
;
break;}
case 229:
#line 1282 "./parse.y"
#line 1273 "./parse.y"
{
if (ctxp->prevent_ese != lineno)
yyerror ("Invalid expression statement");
......@@ -3546,11 +3537,11 @@ case 229:
;
break;}
case 230:
#line 1288 "./parse.y"
#line 1279 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 231:
#line 1290 "./parse.y"
#line 1281 "./parse.y"
{
yyerror ("Constructor invocation must be first "
"thing in a constructor");
......@@ -3558,11 +3549,11 @@ case 231:
;
break;}
case 232:
#line 1296 "./parse.y"
#line 1287 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 233:
#line 1298 "./parse.y"
#line 1289 "./parse.y"
{
yyerror ("Constructor invocation must be first "
"thing in a constructor");
......@@ -3570,60 +3561,60 @@ case 233:
;
break;}
case 234:
#line 1304 "./parse.y"
#line 1295 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 235:
#line 1306 "./parse.y"
#line 1297 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 236:
#line 1308 "./parse.y"
#line 1299 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 237:
#line 1310 "./parse.y"
#line 1301 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 238:
#line 1312 "./parse.y"
#line 1303 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 246:
#line 1327 "./parse.y"
#line 1318 "./parse.y"
{
yyval.node = build_if_else_statement (yyvsp[-3].operator.location, yyvsp[-2].node,
yyvsp[0].node, NULL_TREE);
;
break;}
case 247:
#line 1332 "./parse.y"
#line 1323 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 248:
#line 1334 "./parse.y"
#line 1325 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 249:
#line 1336 "./parse.y"
#line 1327 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 250:
#line 1341 "./parse.y"
#line 1332 "./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 1346 "./parse.y"
#line 1337 "./parse.y"
{ yyval.node = build_if_else_statement (yyvsp[-5].operator.location, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 252:
#line 1351 "./parse.y"
#line 1342 "./parse.y"
{
enter_block ();
;
break;}
case 253:
#line 1355 "./parse.y"
#line 1346 "./parse.y"
{
/* Make into "proper list" of COMPOUND_EXPRs.
I.e. make the last statment also have its own
......@@ -3634,42 +3625,42 @@ case 253:
;
break;}
case 254:
#line 1367 "./parse.y"
#line 1358 "./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 255:
#line 1372 "./parse.y"
#line 1363 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 256:
#line 1374 "./parse.y"
#line 1365 "./parse.y"
{yyerror ("Missing term or ')'"); DRECOVER(switch_statement);;
break;}
case 257:
#line 1376 "./parse.y"
#line 1367 "./parse.y"
{yyerror ("'{' expected"); RECOVER;;
break;}
case 258:
#line 1384 "./parse.y"
#line 1375 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 259:
#line 1386 "./parse.y"
#line 1377 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 260:
#line 1388 "./parse.y"
#line 1379 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 261:
#line 1390 "./parse.y"
#line 1381 "./parse.y"
{ yyval.node = NULL_TREE; ;
break;}
case 267:
#line 1409 "./parse.y"
#line 1400 "./parse.y"
{
tree lab = build1 (CASE_EXPR, NULL_TREE, yyvsp[-1].node);
EXPR_WFL_LINECOL (lab) = yyvsp[-2].operator.location;
......@@ -3677,7 +3668,7 @@ case 267:
;
break;}
case 268:
#line 1415 "./parse.y"
#line 1406 "./parse.y"
{
tree lab = build1 (DEFAULT_EXPR, NULL_TREE, NULL_TREE);
EXPR_WFL_LINECOL (lab) = yyvsp[-1].operator.location;
......@@ -3685,95 +3676,95 @@ case 268:
;
break;}
case 269:
#line 1421 "./parse.y"
#line 1412 "./parse.y"
{yyerror ("Missing or invalid constant expression"); RECOVER;;
break;}
case 270:
#line 1423 "./parse.y"
#line 1414 "./parse.y"
{yyerror ("':' expected"); RECOVER;;
break;}
case 271:
#line 1425 "./parse.y"
#line 1416 "./parse.y"
{yyerror ("':' expected"); RECOVER;;
break;}
case 272:
#line 1430 "./parse.y"
#line 1421 "./parse.y"
{
tree body = build_loop_body (yyvsp[-2].operator.location, yyvsp[-1].node, 0);
yyval.node = build_new_loop (body);
;
break;}
case 273:
#line 1438 "./parse.y"
{ yyval.node = complete_loop_body (0, NULL_TREE, yyvsp[0].node, 0); ;
#line 1429 "./parse.y"
{ yyval.node = finish_loop_body (0, NULL_TREE, yyvsp[0].node, 0); ;
break;}
case 274:
#line 1440 "./parse.y"
#line 1431 "./parse.y"
{YYERROR_NOW; yyerror ("'(' expected"); RECOVER;;
break;}
case 275:
#line 1442 "./parse.y"
#line 1433 "./parse.y"
{yyerror ("Missing term and ')' expected"); RECOVER;;
break;}
case 276:
#line 1444 "./parse.y"
#line 1435 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 277:
#line 1449 "./parse.y"
{ yyval.node = complete_loop_body (0, NULL_TREE, yyvsp[0].node, 0); ;
#line 1440 "./parse.y"
{ yyval.node = finish_loop_body (0, NULL_TREE, yyvsp[0].node, 0); ;
break;}
case 278:
#line 1454 "./parse.y"
#line 1445 "./parse.y"
{
tree body = build_loop_body (0, NULL_TREE, 1);
yyval.node = build_new_loop (body);
;
break;}
case 279:
#line 1463 "./parse.y"
{ yyval.node = complete_loop_body (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[-5].node, 1); ;
#line 1454 "./parse.y"
{ yyval.node = finish_loop_body (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[-5].node, 1); ;
break;}
case 280:
#line 1468 "./parse.y"
{ yyval.node = complete_for_loop (EXPR_WFL_LINECOL (yyvsp[-4].node), yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ;
#line 1459 "./parse.y"
{ yyval.node = finish_for_loop (EXPR_WFL_LINECOL (yyvsp[-4].node), yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 281:
#line 1470 "./parse.y"
#line 1461 "./parse.y"
{
yyval.node = complete_for_loop (0, NULL_TREE, yyvsp[-2].node, yyvsp[0].node);
yyval.node = finish_for_loop (0, NULL_TREE, yyvsp[-2].node, yyvsp[0].node);
/* We have not condition, so we get rid of the EXIT_EXPR */
LOOP_EXPR_BODY_CONDITION_EXPR (LOOP_EXPR_BODY (yyval.node), 0) =
empty_stmt_node;
;
break;}
case 282:
#line 1477 "./parse.y"
#line 1468 "./parse.y"
{yyerror ("Invalid control expression"); RECOVER;;
break;}
case 283:
#line 1479 "./parse.y"
#line 1470 "./parse.y"
{yyerror ("Invalid update expression"); RECOVER;;
break;}
case 284:
#line 1481 "./parse.y"
#line 1472 "./parse.y"
{yyerror ("Invalid update expression"); RECOVER;;
break;}
case 285:
#line 1486 "./parse.y"
{ yyval.node = complete_for_loop (EXPR_WFL_LINECOL (yyvsp[-4].node), yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node);;
#line 1477 "./parse.y"
{ yyval.node = finish_for_loop (EXPR_WFL_LINECOL (yyvsp[-4].node), yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node);;
break;}
case 286:
#line 1488 "./parse.y"
#line 1479 "./parse.y"
{
yyval.node = complete_for_loop (0, NULL_TREE, yyvsp[-2].node, yyvsp[0].node);
yyval.node = finish_for_loop (0, NULL_TREE, yyvsp[-2].node, yyvsp[0].node);
/* We have not condition, so we get rid of the EXIT_EXPR */
LOOP_EXPR_BODY_CONDITION_EXPR (LOOP_EXPR_BODY (yyval.node), 0) =
empty_stmt_node;
;
break;}
case 287:
#line 1498 "./parse.y"
#line 1489 "./parse.y"
{
/* This scope defined for local variable that may be
defined within the scope of the for loop */
......@@ -3781,15 +3772,15 @@ case 287:
;
break;}
case 288:
#line 1504 "./parse.y"
#line 1495 "./parse.y"
{yyerror ("'(' expected"); DRECOVER(for_1);;
break;}
case 289:
#line 1506 "./parse.y"
#line 1497 "./parse.y"
{yyerror ("Invalid init statement"); RECOVER;;
break;}
case 290:
#line 1511 "./parse.y"
#line 1502 "./parse.y"
{
/* We now declare the loop body. The loop is
declared as a for loop. */
......@@ -3802,11 +3793,11 @@ case 290:
;
break;}
case 291:
#line 1523 "./parse.y"
#line 1514 "./parse.y"
{ yyval.node = empty_stmt_node; ;
break;}
case 292:
#line 1525 "./parse.y"
#line 1516 "./parse.y"
{
/* Init statement recorded within the previously
defined block scope */
......@@ -3814,7 +3805,7 @@ case 292:
;
break;}
case 293:
#line 1531 "./parse.y"
#line 1522 "./parse.y"
{
/* Local variable are recorded within the previously
defined block scope */
......@@ -3822,94 +3813,94 @@ case 293:
;
break;}
case 294:
#line 1537 "./parse.y"
#line 1528 "./parse.y"
{yyerror ("';' expected"); DRECOVER(for_init_1);;
break;}
case 295:
#line 1541 "./parse.y"
#line 1532 "./parse.y"
{yyval.node = empty_stmt_node;;
break;}
case 296:
#line 1543 "./parse.y"
#line 1534 "./parse.y"
{ yyval.node = build_debugable_stmt (BUILD_LOCATION (), yyvsp[0].node); ;
break;}
case 297:
#line 1548 "./parse.y"
#line 1539 "./parse.y"
{ yyval.node = add_stmt_to_compound (NULL_TREE, NULL_TREE, yyvsp[0].node); ;
break;}
case 298:
#line 1550 "./parse.y"
#line 1541 "./parse.y"
{ yyval.node = add_stmt_to_compound (yyvsp[-2].node, NULL_TREE, yyvsp[0].node); ;
break;}
case 299:
#line 1552 "./parse.y"
#line 1543 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 300:
#line 1557 "./parse.y"
#line 1548 "./parse.y"
{ yyval.node = build_bc_statement (yyvsp[-1].operator.location, 1, NULL_TREE); ;
break;}
case 301:
#line 1559 "./parse.y"
#line 1550 "./parse.y"
{ yyval.node = build_bc_statement (yyvsp[-2].operator.location, 1, yyvsp[-1].node); ;
break;}
case 302:
#line 1561 "./parse.y"
#line 1552 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 303:
#line 1563 "./parse.y"
#line 1554 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 304:
#line 1568 "./parse.y"
#line 1559 "./parse.y"
{ yyval.node = build_bc_statement (yyvsp[-1].operator.location, 0, NULL_TREE); ;
break;}
case 305:
#line 1570 "./parse.y"
#line 1561 "./parse.y"
{ yyval.node = build_bc_statement (yyvsp[-2].operator.location, 0, yyvsp[-1].node); ;
break;}
case 306:
#line 1572 "./parse.y"
#line 1563 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 307:
#line 1574 "./parse.y"
#line 1565 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 308:
#line 1579 "./parse.y"
#line 1570 "./parse.y"
{ yyval.node = build_return (yyvsp[-1].operator.location, NULL_TREE); ;
break;}
case 309:
#line 1581 "./parse.y"
#line 1572 "./parse.y"
{ yyval.node = build_return (yyvsp[-2].operator.location, yyvsp[-1].node); ;
break;}
case 310:
#line 1583 "./parse.y"
#line 1574 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 311:
#line 1585 "./parse.y"
#line 1576 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 312:
#line 1590 "./parse.y"
#line 1581 "./parse.y"
{
yyval.node = build1 (THROW_EXPR, NULL_TREE, yyvsp[-1].node);
EXPR_WFL_LINECOL (yyval.node) = yyvsp[-2].operator.location;
;
break;}
case 313:
#line 1595 "./parse.y"
#line 1586 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 314:
#line 1597 "./parse.y"
#line 1588 "./parse.y"
{yyerror ("';' expected"); RECOVER;;
break;}
case 315:
#line 1602 "./parse.y"
#line 1593 "./parse.y"
{
yyval.node = build (SYNCHRONIZED_EXPR, NULL_TREE, yyvsp[-2].node, yyvsp[0].node);
EXPR_WFL_LINECOL (yyval.node) =
......@@ -3917,56 +3908,56 @@ case 315:
;
break;}
case 316:
#line 1608 "./parse.y"
#line 1599 "./parse.y"
{yyerror ("'{' expected"); RECOVER;;
break;}
case 317:
#line 1610 "./parse.y"
#line 1601 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 318:
#line 1612 "./parse.y"
#line 1603 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 319:
#line 1614 "./parse.y"
#line 1605 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 320:
#line 1619 "./parse.y"
#line 1610 "./parse.y"
{
if ((1 << yyvsp[0].value) != ACC_SYNCHRONIZED)
fatal ("synchronized was '%d' - yyparse", (1 << yyvsp[0].value));
;
break;}
case 321:
#line 1627 "./parse.y"
#line 1618 "./parse.y"
{ yyval.node = build_try_statement (yyvsp[-2].operator.location, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 322:
#line 1629 "./parse.y"
#line 1620 "./parse.y"
{ yyval.node = build_try_finally_statement (yyvsp[-2].operator.location, yyvsp[-1].node, yyvsp[0].node); ;
break;}
case 323:
#line 1631 "./parse.y"
#line 1622 "./parse.y"
{ yyval.node = build_try_finally_statement
(yyvsp[-3].operator.location, build_try_statement (yyvsp[-3].operator.location,
yyvsp[-2].node, yyvsp[-1].node), yyvsp[0].node);
;
break;}
case 324:
#line 1636 "./parse.y"
#line 1627 "./parse.y"
{yyerror ("'{' expected"); DRECOVER (try_statement);;
break;}
case 326:
#line 1642 "./parse.y"
#line 1633 "./parse.y"
{
TREE_CHAIN (yyvsp[0].node) = yyvsp[-1].node;
yyval.node = yyvsp[0].node;
;
break;}
case 327:
#line 1650 "./parse.y"
#line 1641 "./parse.y"
{
java_method_add_stmt (current_function_decl, yyvsp[0].node);
exit_block ();
......@@ -3974,7 +3965,7 @@ case 327:
;
break;}
case 328:
#line 1658 "./parse.y"
#line 1649 "./parse.y"
{
/* We add a block to define a scope for
formal_parameter (CCBP). The formal parameter is
......@@ -3992,176 +3983,176 @@ case 328:
;
break;}
case 329:
#line 1674 "./parse.y"
#line 1665 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 330:
#line 1676 "./parse.y"
#line 1667 "./parse.y"
{yyerror ("Missing term or ')' expected"); DRECOVER (2);;
break;}
case 331:
#line 1678 "./parse.y"
#line 1669 "./parse.y"
{yyerror ("')' expected"); DRECOVER (1);;
break;}
case 332:
#line 1683 "./parse.y"
#line 1674 "./parse.y"
{ yyval.node = yyvsp[0].node; ;
break;}
case 333:
#line 1685 "./parse.y"
#line 1676 "./parse.y"
{yyerror ("'{' expected"); RECOVER; ;
break;}
case 337:
#line 1697 "./parse.y"
#line 1688 "./parse.y"
{ yyval.node = build_this (yyvsp[0].operator.location); ;
break;}
case 338:
#line 1699 "./parse.y"
#line 1690 "./parse.y"
{yyval.node = yyvsp[-1].node;;
break;}
case 343:
#line 1708 "./parse.y"
#line 1699 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("named class literals"); ;
break;}
case 344:
#line 1710 "./parse.y"
#line 1701 "./parse.y"
{ yyval.node = build_class_ref (yyvsp[-2].node); ;
break;}
case 345:
#line 1712 "./parse.y"
#line 1703 "./parse.y"
{ yyval.node = build_class_ref (void_type_node); ;
break;}
case 346:
#line 1717 "./parse.y"
#line 1708 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("class literals"); ;
break;}
case 347:
#line 1719 "./parse.y"
#line 1710 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 348:
#line 1721 "./parse.y"
#line 1712 "./parse.y"
{yyerror ("'class' or 'this' expected" ); RECOVER;;
break;}
case 349:
#line 1723 "./parse.y"
#line 1714 "./parse.y"
{yyerror ("'class' expected" ); RECOVER;;
break;}
case 350:
#line 1725 "./parse.y"
#line 1716 "./parse.y"
{yyerror ("'class' expected" ); RECOVER;;
break;}
case 351:
#line 1730 "./parse.y"
#line 1721 "./parse.y"
{ yyval.node = build_new_invocation (yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 352:
#line 1732 "./parse.y"
#line 1723 "./parse.y"
{ yyval.node = build_new_invocation (yyvsp[-2].node, NULL_TREE); ;
break;}
case 353:
#line 1737 "./parse.y"
#line 1728 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("inner class instance creation"); ;
break;}
case 354:
#line 1739 "./parse.y"
#line 1730 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("inner class instance creation"); ;
break;}
case 359:
#line 1748 "./parse.y"
#line 1739 "./parse.y"
{yyerror ("'(' expected"); DRECOVER(new_1);;
break;}
case 360:
#line 1750 "./parse.y"
#line 1741 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 361:
#line 1752 "./parse.y"
#line 1743 "./parse.y"
{yyerror ("')' or term expected"); RECOVER;;
break;}
case 362:
#line 1754 "./parse.y"
#line 1745 "./parse.y"
{yyerror ("')' expected"); RECOVER;;
break;}
case 363:
#line 1756 "./parse.y"
#line 1747 "./parse.y"
{YYERROR_NOW; yyerror ("Identifier expected"); RECOVER;;
break;}
case 364:
#line 1758 "./parse.y"
#line 1749 "./parse.y"
{yyerror ("'(' expected"); RECOVER;;
break;}
case 367:
#line 1768 "./parse.y"
#line 1759 "./parse.y"
{
yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, NULL_TREE);
ctxp->formal_parameter_number = 1;
;
break;}
case 368:
#line 1773 "./parse.y"
#line 1764 "./parse.y"
{
ctxp->formal_parameter_number += 1;
yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, yyvsp[-2].node);
;
break;}
case 369:
#line 1778 "./parse.y"
#line 1769 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 370:
#line 1783 "./parse.y"
#line 1774 "./parse.y"
{ yyval.node = build_newarray_node (yyvsp[-1].node, yyvsp[0].node, 0); ;
break;}
case 371:
#line 1785 "./parse.y"
#line 1776 "./parse.y"
{ yyval.node = build_newarray_node (yyvsp[-1].node, yyvsp[0].node, 0); ;
break;}
case 372:
#line 1787 "./parse.y"
#line 1778 "./parse.y"
{ yyval.node = build_newarray_node (yyvsp[-2].node, yyvsp[-1].node, CURRENT_OSB (ctxp));;
break;}
case 373:
#line 1789 "./parse.y"
#line 1780 "./parse.y"
{ yyval.node = build_newarray_node (yyvsp[-2].node, yyvsp[-1].node, CURRENT_OSB (ctxp));;
break;}
case 374:
#line 1793 "./parse.y"
#line 1784 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("anonymous array"); ;
break;}
case 375:
#line 1795 "./parse.y"
#line 1786 "./parse.y"
{ yyval.node = parse_jdk1_1_error ("anonymous array"); ;
break;}
case 376:
#line 1797 "./parse.y"
#line 1788 "./parse.y"
{yyerror ("'[' expected"); DRECOVER ("]");;
break;}
case 377:
#line 1799 "./parse.y"
#line 1790 "./parse.y"
{yyerror ("']' expected"); RECOVER;;
break;}
case 378:
#line 1804 "./parse.y"
#line 1795 "./parse.y"
{ yyval.node = build_tree_list (NULL_TREE, yyvsp[0].node); ;
break;}
case 379:
#line 1806 "./parse.y"
#line 1797 "./parse.y"
{ yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, yyval.node); ;
break;}
case 380:
#line 1811 "./parse.y"
#line 1802 "./parse.y"
{
EXPR_WFL_LINECOL (yyvsp[-1].node) = yyvsp[-2].operator.location;
yyval.node = yyvsp[-1].node;
;
break;}
case 381:
#line 1816 "./parse.y"
#line 1807 "./parse.y"
{yyerror ("']' expected"); RECOVER;;
break;}
case 382:
#line 1818 "./parse.y"
#line 1809 "./parse.y"
{
yyerror ("Missing term");
yyerror ("']' expected");
......@@ -4169,7 +4160,7 @@ case 382:
;
break;}
case 383:
#line 1827 "./parse.y"
#line 1818 "./parse.y"
{
int allocate = 0;
/* If not initialized, allocate memory for the osb
......@@ -4197,19 +4188,19 @@ case 383:
;
break;}
case 384:
#line 1853 "./parse.y"
#line 1844 "./parse.y"
{ CURRENT_OSB (ctxp)++; ;
break;}
case 385:
#line 1855 "./parse.y"
#line 1846 "./parse.y"
{ yyerror ("']' expected"); RECOVER;;
break;}
case 386:
#line 1860 "./parse.y"
#line 1851 "./parse.y"
{ yyval.node = make_qualified_primary (yyvsp[-2].node, yyvsp[0].node, yyvsp[-1].operator.location); ;
break;}
case 387:
#line 1864 "./parse.y"
#line 1855 "./parse.y"
{
tree super_wfl =
build_wfl_node (super_identifier_node);
......@@ -4218,19 +4209,19 @@ case 387:
;
break;}
case 388:
#line 1871 "./parse.y"
#line 1862 "./parse.y"
{yyerror ("Field expected"); DRECOVER (super_field_acces);;
break;}
case 389:
#line 1876 "./parse.y"
#line 1867 "./parse.y"
{ yyval.node = build_method_invocation (yyvsp[-2].node, NULL_TREE); ;
break;}
case 390:
#line 1878 "./parse.y"
#line 1869 "./parse.y"
{ yyval.node = build_method_invocation (yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 391:
#line 1880 "./parse.y"
#line 1871 "./parse.y"
{
if (TREE_CODE (yyvsp[-4].node) == THIS_EXPR)
yyval.node = build_this_super_qualified_invocation
......@@ -4243,7 +4234,7 @@ case 391:
;
break;}
case 392:
#line 1891 "./parse.y"
#line 1882 "./parse.y"
{
if (TREE_CODE (yyvsp[-5].node) == THIS_EXPR)
yyval.node = build_this_super_qualified_invocation
......@@ -4256,121 +4247,121 @@ case 392:
;
break;}
case 393:
#line 1902 "./parse.y"
#line 1893 "./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 394:
#line 1907 "./parse.y"
#line 1898 "./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 395:
#line 1916 "./parse.y"
#line 1907 "./parse.y"
{ yyerror ("'(' expected"); DRECOVER (method_invocation); ;
break;}
case 396:
#line 1918 "./parse.y"
#line 1909 "./parse.y"
{ yyerror ("'(' expected"); DRECOVER (method_invocation); ;
break;}
case 397:
#line 1923 "./parse.y"
#line 1914 "./parse.y"
{ yyval.node = build_array_ref (yyvsp[-2].operator.location, yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 398:
#line 1925 "./parse.y"
#line 1916 "./parse.y"
{ yyval.node = build_array_ref (yyvsp[-2].operator.location, yyvsp[-3].node, yyvsp[-1].node); ;
break;}
case 399:
#line 1927 "./parse.y"
#line 1918 "./parse.y"
{
yyerror ("Missing term and ']' expected");
DRECOVER(array_access);
;
break;}
case 400:
#line 1932 "./parse.y"
#line 1923 "./parse.y"
{
yyerror ("']' expected");
DRECOVER(array_access);
;
break;}
case 401:
#line 1937 "./parse.y"
#line 1928 "./parse.y"
{
yyerror ("Missing term and ']' expected");
DRECOVER(array_access);
;
break;}
case 402:
#line 1942 "./parse.y"
#line 1933 "./parse.y"
{
yyerror ("']' expected");
DRECOVER(array_access);
;
break;}
case 407:
#line 1957 "./parse.y"
#line 1948 "./parse.y"
{ yyval.node = build_incdec (yyvsp[0].operator.token, yyvsp[0].operator.location, yyvsp[-1].node, 1); ;
break;}
case 408:
#line 1962 "./parse.y"
#line 1953 "./parse.y"
{ yyval.node = build_incdec (yyvsp[0].operator.token, yyvsp[0].operator.location, yyvsp[-1].node, 1); ;
break;}
case 411:
#line 1969 "./parse.y"
#line 1960 "./parse.y"
{yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ;
break;}
case 412:
#line 1971 "./parse.y"
#line 1962 "./parse.y"
{yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ;
break;}
case 414:
#line 1974 "./parse.y"
#line 1965 "./parse.y"
{yyerror ("Missing term"); RECOVER;
break;}
case 415:
#line 1976 "./parse.y"
#line 1967 "./parse.y"
{yyerror ("Missing term"); RECOVER;
break;}
case 416:
#line 1981 "./parse.y"
#line 1972 "./parse.y"
{yyval.node = build_incdec (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node, 0); ;
break;}
case 417:
#line 1983 "./parse.y"
#line 1974 "./parse.y"
{yyerror ("Missing term"); RECOVER;
break;}
case 418:
#line 1988 "./parse.y"
#line 1979 "./parse.y"
{yyval.node = build_incdec (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node, 0); ;
break;}
case 419:
#line 1990 "./parse.y"
#line 1981 "./parse.y"
{yyerror ("Missing term"); RECOVER;
break;}
case 421:
#line 1996 "./parse.y"
#line 1987 "./parse.y"
{yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ;
break;}
case 422:
#line 1998 "./parse.y"
#line 1989 "./parse.y"
{yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ;
break;}
case 424:
#line 2001 "./parse.y"
#line 1992 "./parse.y"
{yyerror ("Missing term"); RECOVER;
break;}
case 425:
#line 2003 "./parse.y"
#line 1994 "./parse.y"
{yyerror ("Missing term"); RECOVER;
break;}
case 426:
#line 2008 "./parse.y"
#line 1999 "./parse.y"
{
tree type = yyvsp[-3].node;
while (CURRENT_OSB (ctxp)--)
......@@ -4380,15 +4371,15 @@ case 426:
;
break;}
case 427:
#line 2016 "./parse.y"
#line 2007 "./parse.y"
{ yyval.node = build_cast (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 428:
#line 2018 "./parse.y"
#line 2009 "./parse.y"
{ yyval.node = build_cast (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 429:
#line 2020 "./parse.y"
#line 2011 "./parse.y"
{
char *ptr;
while (CURRENT_OSB (ctxp)--)
......@@ -4403,11 +4394,11 @@ case 429:
;
break;}
case 430:
#line 2033 "./parse.y"
#line 2024 "./parse.y"
{yyerror ("']' expected, invalid type expression");;
break;}
case 431:
#line 2035 "./parse.y"
#line 2026 "./parse.y"
{
if (ctxp->prevent_ese != lineno)
yyerror ("Invalid type expression"); RECOVER;
......@@ -4415,243 +4406,243 @@ case 431:
;
break;}
case 432:
#line 2041 "./parse.y"
#line 2032 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 433:
#line 2043 "./parse.y"
#line 2034 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 434:
#line 2045 "./parse.y"
#line 2036 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 436:
#line 2051 "./parse.y"
#line 2042 "./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 2056 "./parse.y"
#line 2047 "./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 2061 "./parse.y"
#line 2052 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 439:
#line 2066 "./parse.y"
#line 2057 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 440:
#line 2068 "./parse.y"
#line 2059 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 441:
#line 2070 "./parse.y"
#line 2061 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 443:
#line 2076 "./parse.y"
#line 2067 "./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 2081 "./parse.y"
#line 2072 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 445:
#line 2086 "./parse.y"
#line 2077 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 446:
#line 2088 "./parse.y"
#line 2079 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 448:
#line 2094 "./parse.y"
#line 2085 "./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 2099 "./parse.y"
#line 2090 "./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 2104 "./parse.y"
#line 2095 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 451:
#line 2109 "./parse.y"
#line 2100 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 452:
#line 2111 "./parse.y"
#line 2102 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 453:
#line 2113 "./parse.y"
#line 2104 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 455:
#line 2119 "./parse.y"
#line 2110 "./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 2124 "./parse.y"
#line 2115 "./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 2129 "./parse.y"
#line 2120 "./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 2134 "./parse.y"
#line 2125 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 459:
#line 2139 "./parse.y"
#line 2130 "./parse.y"
{ yyval.node = build_binop (INSTANCEOF_EXPR, yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 460:
#line 2141 "./parse.y"
#line 2132 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 461:
#line 2143 "./parse.y"
#line 2134 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 462:
#line 2145 "./parse.y"
#line 2136 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 463:
#line 2147 "./parse.y"
#line 2138 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 464:
#line 2149 "./parse.y"
#line 2140 "./parse.y"
{yyerror ("Invalid reference type"); RECOVER;;
break;}
case 466:
#line 2155 "./parse.y"
#line 2146 "./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 2160 "./parse.y"
#line 2151 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 468:
#line 2165 "./parse.y"
#line 2156 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 469:
#line 2167 "./parse.y"
#line 2158 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 471:
#line 2173 "./parse.y"
#line 2164 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 472:
#line 2178 "./parse.y"
#line 2169 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 474:
#line 2184 "./parse.y"
#line 2175 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 475:
#line 2189 "./parse.y"
#line 2180 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 477:
#line 2195 "./parse.y"
#line 2186 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 478:
#line 2200 "./parse.y"
#line 2191 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 480:
#line 2206 "./parse.y"
#line 2197 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 481:
#line 2211 "./parse.y"
#line 2202 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 483:
#line 2217 "./parse.y"
#line 2208 "./parse.y"
{
yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location,
yyvsp[-2].node, yyvsp[0].node);
;
break;}
case 484:
#line 2222 "./parse.y"
#line 2213 "./parse.y"
{yyerror ("Missing term"); RECOVER;;
break;}
case 486:
#line 2228 "./parse.y"
#line 2219 "./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 487:
#line 2233 "./parse.y"
#line 2224 "./parse.y"
{
YYERROR_NOW;
yyerror ("Missing term");
......@@ -4659,19 +4650,19 @@ case 487:
;
break;}
case 488:
#line 2239 "./parse.y"
#line 2230 "./parse.y"
{yyerror ("Missing term"); DRECOVER (2);;
break;}
case 489:
#line 2241 "./parse.y"
#line 2232 "./parse.y"
{yyerror ("Missing term"); DRECOVER (3);;
break;}
case 492:
#line 2251 "./parse.y"
#line 2242 "./parse.y"
{ yyval.node = build_assignment (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ;
break;}
case 493:
#line 2253 "./parse.y"
#line 2244 "./parse.y"
{
if (ctxp->prevent_ese != lineno)
yyerror ("Missing term");
......@@ -4876,7 +4867,7 @@ yyerrhandle:
yystate = yyn;
goto yynewstate;
}
#line 2279 "./parse.y"
#line 2270 "./parse.y"
......@@ -6070,7 +6061,7 @@ fix_method_argument_names (orig_arg, meth)
/* Complete the method declaration with METHOD_BODY. */
static void
complete_method_declaration (method_body)
finish_method_declaration (method_body)
tree method_body;
{
BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (current_function_decl)) = method_body;
......@@ -10418,15 +10409,18 @@ java_complete_lhs (node)
node = patch_switch_statement (node);
if (TREE_OPERAND (node, 0) == error_mark_node)
return error_mark_node;
TREE_TYPE (nn) = TREE_TYPE (node) = void_type_node;
/* If we returned something different, that's because we
inserted a label. Pop the label too. */
if (nn != node)
nn = error_mark_node;
else
{
if (CAN_COMPLETE_NORMALLY (node))
CAN_COMPLETE_NORMALLY (nn) = 1;
POP_LABELED_BLOCK ();
TREE_TYPE (nn) = TREE_TYPE (node) = void_type_node;
/* If we returned something different, that's because we
inserted a label. Pop the label too. */
if (nn != node)
{
if (CAN_COMPLETE_NORMALLY (node))
CAN_COMPLETE_NORMALLY (nn) = 1;
POP_LABELED_BLOCK ();
}
}
POP_LOOP ();
return nn;
......@@ -12991,30 +12985,35 @@ patch_if_else_statement (node)
/* Action taken when a lableled statement is parsed. a new
LABELED_BLOCK_EXPR is created. No statement is attached to the
label, yet. */
label, yet. LABEL can be NULL_TREE for artificially-generated blocks. */
static tree
build_labeled_block (location, label)
int location;
tree label;
{
tree label_name = merge_qualified_name (label_id, label);
tree label_name ;
tree label_decl, node;
/* Issue an error if we try to reuse a label that was previously
declared */
if (IDENTIFIER_LOCAL_VALUE (label_name))
if (label == NULL_TREE || label == continue_identifier_node)
label_name = label;
else
{
EXPR_WFL_LINECOL (wfl_operator) = location;
parse_error_context (wfl_operator, "Declaration of `%s' shadows "
"a previous label declaration",
IDENTIFIER_POINTER (label));
EXPR_WFL_LINECOL (wfl_operator) =
EXPR_WFL_LINECOL (IDENTIFIER_LOCAL_VALUE (label_name));
parse_error_context (wfl_operator, "This is the location of the "
"previous declaration of label `%s'",
IDENTIFIER_POINTER (label));
java_error_count--;
label_name = merge_qualified_name (label_id, label);
/* Issue an error if we try to reuse a label that was previously
declared */
if (IDENTIFIER_LOCAL_VALUE (label_name))
{
EXPR_WFL_LINECOL (wfl_operator) = location;
parse_error_context (wfl_operator, "Declaration of `%s' shadows "
"a previous label declaration",
IDENTIFIER_POINTER (label));
EXPR_WFL_LINECOL (wfl_operator) =
EXPR_WFL_LINECOL (IDENTIFIER_LOCAL_VALUE (label_name));
parse_error_context (wfl_operator, "This is the location of the "
"previous declaration of label `%s'",
IDENTIFIER_POINTER (label));
java_error_count--;
}
}
label_decl = create_label_decl (label_name);
......@@ -13024,20 +13023,10 @@ build_labeled_block (location, label)
return node;
}
/* Generate a label crafting a unique name for it. This is used to
implicitely label loops that aren't the body part of labeled
statement. */
static tree
generate_labeled_block ()
{
return build_labeled_block (0, generate_name ());
}
/* A labeled statement LBE is attached a statement. */
static tree
complete_labeled_statement (lbe, statement)
finish_labeled_statement (lbe, statement)
tree lbe; /* Labeled block expr */
tree statement;
{
......@@ -13050,9 +13039,10 @@ complete_labeled_statement (lbe, statement)
if (TREE_CODE (statement) == LOOP_EXPR && IS_FOR_LOOP_P (statement))
{
java_method_add_stmt (current_function_decl, lbe);
return exit_block ();
lbe = exit_block ();
}
pop_labeled_block ();
POP_LABELED_BLOCK ();
return lbe;
}
......@@ -13104,7 +13094,7 @@ build_loop_body (location, condition, reversed)
condition = build_debugable_stmt (location, condition);
TREE_SIDE_EFFECTS (condition) = 1;
body = generate_labeled_block ();
body = build_labeled_block (0, continue_identifier_node);
first = (reversed ? body : condition);
second = (reversed ? condition : body);
return
......@@ -13117,7 +13107,7 @@ build_loop_body (location, condition, reversed)
loop list. */
static tree
complete_loop_body (location, condition, body, reversed)
finish_loop_body (location, condition, body, reversed)
int location;
tree condition, body;
int reversed;
......@@ -13139,16 +13129,16 @@ complete_loop_body (location, condition, body, reversed)
return to_return;
}
/* Tailored version of complete_loop_body for FOR loops, when FOR
/* Tailored version of finish_loop_body for FOR loops, when FOR
loops feature the condition part */
static tree
complete_for_loop (location, condition, update, body)
finish_for_loop (location, condition, update, body)
int location;
tree condition, update, body;
{
/* Put the condition and the loop body in place */
tree loop = complete_loop_body (location, condition, body, 0);
tree loop = finish_loop_body (location, condition, body, 0);
/* LOOP is the current loop which has been now popped of the loop
stack. Install the update block */
LOOP_EXPR_BODY_UPDATE_BLOCK (LOOP_EXPR_BODY (loop)) = update;
......@@ -13156,28 +13146,21 @@ complete_for_loop (location, condition, update, body)
}
/* If the loop isn't surrounded by a labeled statement, create one and
insert LOOP as it's body. */
insert LOOP as its body. */
static tree
patch_loop_statement (loop)
tree loop;
{
tree loop_label, to_return_as_loop;
if (LOOP_HAS_LABEL_P (loop))
{
loop_label = ctxp->current_labeled_block;
to_return_as_loop = loop;
}
else
if (! LOOP_HAS_LABEL_P (loop))
{
loop_label = generate_labeled_block ();
tree loop_label = build_labeled_block (0, NULL_TREE);
LABELED_BLOCK_BODY (loop_label) = loop;
PUSH_LABELED_BLOCK (loop_label);
to_return_as_loop = loop_label;
loop = loop_label;
}
TREE_TYPE (to_return_as_loop) = void_type_node;
return to_return_as_loop;
TREE_TYPE (loop) = void_type_node;
return loop;
}
/* 14.13, 14.14: break and continue Statements */
......@@ -13221,98 +13204,63 @@ patch_bc_statement (node)
tree node;
{
tree bc_label = EXIT_BLOCK_LABELED_BLOCK (node), target_stmt;
int is_unlabeled = 0;
tree labeled_block = ctxp->current_labeled_block;
EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
/* Not having a target means that the break/continue statement is
unlabeled. We try to find a decent label for it */
if (!bc_label)
{
is_unlabeled = 1;
/* There should be a loop/switch to branch to */
if (ctxp->current_loop)
{
if (TREE_CODE (ctxp->current_loop) == LOOP_EXPR)
{
/* At that stage, we're in the loop body, which is
encapsulated around a LABELED_BLOCK_EXPR. So searching
the current loop label requires us to consider the
labeled block before the current one. */
if (!LOOP_HAS_LABEL_SKIP_P (ctxp->current_loop))
fatal ("unlabeled loop has no installed label -- "
"patch_bc_statement");
bc_label = TREE_CHAIN (ctxp->current_labeled_block);
}
/* For a SWITCH statement, this is the current one */
else
bc_label = ctxp->current_labeled_block;
}
/* Not having a loop to break/continue to is an error */
else
{
parse_error_context (wfl_operator, "`%s' must be in loop%s",
(IS_BREAK_STMT_P (node) ? "break" : "continue"),
(IS_BREAK_STMT_P (node) ? " or switch" : ""));
return error_mark_node;
}
}
/* Having an identifier here means that the target is unknown. */
else if (TREE_CODE (bc_label) == IDENTIFIER_NODE)
if (bc_label != NULL_TREE && TREE_CODE (bc_label) == IDENTIFIER_NODE)
{
parse_error_context (wfl_operator, "No label definition found for `%s'",
IDENTIFIER_POINTER (bc_label));
return error_mark_node;
}
/* Find the statement we're targeting. */
target_stmt = LABELED_BLOCK_BODY (bc_label);
/* Target loop is slightly burrowed in the case of a for loop, it
appears at the first sight to be a block. */
if (TREE_CODE (target_stmt) == BLOCK)
{
tree sub = BLOCK_SUBBLOCKS (target_stmt);
if (sub && TREE_CODE (sub) == COMPOUND_EXPR && TREE_OPERAND (sub, 1)
&& TREE_CODE (TREE_OPERAND (sub, 1)) == LOOP_EXPR)
target_stmt = TREE_OPERAND (sub, 1);
}
/* 14.13 The break Statement */
if (IS_BREAK_STMT_P (node))
if (! IS_BREAK_STMT_P (node))
{
/* Named break are always fine, as far as they have a target
(already verified). Anonymous break need to target
while/do/for/switch */
if (is_unlabeled &&
!(TREE_CODE (target_stmt) == LOOP_EXPR /* do/while/for */
|| TREE_CODE (target_stmt) == SWITCH_EXPR)) /* switch */
/* It's a continue statement. */
for (;; labeled_block = TREE_CHAIN (labeled_block))
{
parse_error_context (wfl_operator,
"`break' must be in loop or switch");
return error_mark_node;
if (labeled_block == NULL_TREE)
{
if (bc_label == NULL_TREE)
parse_error_context (wfl_operator,
"`continue' must be in loop");
else
parse_error_context (wfl_operator,
"continue label `%d' does not name a loop",
IDENTIFIER_POINTER (bc_label));
return error_mark_node;
}
if ((DECL_NAME (LABELED_BLOCK_LABEL (labeled_block))
== continue_identifier_node)
&& (bc_label == NULL_TREE
|| TREE_CHAIN (labeled_block) == bc_label))
{
bc_label = labeled_block;
break;
}
}
/* If previously unlabeled, install the new found label */
if (is_unlabeled)
EXIT_BLOCK_LABELED_BLOCK (node) = bc_label;
}
/* 14.14 The continue Statement */
/* The continue statement must always target a loop, unnamed or not. */
else
else if (!bc_label)
{
if (TREE_CODE (target_stmt) != LOOP_EXPR) /* do/while/for */
for (;; labeled_block = TREE_CHAIN (labeled_block))
{
parse_error_context (wfl_operator, "`continue' must be in loop");
return error_mark_node;
if (labeled_block == NULL_TREE)
{
parse_error_context (wfl_operator,
"`break' must be in loop or switch");
return error_mark_node;
}
target_stmt = LABELED_BLOCK_BODY (labeled_block);
if (TREE_CODE (target_stmt) == SWITCH_EXPR
|| TREE_CODE (target_stmt) == LOOP_EXPR)
{
bc_label = labeled_block;
break;
}
}
/* Everything looks good. We can fix the `continue' jump to go
at the place in the loop were the continue is. For unlabeled
continue, the continuation point is the current labeled
block, by construction. */
if (is_unlabeled)
EXIT_BLOCK_LABELED_BLOCK (node) =
bc_label = ctxp->current_labeled_block;
}
EXIT_BLOCK_LABELED_BLOCK (node) = bc_label;
CAN_COMPLETE_NORMALLY (bc_label) = 1;
/* Our break/continue don't return values. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment