From 58595203f2ded150884358ebe299c034fffee588 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Tue, 16 Nov 1999 03:42:28 +0000 Subject: [PATCH] cp-tree.h (build_enumerator): Change prototype. * cp-tree.h (build_enumerator): Change prototype. * decl.c (enum_next_value): Remove. (enum_overflow): Likewise. (init_decl_processing): Don't register enum_next_value as a root. (start_enum): Clear TYPE_VALUES for a redefined enum. (finish_enum): Reset the type of enumeration constants. (build_enumerator): Fix indentation. Don't copy CONST_DECLs when we don't need to. Maintain the TYPE_VALUES list and look there for the previously defined enumeration constant. Let enumeration constants have the type of their values until the enumeration type is complete. * parse.y (enumlist_opt, enumlist, enumerator): Don't return a value. (structsp): Adjust. * parse.c: Regenerated. * pt.c (tsubst_enum): Adjust according to build_enumerator changes. From-SVN: r30544 --- gcc/cp/cp-tree.h | 2 +- gcc/cp/decl.c | 202 +++--- gcc/cp/parse.c | 1620 +++++++++++++++++++++++----------------------- gcc/cp/parse.y | 13 +- gcc/cp/pt.c | 12 +- 5 files changed, 926 insertions(+), 923 deletions(-) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 24f71c31abe..47a88b7b9c0 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3480,7 +3480,7 @@ extern tree xref_tag_from_type PROTO((tree, tree, int)); extern void xref_basetypes PROTO((tree, tree, tree, tree)); extern tree start_enum PROTO((tree)); extern tree finish_enum PROTO((tree)); -extern tree build_enumerator PROTO((tree, tree, tree)); +extern void build_enumerator PROTO((tree, tree, tree)); extern int start_function PROTO((tree, tree, tree, int)); extern void expand_start_early_try_stmts PROTO((void)); extern void store_parm_decls PROTO((void)); diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index a0dbffee46c..11073f93ddb 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -290,15 +290,6 @@ tree static_aggregates; tree integer_two_node, integer_three_node; -/* While defining an enum type, this is 1 plus the last enumerator - constant value. */ - -static tree enum_next_value; - -/* Nonzero means that there was overflow computing enum_next_value. */ - -static int enum_overflow; - /* Parsing a function declarator leaves here a chain of structure and enum types declared in the parmlist. */ @@ -6336,7 +6327,6 @@ init_decl_processing () ggc_add_tree_root (&static_dtors, 1); ggc_add_tree_root (&lastiddecl, 1); - ggc_add_tree_root (&enum_next_value, 1); ggc_add_tree_root (&last_function_parm_tags, 1); ggc_add_tree_root (¤t_function_return_value, 1); ggc_add_tree_root (¤t_function_parms, 1); @@ -12328,6 +12318,8 @@ start_enum (name) { cp_error ("multiple definition of `%#T'", enumtype); cp_error_at ("previous definition here", enumtype); + /* Clear out TYPE_VALUES, and start again. */ + TYPE_VALUES (enumtype) = NULL_TREE; } else { @@ -12338,10 +12330,6 @@ start_enum (name) if (current_class_type) TREE_ADDRESSABLE (b->tags) = 1; - /* We don't copy this value because build_enumerator needs to do it. */ - enum_next_value = integer_zero_node; - enum_overflow = 0; - GNU_xref_decl (current_function_decl, enumtype); return enumtype; } @@ -12372,6 +12360,14 @@ finish_enum (enumtype) constant. */ decl = TREE_VALUE (pair); + /* [dcl.enum] + + Following the closing brace of an enum-specifier, each + enumerator has the type of its enumeration. Prior to the + closing brace, the type of each enumerator is the type of + its initializing value. */ + TREE_TYPE (decl) = enumtype; + /* The DECL_INITIAL will be NULL if we are processing a template declaration and this enumeration constant had no explicit initializer. */ @@ -12474,101 +12470,131 @@ finish_enum (enumtype) } /* Build and install a CONST_DECL for an enumeration constant of the - enumeration type TYPE whose NAME and VALUE (if any) are provided. + enumeration type ENUMTYPE whose NAME and VALUE (if any) are provided. Assignment of sequential values by default is handled here. */ -tree -build_enumerator (name, value, type) +void +build_enumerator (name, value, enumtype) tree name; tree value; - tree type; + tree enumtype; { - tree decl, result; + tree decl; tree context; + tree type; + tree values; /* Remove no-op casts from the value. */ if (value) STRIP_TYPE_NOPS (value); - if (! processing_template_decl) - { - /* Validate and default VALUE. */ - if (value != NULL_TREE) - { - if (TREE_READONLY_DECL_P (value)) - value = decl_constant_value (value); - - if (TREE_CODE (value) == INTEGER_CST) - { - value = default_conversion (value); - constant_expression_warning (value); - } - else - { - cp_error ("enumerator value for `%D' not integer constant", name); - value = NULL_TREE; - } - } - - /* Default based on previous value. */ - if (value == NULL_TREE && ! processing_template_decl) - { - value = enum_next_value; - if (enum_overflow) - cp_error ("overflow in enumeration values at `%D'", name); - } - - /* Remove no-op casts from the value. */ - if (value) - STRIP_TYPE_NOPS (value); + if (! processing_template_decl) + { + /* Validate and default VALUE. */ + if (value != NULL_TREE) + { + if (TREE_READONLY_DECL_P (value)) + value = decl_constant_value (value); + + if (TREE_CODE (value) == INTEGER_CST) + { + value = default_conversion (value); + constant_expression_warning (value); + } + else + { + cp_error ("enumerator value for `%D' not integer constant", name); + value = NULL_TREE; + } + } + + /* Default based on previous value. */ + if (value == NULL_TREE && ! processing_template_decl) + { + tree prev_value; + + if (TYPE_VALUES (enumtype)) + { + /* The next value is the previous value ... */ + prev_value = DECL_INITIAL (TREE_VALUE (TYPE_VALUES (enumtype))); + /* ... plus one. */ + value = build_binary_op_nodefault (PLUS_EXPR, + prev_value, + integer_one_node, + PLUS_EXPR); + + if (tree_int_cst_lt (value, prev_value)) + cp_error ("overflow in enumeration values at `%D'", name); + } + else + value = integer_zero_node; + } + + /* Remove no-op casts from the value. */ + if (value) + STRIP_TYPE_NOPS (value); #if 0 - /* To fix MAX_VAL enum consts. (bkoz) */ - TREE_TYPE (value) = integer_type_node; + /* To fix MAX_VAL enum consts. (bkoz) */ + TREE_TYPE (value) = integer_type_node; #endif - } + } - /* We always have to copy here; not all INTEGER_CSTs are unshared. - Even in other cases, we will later (in finish_enum) be setting the - type of VALUE. */ - if (value != NULL_TREE) - value = copy_node (value); + /* We always have to copy here; not all INTEGER_CSTs are unshared. + Even in other cases, we will later (in finish_enum) be setting + the type of VALUE. But, we don't need to make a copy if this + VALUE is one of the enumeration constants for this same + enumeration type. */ + for (values = TYPE_VALUES (enumtype); values; values = TREE_CHAIN (values)) + if (TREE_VALUE (values) == value) + break; + /* If we didn't break out of the loop, then we do need a copy. */ + if (!values && value) + value = copy_node (value); /* C++ associates enums with global, function, or class declarations. */ - - context = current_scope (); - if (context && context == current_class_type) - /* This enum declaration is local to the class. */ - decl = build_lang_decl (CONST_DECL, name, type); - else - /* It's a global enum, or it's local to a function. (Note local to + context = current_scope (); + + /* Build the actual enumeration constant. Note that the enumeration + constants have the type of their initializers until the + enumeration is complete: + + [ dcl.enum ] + + Following the closing brace of an enum-specifier, each enumer- + ator has the type of its enumeration. Prior to the closing + brace, the type of each enumerator is the type of its + initializing value. + + In finish_enum we will reset the type. Of course, if we're + processing a template, there may be no value. */ + type = value ? TREE_TYPE (value) : NULL_TREE; + + if (context && context == current_class_type) + /* This enum declaration is local to the class. We need the full + lang_decl so that we can record DECL_CLASS_CONTEXT, for example. */ + decl = build_lang_decl (CONST_DECL, name, type); + else + /* It's a global enum, or it's local to a function. (Note local to a function could mean local to a class method. */ - decl = build_decl (CONST_DECL, name, type); + decl = build_decl (CONST_DECL, name, type); - DECL_CONTEXT (decl) = FROB_CONTEXT (context); - DECL_INITIAL (decl) = value; - TREE_READONLY (decl) = 1; + DECL_CONTEXT (decl) = FROB_CONTEXT (context); + DECL_INITIAL (decl) = value; + TREE_READONLY (decl) = 1; - if (context && context == current_class_type) - /* In something like `struct S { enum E { i = 7 }; };' we put `i' + if (context && context == current_class_type) + /* In something like `struct S { enum E { i = 7 }; };' we put `i' on the TYPE_FIELDS list for `S'. (That's so that you can say things like `S::i' later.) */ - finish_member_declaration (decl); - else - { - pushdecl (decl); - GNU_xref_decl (current_function_decl, decl); - } - - if (! processing_template_decl) - { - /* Set basis for default for next value. */ - enum_next_value = build_binary_op_nodefault (PLUS_EXPR, value, - integer_one_node, PLUS_EXPR); - enum_overflow = tree_int_cst_lt (enum_next_value, value); - } - - result = tree_cons (name, decl, NULL_TREE); - return result; + finish_member_declaration (decl); + else + { + pushdecl (decl); + GNU_xref_decl (current_function_decl, decl); + } + + /* Add this enumeration constant to the list for this type. */ + TYPE_VALUES (enumtype) = tree_cons (name, decl, TYPE_VALUES (enumtype)); } diff --git a/gcc/cp/parse.c b/gcc/cp/parse.c index 794777ac011..7d54c52df1a 100644 --- a/gcc/cp/parse.c +++ b/gcc/cp/parse.c @@ -159,7 +159,7 @@ typedef union { flagged_type_tree ftype; struct pending_inline *pi; } YYSTYPE; -#line 294 "parse.y" +#line 293 "parse.y" /* List of types and structure classes of the current declaration. */ static tree current_declspecs; @@ -651,94 +651,94 @@ static const short yyrhs[] = { -1, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 352, 354, 362, 365, 366, 370, 372, 375, 380, 384, - 390, 394, 397, 401, 404, 406, 408, 411, 413, 416, - 419, 421, 423, 425, 427, 428, 430, 431, 435, 438, - 447, 450, 452, 456, 459, 461, 465, 468, 480, 487, - 495, 497, 498, 500, 504, 507, 513, 516, 518, 523, - 526, 530, 533, 536, 539, 543, 548, 558, 560, 562, - 564, 566, 579, 582, 586, 589, 591, 593, 596, 599, - 603, 605, 607, 609, 614, 616, 618, 620, 622, 623, - 630, 631, 632, 635, 638, 642, 644, 645, 648, 650, - 653, 656, 658, 662, 665, 667, 671, 673, 675, 679, - 681, 683, 687, 689, 691, 697, 701, 704, 707, 710, - 715, 718, 720, 722, 728, 740, 743, 748, 753, 756, - 761, 766, 775, 778, 780, 784, 793, 809, 812, 814, - 815, 818, 825, 831, 833, 835, 837, 839, 842, 845, - 848, 850, 851, 852, 853, 856, 858, 859, 862, 864, - 865, 868, 873, 873, 877, 877, 880, 880, 883, 883, - 887, 887, 892, 892, 895, 895, 898, 900, 903, 910, - 914, 917, 920, 922, 926, 932, 941, 943, 951, 954, - 957, 960, 964, 967, 969, 972, 975, 977, 979, 981, - 985, 988, 991, 996, 1000, 1005, 1009, 1012, 1013, 1017, - 1035, 1041, 1044, 1046, 1047, 1048, 1051, 1055, 1056, 1060, - 1064, 1067, 1069, 1073, 1076, 1079, 1083, 1086, 1088, 1090, - 1092, 1095, 1099, 1101, 1104, 1106, 1112, 1115, 1118, 1121, - 1124, 1129, 1132, 1135, 1139, 1141, 1145, 1149, 1151, 1153, - 1158, 1161, 1166, 1169, 1171, 1179, 1192, 1197, 1203, 1205, - 1207, 1220, 1223, 1225, 1227, 1229, 1231, 1233, 1235, 1237, - 1239, 1241, 1243, 1245, 1247, 1249, 1251, 1253, 1255, 1257, - 1259, 1261, 1263, 1267, 1269, 1271, 1288, 1291, 1293, 1294, - 1295, 1296, 1297, 1300, 1312, 1315, 1319, 1322, 1324, 1329, - 1331, 1332, 1335, 1337, 1345, 1347, 1349, 1351, 1355, 1358, - 1362, 1366, 1367, 1368, 1372, 1380, 1381, 1382, 1392, 1394, - 1397, 1399, 1410, 1415, 1417, 1419, 1421, 1423, 1425, 1427, - 1430, 1432, 1443, 1444, 1448, 1452, 1456, 1460, 1462, 1466, - 1468, 1470, 1478, 1480, 1482, 1484, 1488, 1490, 1492, 1494, - 1499, 1501, 1503, 1505, 1508, 1510, 1512, 1556, 1559, 1563, - 1566, 1570, 1573, 1578, 1580, 1584, 1593, 1596, 1603, 1609, - 1613, 1615, 1620, 1622, 1629, 1631, 1635, 1639, 1645, 1649, - 1652, 1656, 1659, 1669, 1671, 1674, 1678, 1681, 1684, 1687, - 1690, 1696, 1702, 1704, 1709, 1711, 1729, 1732, 1734, 1737, - 1743, 1745, 1755, 1759, 1762, 1765, 1770, 1773, 1781, 1783, - 1785, 1787, 1790, 1793, 1808, 1827, 1830, 1832, 1835, 1837, - 1841, 1843, 1847, 1849, 1853, 1856, 1860, 1866, 1867, 1879, - 1885, 1887, 1893, 1898, 1903, 1909, 1910, 1918, 1921, 1925, - 1928, 1932, 1937, 1940, 1944, 1947, 1949, 1951, 1953, 1960, - 1962, 1963, 1964, 1968, 1971, 1975, 1978, 1984, 1986, 1989, - 1992, 1995, 2001, 2004, 2007, 2009, 2011, 2015, 2022, 2028, - 2033, 2039, 2041, 2046, 2049, 2052, 2054, 2056, 2060, 2064, - 2070, 2073, 2079, 2082, 2085, 2091, 2093, 2105, 2109, 2114, - 2138, 2140, 2143, 2145, 2150, 2152, 2154, 2156, 2158, 2160, - 2164, 2172, 2175, 2177, 2181, 2188, 2194, 2200, 2206, 2216, - 2222, 2226, 2233, 2261, 2271, 2277, 2280, 2283, 2285, 2289, - 2291, 2295, 2298, 2302, 2305, 2308, 2310, 2314, 2325, 2339, - 2340, 2341, 2342, 2345, 2354, 2359, 2365, 2367, 2372, 2374, - 2376, 2378, 2380, 2382, 2385, 2395, 2402, 2427, 2433, 2436, - 2439, 2441, 2452, 2457, 2460, 2465, 2468, 2475, 2485, 2488, - 2495, 2505, 2507, 2510, 2512, 2515, 2522, 2530, 2537, 2543, - 2549, 2557, 2561, 2566, 2570, 2573, 2578, 2580, 2588, 2590, - 2594, 2597, 2602, 2606, 2611, 2621, 2624, 2628, 2632, 2641, - 2644, 2646, 2648, 2654, 2656, 2665, 2668, 2670, 2672, 2674, - 2678, 2681, 2684, 2686, 2688, 2690, 2694, 2697, 2708, 2718, - 2720, 2721, 2725, 2733, 2735, 2743, 2746, 2748, 2750, 2752, - 2756, 2759, 2762, 2764, 2766, 2768, 2772, 2775, 2778, 2780, - 2782, 2784, 2786, 2793, 2797, 2802, 2806, 2811, 2813, 2817, - 2820, 2822, 2825, 2827, 2828, 2831, 2833, 2835, 2842, 2853, - 2859, 2865, 2879, 2881, 2885, 2899, 2901, 2903, 2907, 2913, - 2926, 2929, 2934, 2947, 2953, 2955, 2956, 2957, 2965, 2970, - 2979, 2980, 2984, 2987, 2993, 2999, 3002, 3004, 3006, 3008, - 3012, 3016, 3020, 3023, 3027, 3029, 3038, 3041, 3043, 3045, - 3047, 3049, 3051, 3053, 3055, 3059, 3063, 3067, 3071, 3073, - 3075, 3077, 3079, 3081, 3083, 3085, 3087, 3095, 3097, 3098, - 3099, 3102, 3108, 3110, 3115, 3117, 3120, 3133, 3136, 3139, - 3143, 3146, 3153, 3155, 3158, 3160, 3162, 3165, 3168, 3171, - 3174, 3176, 3179, 3183, 3185, 3191, 3193, 3194, 3196, 3201, - 3203, 3205, 3207, 3209, 3212, 3213, 3215, 3218, 3219, 3222, - 3222, 3225, 3225, 3228, 3228, 3230, 3232, 3234, 3236, 3242, - 3248, 3251, 3254, 3260, 3262, 3263, 3266, 3268, 3269, 3270, - 3272, 3275, 3278, 3281, 3287, 3291, 3293, 3296, 3298, 3301, - 3305, 3307, 3310, 3312, 3315, 3332, 3340, 3343, 3345, 3347, - 3351, 3354, 3355, 3363, 3367, 3371, 3374, 3375, 3381, 3384, - 3387, 3389, 3393, 3398, 3401, 3411, 3416, 3417, 3424, 3427, - 3430, 3432, 3435, 3437, 3447, 3461, 3465, 3468, 3470, 3474, - 3478, 3481, 3484, 3486, 3490, 3492, 3499, 3506, 3509, 3513, - 3517, 3521, 3527, 3531, 3536, 3538, 3541, 3546, 3552, 3563, - 3566, 3568, 3572, 3580, 3583, 3587, 3590, 3592, 3594, 3600, - 3605, 3608, 3610, 3612, 3614, 3616, 3618, 3620, 3622, 3624, - 3626, 3628, 3630, 3632, 3634, 3636, 3638, 3640, 3642, 3644, - 3646, 3648, 3650, 3652, 3654, 3656, 3658, 3660, 3662, 3664, - 3666, 3668, 3670, 3673, 3675 + 351, 353, 361, 364, 365, 369, 371, 374, 379, 383, + 389, 393, 396, 400, 403, 405, 407, 410, 412, 415, + 418, 420, 422, 424, 426, 427, 429, 430, 434, 437, + 446, 449, 451, 455, 458, 460, 464, 467, 479, 486, + 494, 496, 497, 499, 503, 506, 512, 515, 517, 522, + 525, 529, 532, 535, 538, 542, 547, 557, 559, 561, + 563, 565, 578, 581, 585, 588, 590, 592, 595, 598, + 602, 604, 606, 608, 613, 615, 617, 619, 621, 622, + 629, 630, 631, 634, 637, 641, 643, 644, 647, 649, + 652, 655, 657, 661, 664, 666, 670, 672, 674, 678, + 680, 682, 686, 688, 690, 696, 700, 703, 706, 709, + 714, 717, 719, 721, 727, 739, 742, 747, 752, 755, + 760, 765, 774, 777, 779, 783, 792, 808, 811, 813, + 814, 817, 824, 830, 832, 834, 836, 838, 841, 844, + 847, 849, 850, 851, 852, 855, 857, 858, 861, 863, + 864, 867, 872, 872, 876, 876, 879, 879, 882, 882, + 886, 886, 891, 891, 894, 894, 897, 899, 902, 909, + 913, 916, 919, 921, 925, 931, 940, 942, 950, 953, + 956, 959, 963, 966, 968, 971, 974, 976, 978, 980, + 984, 987, 990, 995, 999, 1004, 1008, 1011, 1012, 1016, + 1034, 1040, 1043, 1045, 1046, 1047, 1050, 1054, 1055, 1059, + 1063, 1066, 1068, 1072, 1075, 1078, 1082, 1085, 1087, 1089, + 1091, 1094, 1098, 1100, 1103, 1105, 1111, 1114, 1117, 1120, + 1123, 1128, 1131, 1134, 1138, 1140, 1144, 1148, 1150, 1152, + 1157, 1160, 1165, 1168, 1170, 1178, 1191, 1196, 1202, 1204, + 1206, 1219, 1222, 1224, 1226, 1228, 1230, 1232, 1234, 1236, + 1238, 1240, 1242, 1244, 1246, 1248, 1250, 1252, 1254, 1256, + 1258, 1260, 1262, 1266, 1268, 1270, 1287, 1290, 1292, 1293, + 1294, 1295, 1296, 1299, 1311, 1314, 1318, 1321, 1323, 1328, + 1330, 1331, 1334, 1336, 1344, 1346, 1348, 1350, 1354, 1357, + 1361, 1365, 1366, 1367, 1371, 1379, 1380, 1381, 1391, 1393, + 1396, 1398, 1409, 1414, 1416, 1418, 1420, 1422, 1424, 1426, + 1429, 1431, 1442, 1443, 1447, 1451, 1455, 1459, 1461, 1465, + 1467, 1469, 1477, 1479, 1481, 1483, 1487, 1489, 1491, 1493, + 1498, 1500, 1502, 1504, 1507, 1509, 1511, 1555, 1558, 1562, + 1565, 1569, 1572, 1577, 1579, 1583, 1592, 1595, 1602, 1608, + 1612, 1614, 1619, 1621, 1628, 1630, 1634, 1638, 1644, 1648, + 1651, 1655, 1658, 1668, 1670, 1673, 1677, 1680, 1683, 1686, + 1689, 1695, 1701, 1703, 1708, 1710, 1728, 1731, 1733, 1736, + 1742, 1744, 1754, 1758, 1761, 1764, 1769, 1772, 1780, 1782, + 1784, 1786, 1789, 1792, 1807, 1826, 1829, 1831, 1834, 1836, + 1840, 1842, 1846, 1848, 1852, 1855, 1859, 1865, 1866, 1878, + 1884, 1886, 1892, 1897, 1902, 1908, 1909, 1917, 1920, 1924, + 1927, 1931, 1936, 1939, 1943, 1946, 1948, 1950, 1952, 1959, + 1961, 1962, 1963, 1967, 1970, 1974, 1977, 1983, 1985, 1988, + 1991, 1994, 2000, 2003, 2006, 2008, 2010, 2014, 2021, 2027, + 2032, 2038, 2040, 2045, 2048, 2051, 2053, 2055, 2059, 2063, + 2068, 2071, 2076, 2079, 2082, 2088, 2090, 2102, 2106, 2111, + 2135, 2137, 2140, 2142, 2147, 2149, 2151, 2153, 2155, 2157, + 2161, 2169, 2172, 2174, 2178, 2185, 2191, 2197, 2203, 2213, + 2219, 2223, 2230, 2258, 2268, 2274, 2277, 2280, 2282, 2286, + 2288, 2292, 2295, 2299, 2302, 2305, 2307, 2311, 2322, 2336, + 2337, 2338, 2339, 2342, 2351, 2356, 2362, 2364, 2369, 2371, + 2373, 2375, 2377, 2379, 2382, 2392, 2399, 2424, 2430, 2433, + 2436, 2438, 2449, 2454, 2457, 2462, 2465, 2472, 2482, 2485, + 2492, 2502, 2504, 2507, 2509, 2512, 2519, 2527, 2534, 2540, + 2546, 2554, 2558, 2563, 2567, 2570, 2575, 2577, 2584, 2586, + 2589, 2592, 2597, 2601, 2606, 2616, 2619, 2623, 2627, 2636, + 2639, 2641, 2643, 2649, 2651, 2660, 2663, 2665, 2667, 2669, + 2673, 2676, 2679, 2681, 2683, 2685, 2689, 2692, 2703, 2713, + 2715, 2716, 2720, 2728, 2730, 2738, 2741, 2743, 2745, 2747, + 2751, 2754, 2757, 2759, 2761, 2763, 2767, 2770, 2773, 2775, + 2777, 2779, 2781, 2788, 2792, 2797, 2801, 2806, 2808, 2812, + 2815, 2817, 2820, 2822, 2823, 2826, 2828, 2830, 2837, 2848, + 2854, 2860, 2874, 2876, 2880, 2894, 2896, 2898, 2902, 2908, + 2921, 2924, 2929, 2942, 2948, 2950, 2951, 2952, 2960, 2965, + 2974, 2975, 2979, 2982, 2988, 2994, 2997, 2999, 3001, 3003, + 3007, 3011, 3015, 3018, 3022, 3024, 3033, 3036, 3038, 3040, + 3042, 3044, 3046, 3048, 3050, 3054, 3058, 3062, 3066, 3068, + 3070, 3072, 3074, 3076, 3078, 3080, 3082, 3090, 3092, 3093, + 3094, 3097, 3103, 3105, 3110, 3112, 3115, 3128, 3131, 3134, + 3138, 3141, 3148, 3150, 3153, 3155, 3157, 3160, 3163, 3166, + 3169, 3171, 3174, 3178, 3180, 3186, 3188, 3189, 3191, 3196, + 3198, 3200, 3202, 3204, 3207, 3208, 3210, 3213, 3214, 3217, + 3217, 3220, 3220, 3223, 3223, 3225, 3227, 3229, 3231, 3237, + 3243, 3246, 3249, 3255, 3257, 3258, 3261, 3263, 3264, 3265, + 3267, 3270, 3273, 3276, 3282, 3286, 3288, 3291, 3293, 3296, + 3300, 3302, 3305, 3307, 3310, 3327, 3335, 3338, 3340, 3342, + 3346, 3349, 3350, 3358, 3362, 3366, 3369, 3370, 3376, 3379, + 3382, 3384, 3388, 3393, 3396, 3406, 3411, 3412, 3419, 3422, + 3425, 3427, 3430, 3432, 3442, 3456, 3460, 3463, 3465, 3469, + 3473, 3476, 3479, 3481, 3485, 3487, 3494, 3501, 3504, 3508, + 3512, 3516, 3522, 3526, 3531, 3533, 3536, 3541, 3547, 3558, + 3561, 3563, 3567, 3575, 3578, 3582, 3585, 3587, 3589, 3595, + 3600, 3603, 3605, 3607, 3609, 3611, 3613, 3615, 3617, 3619, + 3621, 3623, 3625, 3627, 3629, 3631, 3633, 3635, 3637, 3639, + 3641, 3643, 3645, 3647, 3649, 3651, 3653, 3655, 3657, 3659, + 3661, 3663, 3665, 3668, 3670 }; #endif @@ -4482,106 +4482,106 @@ yyreduce: switch (yyn) { case 2: -#line 355 "parse.y" +#line 354 "parse.y" { finish_translation_unit (); ; break;} case 3: -#line 363 "parse.y" +#line 362 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 4: -#line 365 "parse.y" +#line 364 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 5: -#line 367 "parse.y" +#line 366 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 8: -#line 376 "parse.y" +#line 375 "parse.y" { have_extern_spec = 1; used_extern_spec = 0; yyval.ttype = NULL_TREE; ; break;} case 9: -#line 381 "parse.y" +#line 380 "parse.y" { have_extern_spec = 0; ; break;} case 10: -#line 386 "parse.y" +#line 385 "parse.y" { yyval.itype = pedantic; pedantic = 0; ; break;} case 12: -#line 395 "parse.y" +#line 394 "parse.y" { if (pending_lang_change) do_pending_lang_change(); ; break;} case 13: -#line 397 "parse.y" +#line 396 "parse.y" { if (! toplevel_bindings_p ()) pop_everything (); ; break;} case 14: -#line 403 "parse.y" +#line 402 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 15: -#line 405 "parse.y" +#line 404 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 16: -#line 407 "parse.y" +#line 406 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 17: -#line 409 "parse.y" +#line 408 "parse.y" { if (TREE_CHAIN (yyvsp[-2].ttype)) yyvsp[-2].ttype = combine_strings (yyvsp[-2].ttype); assemble_asm (yyvsp[-2].ttype); ; break;} case 18: -#line 412 "parse.y" +#line 411 "parse.y" { pop_lang_context (); ; break;} case 19: -#line 414 "parse.y" +#line 413 "parse.y" { if (pending_inlines) do_pending_inlines (); pop_lang_context (); ; break;} case 20: -#line 417 "parse.y" +#line 416 "parse.y" { if (pending_inlines) do_pending_inlines (); pop_lang_context (); ; break;} case 21: -#line 420 "parse.y" +#line 419 "parse.y" { push_namespace (yyvsp[-1].ttype); ; break;} case 22: -#line 422 "parse.y" +#line 421 "parse.y" { pop_namespace (); ; break;} case 23: -#line 424 "parse.y" +#line 423 "parse.y" { push_namespace (NULL_TREE); ; break;} case 24: -#line 426 "parse.y" +#line 425 "parse.y" { pop_namespace (); ; break;} case 26: -#line 429 "parse.y" +#line 428 "parse.y" { do_toplevel_using_decl (yyvsp[-1].ttype); ; break;} case 28: -#line 432 "parse.y" +#line 431 "parse.y" { pedantic = yyvsp[-1].itype; ; break;} case 29: -#line 437 "parse.y" +#line 436 "parse.y" { begin_only_namespace_names (); ; break;} case 30: -#line 439 "parse.y" +#line 438 "parse.y" { end_only_namespace_names (); if (lastiddecl) @@ -4590,35 +4590,35 @@ case 30: ; break;} case 31: -#line 449 "parse.y" +#line 448 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 32: -#line 451 "parse.y" +#line 450 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 33: -#line 453 "parse.y" +#line 452 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 34: -#line 458 "parse.y" +#line 457 "parse.y" { yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 35: -#line 460 "parse.y" +#line 459 "parse.y" { yyval.ttype = build_parse_node (SCOPE_REF, global_namespace, yyvsp[0].ttype); ; break;} case 36: -#line 462 "parse.y" +#line 461 "parse.y" { yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 37: -#line 467 "parse.y" +#line 466 "parse.y" { begin_only_namespace_names (); ; break;} case 38: -#line 469 "parse.y" +#line 468 "parse.y" { end_only_namespace_names (); /* If no declaration was found, the using-directive is @@ -4630,7 +4630,7 @@ case 38: ; break;} case 39: -#line 482 "parse.y" +#line 481 "parse.y" { if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -4638,7 +4638,7 @@ case 39: ; break;} case 40: -#line 488 "parse.y" +#line 487 "parse.y" { yyval.ttype = yyvsp[-1].ttype; if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE) @@ -4647,86 +4647,86 @@ case 40: ; break;} case 43: -#line 499 "parse.y" +#line 498 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 44: -#line 501 "parse.y" +#line 500 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 45: -#line 506 "parse.y" +#line 505 "parse.y" { push_lang_context (yyvsp[0].ttype); ; break;} case 46: -#line 508 "parse.y" +#line 507 "parse.y" { if (current_lang_name != yyvsp[0].ttype) cp_error ("use of linkage spec `%D' is different from previous spec `%D'", yyvsp[0].ttype, current_lang_name); pop_lang_context (); push_lang_context (yyvsp[0].ttype); ; break;} case 47: -#line 515 "parse.y" +#line 514 "parse.y" { begin_template_parm_list (); ; break;} case 48: -#line 517 "parse.y" +#line 516 "parse.y" { yyval.ttype = end_template_parm_list (yyvsp[-1].ttype); ; break;} case 49: -#line 519 "parse.y" +#line 518 "parse.y" { begin_specialization(); yyval.ttype = NULL_TREE; ; break;} case 50: -#line 525 "parse.y" +#line 524 "parse.y" { yyval.ttype = process_template_parm (NULL_TREE, yyvsp[0].ttype); ; break;} case 51: -#line 527 "parse.y" +#line 526 "parse.y" { yyval.ttype = process_template_parm (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 52: -#line 532 "parse.y" +#line 531 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 53: -#line 534 "parse.y" +#line 533 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 54: -#line 538 "parse.y" +#line 537 "parse.y" { yyval.ttype = finish_template_type_parm (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 55: -#line 540 "parse.y" +#line 539 "parse.y" { yyval.ttype = finish_template_type_parm (class_type_node, yyvsp[0].ttype); ; break;} case 56: -#line 545 "parse.y" +#line 544 "parse.y" { yyval.ttype = finish_template_template_parm (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 57: -#line 557 "parse.y" +#line 556 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ; break;} case 58: -#line 559 "parse.y" +#line 558 "parse.y" { yyval.ttype = build_tree_list (groktypename (yyvsp[0].ftype.t), yyvsp[-2].ttype); ; break;} case 59: -#line 561 "parse.y" +#line 560 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ftype.t); ; break;} case 60: -#line 563 "parse.y" +#line 562 "parse.y" { yyval.ttype = build_tree_list (yyvsp[0].ttype, yyvsp[-2].ftype.t); ; break;} case 61: -#line 565 "parse.y" +#line 564 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ; break;} case 62: -#line 567 "parse.y" +#line 566 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) != TEMPLATE_DECL && TREE_CODE (yyvsp[0].ttype) != TEMPLATE_TEMPLATE_PARM @@ -4739,66 +4739,66 @@ case 62: ; break;} case 63: -#line 581 "parse.y" +#line 580 "parse.y" { finish_template_decl (yyvsp[-1].ttype); ; break;} case 64: -#line 583 "parse.y" +#line 582 "parse.y" { finish_template_decl (yyvsp[-1].ttype); ; break;} case 65: -#line 588 "parse.y" +#line 587 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 66: -#line 590 "parse.y" +#line 589 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 67: -#line 592 "parse.y" +#line 591 "parse.y" { if (pending_inlines) do_pending_inlines (); ; break;} case 68: -#line 594 "parse.y" +#line 593 "parse.y" { if (pending_inlines) do_pending_inlines (); pop_lang_context (); ; break;} case 69: -#line 597 "parse.y" +#line 596 "parse.y" { if (pending_inlines) do_pending_inlines (); pop_lang_context (); ; break;} case 70: -#line 600 "parse.y" +#line 599 "parse.y" { pedantic = yyvsp[-1].itype; ; break;} case 72: -#line 606 "parse.y" +#line 605 "parse.y" {; break;} case 73: -#line 608 "parse.y" +#line 607 "parse.y" { note_list_got_semicolon (yyvsp[-2].ftype.t); ; break;} case 74: -#line 610 "parse.y" +#line 609 "parse.y" { maybe_process_partial_specialization (yyvsp[-1].ftype.t); note_got_semicolon (yyvsp[-1].ftype.t); ; break;} case 76: -#line 617 "parse.y" +#line 616 "parse.y" {; break;} case 77: -#line 619 "parse.y" +#line 618 "parse.y" { note_list_got_semicolon (yyvsp[-2].ftype.t); ; break;} case 78: -#line 621 "parse.y" +#line 620 "parse.y" { pedwarn ("empty declaration"); ; break;} case 80: -#line 624 "parse.y" +#line 623 "parse.y" { tree t, attrs; split_specs_attrs (yyvsp[-1].ftype.t, &t, &attrs); @@ -4807,124 +4807,124 @@ case 80: ; break;} case 84: -#line 637 "parse.y" +#line 636 "parse.y" { yyval.itype = 0; ; break;} case 85: -#line 639 "parse.y" +#line 638 "parse.y" { yyval.itype = 1; ; break;} case 91: -#line 655 "parse.y" +#line 654 "parse.y" { expand_body (finish_function (lineno, (int)yyvsp[-1].itype)); ; break;} case 92: -#line 657 "parse.y" +#line 656 "parse.y" { expand_body (finish_function (lineno, (int)yyvsp[0].itype)); ; break;} case 93: -#line 659 "parse.y" +#line 658 "parse.y" { ; break;} case 94: -#line 664 "parse.y" +#line 663 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 95: -#line 666 "parse.y" +#line 665 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 96: -#line 668 "parse.y" +#line 667 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 97: -#line 672 "parse.y" +#line 671 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 98: -#line 674 "parse.y" +#line 673 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 99: -#line 676 "parse.y" +#line 675 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 100: -#line 680 "parse.y" +#line 679 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 101: -#line 682 "parse.y" +#line 681 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 102: -#line 684 "parse.y" +#line 683 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 103: -#line 688 "parse.y" +#line 687 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 104: -#line 690 "parse.y" +#line 689 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 105: -#line 692 "parse.y" +#line 691 "parse.y" { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 106: -#line 699 "parse.y" +#line 698 "parse.y" { if (!begin_function_definition (yyvsp[-1].ftype.t, yyvsp[0].ttype)) YYERROR1; ; break;} case 107: -#line 702 "parse.y" +#line 701 "parse.y" { if (!begin_function_definition (yyvsp[-1].ttype, yyvsp[0].ttype)) YYERROR1; ; break;} case 108: -#line 705 "parse.y" +#line 704 "parse.y" { if (!begin_function_definition (NULL_TREE, yyvsp[0].ttype)) YYERROR1; ; break;} case 109: -#line 708 "parse.y" +#line 707 "parse.y" { if (!begin_function_definition (yyvsp[-1].ttype, yyvsp[0].ttype)) YYERROR1; ; break;} case 110: -#line 711 "parse.y" +#line 710 "parse.y" { if (!begin_function_definition (NULL_TREE, yyvsp[0].ttype)) YYERROR1; ; break;} case 111: -#line 717 "parse.y" +#line 716 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-5].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 112: -#line 719 "parse.y" +#line 718 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-3].ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 113: -#line 721 "parse.y" +#line 720 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-5].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 114: -#line 723 "parse.y" +#line 722 "parse.y" { yyval.ttype = make_call_declarator (yyvsp[-3].ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 115: -#line 730 "parse.y" +#line 729 "parse.y" { tree specs, attrs; split_specs_attrs (yyvsp[-1].ttype, &specs, &attrs); attrs = build_tree_list (attrs, NULL_TREE); @@ -4937,43 +4937,43 @@ case 115: reinit_parse_for_method (yychar, yyval.ttype); ; break;} case 116: -#line 741 "parse.y" +#line 740 "parse.y" { yyval.ttype = start_method (NULL_TREE, yyvsp[0].ttype, NULL_TREE); goto rest_of_mdef; ; break;} case 117: -#line 744 "parse.y" +#line 743 "parse.y" { tree specs, attrs; split_specs_attrs (yyvsp[-1].ftype.t, &specs, &attrs); attrs = build_tree_list (attrs, NULL_TREE); yyval.ttype = start_method (specs, yyvsp[0].ttype, attrs); goto rest_of_mdef; ; break;} case 118: -#line 749 "parse.y" +#line 748 "parse.y" { tree specs, attrs; split_specs_attrs (yyvsp[-1].ttype, &specs, &attrs); attrs = build_tree_list (attrs, NULL_TREE); yyval.ttype = start_method (specs, yyvsp[0].ttype, attrs); goto rest_of_mdef; ; break;} case 119: -#line 754 "parse.y" +#line 753 "parse.y" { yyval.ttype = start_method (NULL_TREE, yyval.ttype, NULL_TREE); goto rest_of_mdef; ; break;} case 120: -#line 757 "parse.y" +#line 756 "parse.y" { tree specs, attrs; split_specs_attrs (yyvsp[-1].ttype, &specs, &attrs); attrs = build_tree_list (attrs, NULL_TREE); yyval.ttype = start_method (specs, yyvsp[0].ttype, attrs); goto rest_of_mdef; ; break;} case 121: -#line 762 "parse.y" +#line 761 "parse.y" { yyval.ttype = start_method (NULL_TREE, yyval.ttype, NULL_TREE); goto rest_of_mdef; ; break;} case 122: -#line 768 "parse.y" +#line 767 "parse.y" { if (! current_function_parms_stored) store_parm_decls (); @@ -4981,19 +4981,19 @@ case 122: ; break;} case 123: -#line 777 "parse.y" +#line 776 "parse.y" { finish_named_return_value (yyval.ttype, yyvsp[0].ttype); ; break;} case 124: -#line 779 "parse.y" +#line 778 "parse.y" { finish_named_return_value (yyval.ttype, yyvsp[-1].ttype); ; break;} case 125: -#line 781 "parse.y" +#line 780 "parse.y" { finish_named_return_value (yyval.ttype, NULL_TREE); ; break;} case 126: -#line 786 "parse.y" +#line 785 "parse.y" { if (yyvsp[0].itype == 0) error ("no base initializers given following ':'"); @@ -5001,7 +5001,7 @@ case 126: ; break;} case 127: -#line 795 "parse.y" +#line 794 "parse.y" { if (! current_function_parms_stored) store_parm_decls (); @@ -5016,15 +5016,15 @@ case 127: ; break;} case 128: -#line 811 "parse.y" +#line 810 "parse.y" { yyval.itype = 0; ; break;} case 129: -#line 813 "parse.y" +#line 812 "parse.y" { yyval.itype = 1; ; break;} case 132: -#line 820 "parse.y" +#line 819 "parse.y" { if (current_class_name) pedwarn ("anachronistic old style base class initializer"); @@ -5032,7 +5032,7 @@ case 132: ; break;} case 133: -#line 826 "parse.y" +#line 825 "parse.y" { if (current_class_name) pedwarn ("anachronistic old style base class initializer"); @@ -5040,93 +5040,93 @@ case 133: ; break;} case 134: -#line 832 "parse.y" +#line 831 "parse.y" { expand_member_init (current_class_ref, yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 135: -#line 834 "parse.y" +#line 833 "parse.y" { expand_member_init (current_class_ref, yyvsp[-1].ttype, void_type_node); ; break;} case 136: -#line 836 "parse.y" +#line 835 "parse.y" { expand_member_init (current_class_ref, yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 137: -#line 838 "parse.y" +#line 837 "parse.y" { expand_member_init (current_class_ref, yyvsp[-1].ttype, void_type_node); ; break;} case 138: -#line 840 "parse.y" +#line 839 "parse.y" { expand_member_init (current_class_ref, TYPE_MAIN_DECL (yyvsp[-3].ttype), yyvsp[-1].ttype); ; break;} case 139: -#line 843 "parse.y" +#line 842 "parse.y" { expand_member_init (current_class_ref, TYPE_MAIN_DECL (yyvsp[-1].ttype), void_type_node); ; break;} case 152: -#line 870 "parse.y" +#line 869 "parse.y" { do_type_instantiation (yyvsp[-1].ftype.t, NULL_TREE); yyungetc (';', 1); ; break;} case 154: -#line 874 "parse.y" +#line 873 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ftype.t); do_decl_instantiation (specs, yyvsp[0].ttype, NULL_TREE); ; break;} case 156: -#line 878 "parse.y" +#line 877 "parse.y" { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ; break;} case 158: -#line 881 "parse.y" +#line 880 "parse.y" { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ; break;} case 160: -#line 884 "parse.y" +#line 883 "parse.y" { do_type_instantiation (yyvsp[-1].ftype.t, yyvsp[-4].ttype); yyungetc (';', 1); ; break;} case 162: -#line 889 "parse.y" +#line 888 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ftype.t); do_decl_instantiation (specs, yyvsp[0].ttype, yyvsp[-4].ttype); ; break;} case 164: -#line 893 "parse.y" +#line 892 "parse.y" { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, yyvsp[-3].ttype); ; break;} case 166: -#line 896 "parse.y" +#line 895 "parse.y" { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, yyvsp[-3].ttype); ; break;} case 168: -#line 901 "parse.y" +#line 900 "parse.y" { begin_explicit_instantiation(); ; break;} case 169: -#line 904 "parse.y" +#line 903 "parse.y" { end_explicit_instantiation(); ; break;} case 170: -#line 913 "parse.y" +#line 912 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 171: -#line 916 "parse.y" +#line 915 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 174: -#line 924 "parse.y" +#line 923 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 175: -#line 929 "parse.y" +#line 928 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 176: -#line 933 "parse.y" +#line 932 "parse.y" { if (yychar == YYEMPTY) yychar = YYLEX; @@ -5136,7 +5136,7 @@ case 176: ; break;} case 178: -#line 944 "parse.y" +#line 943 "parse.y" { /* Handle `Class>' without space in the `>>' */ pedwarn ("`>>' should be `> >' in template class name"); @@ -5144,79 +5144,79 @@ case 178: ; break;} case 179: -#line 953 "parse.y" +#line 952 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 181: -#line 959 "parse.y" +#line 958 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ; break;} case 182: -#line 961 "parse.y" +#line 960 "parse.y" { yyval.ttype = chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 183: -#line 966 "parse.y" +#line 965 "parse.y" { yyval.ttype = groktypename (yyvsp[0].ftype.t); ; break;} case 184: -#line 968 "parse.y" +#line 967 "parse.y" { yyval.ttype = lastiddecl; ; break;} case 186: -#line 974 "parse.y" +#line 973 "parse.y" { yyval.code = NEGATE_EXPR; ; break;} case 187: -#line 976 "parse.y" +#line 975 "parse.y" { yyval.code = CONVERT_EXPR; ; break;} case 188: -#line 978 "parse.y" +#line 977 "parse.y" { yyval.code = PREINCREMENT_EXPR; ; break;} case 189: -#line 980 "parse.y" +#line 979 "parse.y" { yyval.code = PREDECREMENT_EXPR; ; break;} case 190: -#line 982 "parse.y" +#line 981 "parse.y" { yyval.code = TRUTH_NOT_EXPR; ; break;} case 191: -#line 987 "parse.y" +#line 986 "parse.y" { yyval.ttype = build_x_compound_expr (yyval.ttype); ; break;} case 193: -#line 993 "parse.y" +#line 992 "parse.y" { error ("ANSI C++ forbids an empty condition for `%s'", cond_stmt_keyword); yyval.ttype = integer_zero_node; ; break;} case 194: -#line 997 "parse.y" +#line 996 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 195: -#line 1002 "parse.y" +#line 1001 "parse.y" { error ("ANSI C++ forbids an empty condition for `%s'", cond_stmt_keyword); yyval.ttype = integer_zero_node; ; break;} case 196: -#line 1006 "parse.y" +#line 1005 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 197: -#line 1011 "parse.y" +#line 1010 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 199: -#line 1014 "parse.y" +#line 1013 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 200: -#line 1019 "parse.y" +#line 1018 "parse.y" { { tree d; for (d = getdecls (); d; d = TREE_CHAIN (d)) @@ -5234,7 +5234,7 @@ case 200: ; break;} case 201: -#line 1035 "parse.y" +#line 1034 "parse.y" { cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-3].ttype, LOOKUP_ONLYCONVERTING); yyval.ttype = convert_from_reference (yyvsp[-1].ttype); @@ -5243,180 +5243,180 @@ case 201: ; break;} case 207: -#line 1053 "parse.y" +#line 1052 "parse.y" { yyval.ttype = begin_compound_stmt (1); ; break;} case 208: -#line 1055 "parse.y" +#line 1054 "parse.y" { finish_compound_stmt (1, yyvsp[-1].ttype); ; break;} case 210: -#line 1062 "parse.y" +#line 1061 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, build_expr_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 211: -#line 1065 "parse.y" +#line 1064 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, build_expr_list (NULL_TREE, error_mark_node)); ; break;} case 212: -#line 1068 "parse.y" +#line 1067 "parse.y" { chainon (yyval.ttype, build_expr_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 213: -#line 1070 "parse.y" +#line 1069 "parse.y" { chainon (yyval.ttype, build_expr_list (NULL_TREE, error_mark_node)); ; break;} case 214: -#line 1075 "parse.y" +#line 1074 "parse.y" { yyval.ttype = build_expr_list (NULL_TREE, yyval.ttype); ; break;} case 216: -#line 1081 "parse.y" +#line 1080 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 217: -#line 1084 "parse.y" +#line 1083 "parse.y" { yyval.ttype = yyvsp[0].ttype; pedantic = yyvsp[-1].itype; ; break;} case 218: -#line 1087 "parse.y" +#line 1086 "parse.y" { yyval.ttype = build_x_indirect_ref (yyvsp[0].ttype, "unary *"); ; break;} case 219: -#line 1089 "parse.y" +#line 1088 "parse.y" { yyval.ttype = build_x_unary_op (ADDR_EXPR, yyvsp[0].ttype); ; break;} case 220: -#line 1091 "parse.y" +#line 1090 "parse.y" { yyval.ttype = build_x_unary_op (BIT_NOT_EXPR, yyvsp[0].ttype); ; break;} case 221: -#line 1093 "parse.y" +#line 1092 "parse.y" { yyval.ttype = finish_unary_op_expr (yyvsp[-1].code, yyvsp[0].ttype); ; break;} case 222: -#line 1096 "parse.y" +#line 1095 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids `&&'"); yyval.ttype = finish_label_address_expr (yyvsp[0].ttype); ; break;} case 223: -#line 1100 "parse.y" +#line 1099 "parse.y" { yyval.ttype = expr_sizeof (yyvsp[0].ttype); ; break;} case 224: -#line 1102 "parse.y" +#line 1101 "parse.y" { yyval.ttype = c_sizeof (groktypename (yyvsp[-1].ftype.t)); check_for_new_type ("sizeof", yyvsp[-1].ftype); ; break;} case 225: -#line 1105 "parse.y" +#line 1104 "parse.y" { yyval.ttype = grok_alignof (yyvsp[0].ttype); ; break;} case 226: -#line 1107 "parse.y" +#line 1106 "parse.y" { yyval.ttype = c_alignof (groktypename (yyvsp[-1].ftype.t)); check_for_new_type ("alignof", yyvsp[-1].ftype); ; break;} case 227: -#line 1113 "parse.y" +#line 1112 "parse.y" { yyval.ttype = build_new (NULL_TREE, yyvsp[0].ftype.t, NULL_TREE, yyvsp[-1].itype); check_for_new_type ("new", yyvsp[0].ftype); ; break;} case 228: -#line 1116 "parse.y" +#line 1115 "parse.y" { yyval.ttype = build_new (NULL_TREE, yyvsp[-1].ftype.t, yyvsp[0].ttype, yyvsp[-2].itype); check_for_new_type ("new", yyvsp[-1].ftype); ; break;} case 229: -#line 1119 "parse.y" +#line 1118 "parse.y" { yyval.ttype = build_new (yyvsp[-1].ttype, yyvsp[0].ftype.t, NULL_TREE, yyvsp[-2].itype); check_for_new_type ("new", yyvsp[0].ftype); ; break;} case 230: -#line 1122 "parse.y" +#line 1121 "parse.y" { yyval.ttype = build_new (yyvsp[-2].ttype, yyvsp[-1].ftype.t, yyvsp[0].ttype, yyvsp[-3].itype); check_for_new_type ("new", yyvsp[-1].ftype); ; break;} case 231: -#line 1126 "parse.y" +#line 1125 "parse.y" { yyval.ttype = build_new (NULL_TREE, groktypename(yyvsp[-1].ftype.t), NULL_TREE, yyvsp[-3].itype); check_for_new_type ("new", yyvsp[-1].ftype); ; break;} case 232: -#line 1130 "parse.y" +#line 1129 "parse.y" { yyval.ttype = build_new (NULL_TREE, groktypename(yyvsp[-2].ftype.t), yyvsp[0].ttype, yyvsp[-4].itype); check_for_new_type ("new", yyvsp[-2].ftype); ; break;} case 233: -#line 1133 "parse.y" +#line 1132 "parse.y" { yyval.ttype = build_new (yyvsp[-3].ttype, groktypename(yyvsp[-1].ftype.t), NULL_TREE, yyvsp[-4].itype); check_for_new_type ("new", yyvsp[-1].ftype); ; break;} case 234: -#line 1136 "parse.y" +#line 1135 "parse.y" { yyval.ttype = build_new (yyvsp[-4].ttype, groktypename(yyvsp[-2].ftype.t), yyvsp[0].ttype, yyvsp[-5].itype); check_for_new_type ("new", yyvsp[-2].ftype); ; break;} case 235: -#line 1140 "parse.y" +#line 1139 "parse.y" { yyval.ttype = delete_sanity (yyvsp[0].ttype, NULL_TREE, 0, yyvsp[-1].itype); ; break;} case 236: -#line 1142 "parse.y" +#line 1141 "parse.y" { yyval.ttype = delete_sanity (yyvsp[0].ttype, NULL_TREE, 1, yyvsp[-3].itype); if (yychar == YYEMPTY) yychar = YYLEX; ; break;} case 237: -#line 1146 "parse.y" +#line 1145 "parse.y" { yyval.ttype = delete_sanity (yyvsp[0].ttype, yyvsp[-2].ttype, 2, yyvsp[-4].itype); if (yychar == YYEMPTY) yychar = YYLEX; ; break;} case 238: -#line 1150 "parse.y" +#line 1149 "parse.y" { yyval.ttype = build_x_unary_op (REALPART_EXPR, yyvsp[0].ttype); ; break;} case 239: -#line 1152 "parse.y" +#line 1151 "parse.y" { yyval.ttype = build_x_unary_op (IMAGPART_EXPR, yyvsp[0].ttype); ; break;} case 240: -#line 1154 "parse.y" +#line 1153 "parse.y" { yyval.ttype = build_x_va_arg (yyvsp[-3].ttype, groktypename (yyvsp[-1].ftype.t)); check_for_new_type ("__builtin_va_arg", yyvsp[-1].ftype); ; break;} case 241: -#line 1160 "parse.y" +#line 1159 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 242: -#line 1162 "parse.y" +#line 1161 "parse.y" { cp_pedwarn ("old style placement syntax, use () instead"); yyval.ttype = yyvsp[-1].ttype; ; break;} case 243: -#line 1168 "parse.y" +#line 1167 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 244: -#line 1170 "parse.y" +#line 1169 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 245: -#line 1172 "parse.y" +#line 1171 "parse.y" { cp_error ("`%T' is not a valid expression", yyvsp[-1].ftype.t); yyval.ttype = error_mark_node; ; break;} case 246: -#line 1180 "parse.y" +#line 1179 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids initialization of new expression with `='"); @@ -5428,23 +5428,23 @@ case 246: ; break;} case 247: -#line 1194 "parse.y" +#line 1193 "parse.y" { yyvsp[-1].ftype.t = finish_parmlist (build_tree_list (NULL_TREE, yyvsp[-1].ftype.t), 0); yyval.ttype = make_call_declarator (NULL_TREE, yyvsp[-1].ftype.t, NULL_TREE, NULL_TREE); check_for_new_type ("cast", yyvsp[-1].ftype); ; break;} case 248: -#line 1198 "parse.y" +#line 1197 "parse.y" { yyvsp[-1].ftype.t = finish_parmlist (build_tree_list (NULL_TREE, yyvsp[-1].ftype.t), 0); yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-1].ftype.t, NULL_TREE, NULL_TREE); check_for_new_type ("cast", yyvsp[-1].ftype); ; break;} case 250: -#line 1206 "parse.y" +#line 1205 "parse.y" { yyval.ttype = reparse_absdcl_as_casts (yyval.ttype, yyvsp[0].ttype); ; break;} case 251: -#line 1208 "parse.y" +#line 1207 "parse.y" { tree init = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-2].ttype)); @@ -5457,113 +5457,113 @@ case 251: ; break;} case 253: -#line 1224 "parse.y" +#line 1223 "parse.y" { yyval.ttype = build_x_binary_op (MEMBER_REF, yyval.ttype, yyvsp[0].ttype); ; break;} case 254: -#line 1226 "parse.y" +#line 1225 "parse.y" { yyval.ttype = build_m_component_ref (yyval.ttype, yyvsp[0].ttype); ; break;} case 255: -#line 1228 "parse.y" +#line 1227 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 256: -#line 1230 "parse.y" +#line 1229 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 257: -#line 1232 "parse.y" +#line 1231 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 258: -#line 1234 "parse.y" +#line 1233 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 259: -#line 1236 "parse.y" +#line 1235 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 260: -#line 1238 "parse.y" +#line 1237 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 261: -#line 1240 "parse.y" +#line 1239 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 262: -#line 1242 "parse.y" +#line 1241 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 263: -#line 1244 "parse.y" +#line 1243 "parse.y" { yyval.ttype = build_x_binary_op (LT_EXPR, yyval.ttype, yyvsp[0].ttype); ; break;} case 264: -#line 1246 "parse.y" +#line 1245 "parse.y" { yyval.ttype = build_x_binary_op (GT_EXPR, yyval.ttype, yyvsp[0].ttype); ; break;} case 265: -#line 1248 "parse.y" +#line 1247 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 266: -#line 1250 "parse.y" +#line 1249 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 267: -#line 1252 "parse.y" +#line 1251 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 268: -#line 1254 "parse.y" +#line 1253 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 269: -#line 1256 "parse.y" +#line 1255 "parse.y" { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ; break;} case 270: -#line 1258 "parse.y" +#line 1257 "parse.y" { yyval.ttype = build_x_binary_op (TRUTH_ANDIF_EXPR, yyval.ttype, yyvsp[0].ttype); ; break;} case 271: -#line 1260 "parse.y" +#line 1259 "parse.y" { yyval.ttype = build_x_binary_op (TRUTH_ORIF_EXPR, yyval.ttype, yyvsp[0].ttype); ; break;} case 272: -#line 1262 "parse.y" +#line 1261 "parse.y" { yyval.ttype = build_x_conditional_expr (yyval.ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 273: -#line 1264 "parse.y" +#line 1263 "parse.y" { yyval.ttype = build_x_modify_expr (yyval.ttype, NOP_EXPR, yyvsp[0].ttype); if (yyval.ttype != error_mark_node) C_SET_EXP_ORIGINAL_CODE (yyval.ttype, MODIFY_EXPR); ; break;} case 274: -#line 1268 "parse.y" +#line 1267 "parse.y" { yyval.ttype = build_x_modify_expr (yyval.ttype, yyvsp[-1].code, yyvsp[0].ttype); ; break;} case 275: -#line 1270 "parse.y" +#line 1269 "parse.y" { yyval.ttype = build_throw (NULL_TREE); ; break;} case 276: -#line 1272 "parse.y" +#line 1271 "parse.y" { yyval.ttype = build_throw (yyvsp[0].ttype); ; break;} case 277: -#line 1290 "parse.y" +#line 1289 "parse.y" { yyval.ttype = build_parse_node (BIT_NOT_EXPR, yyvsp[0].ttype); ; break;} case 278: -#line 1292 "parse.y" +#line 1291 "parse.y" { yyval.ttype = build_parse_node (BIT_NOT_EXPR, yyvsp[0].ttype); ; break;} case 284: -#line 1301 "parse.y" +#line 1300 "parse.y" { /* If lastiddecl is a TREE_LIST, it's a baselink, which means that we're in an expression like S::f, so @@ -5576,27 +5576,27 @@ case 284: ; break;} case 285: -#line 1314 "parse.y" +#line 1313 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 286: -#line 1316 "parse.y" +#line 1315 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 287: -#line 1321 "parse.y" +#line 1320 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 288: -#line 1323 "parse.y" +#line 1322 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 289: -#line 1326 "parse.y" +#line 1325 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 294: -#line 1338 "parse.y" +#line 1337 "parse.y" { /* Provide support for '(' attributes '*' declarator ')' etc */ @@ -5604,31 +5604,31 @@ case 294: ; break;} case 296: -#line 1348 "parse.y" +#line 1347 "parse.y" { yyval.ttype = build_parse_node (INDIRECT_REF, yyvsp[0].ttype); ; break;} case 297: -#line 1350 "parse.y" +#line 1349 "parse.y" { yyval.ttype = build_parse_node (ADDR_EXPR, yyvsp[0].ttype); ; break;} case 298: -#line 1352 "parse.y" +#line 1351 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 299: -#line 1357 "parse.y" +#line 1356 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 300: -#line 1359 "parse.y" +#line 1358 "parse.y" { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 304: -#line 1369 "parse.y" +#line 1368 "parse.y" { yyval.ttype = finish_decl_parsing (yyvsp[-1].ttype); ; break;} case 305: -#line 1374 "parse.y" +#line 1373 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == BIT_NOT_EXPR) yyval.ttype = build_x_unary_op (BIT_NOT_EXPR, TREE_OPERAND (yyvsp[0].ttype, 0)); @@ -5637,7 +5637,7 @@ case 305: ; break;} case 308: -#line 1383 "parse.y" +#line 1382 "parse.y" { yyval.ttype = combine_strings (yyval.ttype); /* combine_strings doesn't set up TYPE_MAIN_VARIANT of @@ -5649,20 +5649,20 @@ case 308: ; break;} case 309: -#line 1393 "parse.y" +#line 1392 "parse.y" { yyval.ttype = finish_parenthesized_expr (yyvsp[-1].ttype); ; break;} case 310: -#line 1395 "parse.y" +#line 1394 "parse.y" { yyvsp[-1].ttype = reparse_decl_as_expr (NULL_TREE, yyvsp[-1].ttype); yyval.ttype = finish_parenthesized_expr (yyvsp[-1].ttype); ; break;} case 311: -#line 1398 "parse.y" +#line 1397 "parse.y" { yyval.ttype = error_mark_node; ; break;} case 312: -#line 1400 "parse.y" +#line 1399 "parse.y" { tree scope = current_scope (); if (!scope || TREE_CODE (scope) != FUNCTION_DECL) { @@ -5675,43 +5675,43 @@ case 312: ; break;} case 313: -#line 1411 "parse.y" +#line 1410 "parse.y" { yyval.ttype = finish_stmt_expr (yyvsp[-2].ttype); ; break;} case 314: -#line 1416 "parse.y" +#line 1415 "parse.y" { yyval.ttype = finish_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype, 1); ; break;} case 315: -#line 1418 "parse.y" +#line 1417 "parse.y" { yyval.ttype = finish_call_expr (yyvsp[-1].ttype, NULL_TREE, 1); ; break;} case 316: -#line 1420 "parse.y" +#line 1419 "parse.y" { yyval.ttype = finish_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype, 0); ; break;} case 317: -#line 1422 "parse.y" +#line 1421 "parse.y" { yyval.ttype = finish_call_expr (yyvsp[-1].ttype, NULL_TREE, 0); ; break;} case 318: -#line 1424 "parse.y" +#line 1423 "parse.y" { yyval.ttype = grok_array_decl (yyval.ttype, yyvsp[-1].ttype); ; break;} case 319: -#line 1426 "parse.y" +#line 1425 "parse.y" { yyval.ttype = finish_increment_expr (yyvsp[-1].ttype, POSTINCREMENT_EXPR); ; break;} case 320: -#line 1428 "parse.y" +#line 1427 "parse.y" { yyval.ttype = finish_increment_expr (yyvsp[-1].ttype, POSTDECREMENT_EXPR); ; break;} case 321: -#line 1431 "parse.y" +#line 1430 "parse.y" { yyval.ttype = finish_this_expr (); ; break;} case 322: -#line 1433 "parse.y" +#line 1432 "parse.y" { /* This is a C cast in C++'s `functional' notation using the "implicit int" extension so that: @@ -5724,49 +5724,49 @@ case 322: ; break;} case 324: -#line 1445 "parse.y" +#line 1444 "parse.y" { tree type = groktypename (yyvsp[-4].ftype.t); check_for_new_type ("dynamic_cast", yyvsp[-4].ftype); yyval.ttype = build_dynamic_cast (type, yyvsp[-1].ttype); ; break;} case 325: -#line 1449 "parse.y" +#line 1448 "parse.y" { tree type = groktypename (yyvsp[-4].ftype.t); check_for_new_type ("static_cast", yyvsp[-4].ftype); yyval.ttype = build_static_cast (type, yyvsp[-1].ttype); ; break;} case 326: -#line 1453 "parse.y" +#line 1452 "parse.y" { tree type = groktypename (yyvsp[-4].ftype.t); check_for_new_type ("reinterpret_cast", yyvsp[-4].ftype); yyval.ttype = build_reinterpret_cast (type, yyvsp[-1].ttype); ; break;} case 327: -#line 1457 "parse.y" +#line 1456 "parse.y" { tree type = groktypename (yyvsp[-4].ftype.t); check_for_new_type ("const_cast", yyvsp[-4].ftype); yyval.ttype = build_const_cast (type, yyvsp[-1].ttype); ; break;} case 328: -#line 1461 "parse.y" +#line 1460 "parse.y" { yyval.ttype = build_x_typeid (yyvsp[-1].ttype); ; break;} case 329: -#line 1463 "parse.y" +#line 1462 "parse.y" { tree type = groktypename (yyvsp[-1].ftype.t); check_for_new_type ("typeid", yyvsp[-1].ftype); yyval.ttype = get_typeid (TYPE_MAIN_VARIANT (type)); ; break;} case 330: -#line 1467 "parse.y" +#line 1466 "parse.y" { yyval.ttype = do_scoped_id (yyvsp[0].ttype, 1); ; break;} case 331: -#line 1469 "parse.y" +#line 1468 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 332: -#line 1471 "parse.y" +#line 1470 "parse.y" { got_scope = NULL_TREE; if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) @@ -5776,102 +5776,102 @@ case 332: ; break;} case 333: -#line 1479 "parse.y" +#line 1478 "parse.y" { yyval.ttype = build_offset_ref (OP0 (yyval.ttype), OP1 (yyval.ttype)); ; break;} case 334: -#line 1481 "parse.y" +#line 1480 "parse.y" { yyval.ttype = finish_qualified_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 335: -#line 1483 "parse.y" +#line 1482 "parse.y" { yyval.ttype = finish_qualified_call_expr (yyvsp[-1].ttype, NULL_TREE); ; break;} case 336: -#line 1485 "parse.y" +#line 1484 "parse.y" { yyval.ttype = build_x_component_ref (yyval.ttype, yyvsp[0].ttype, NULL_TREE, 1); ; break;} case 337: -#line 1489 "parse.y" +#line 1488 "parse.y" { yyval.ttype = finish_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ; break;} case 338: -#line 1491 "parse.y" +#line 1490 "parse.y" { yyval.ttype = finish_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ; break;} case 339: -#line 1493 "parse.y" +#line 1492 "parse.y" { yyval.ttype = build_x_component_ref (yyval.ttype, yyvsp[0].ttype, NULL_TREE, 1); ; break;} case 340: -#line 1495 "parse.y" +#line 1494 "parse.y" { if (processing_template_decl) yyval.ttype = build_min_nt (COMPONENT_REF, yyvsp[-1].ttype, yyvsp[0].ttype); else yyval.ttype = build_object_ref (yyval.ttype, OP0 (yyvsp[0].ttype), OP1 (yyvsp[0].ttype)); ; break;} case 341: -#line 1500 "parse.y" +#line 1499 "parse.y" { yyval.ttype = finish_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ; break;} case 342: -#line 1502 "parse.y" +#line 1501 "parse.y" { yyval.ttype = finish_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ; break;} case 343: -#line 1504 "parse.y" +#line 1503 "parse.y" { yyval.ttype = finish_qualified_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ; break;} case 344: -#line 1506 "parse.y" +#line 1505 "parse.y" { yyval.ttype = finish_qualified_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ; break;} case 345: -#line 1509 "parse.y" +#line 1508 "parse.y" { yyval.ttype = finish_pseudo_destructor_call_expr (yyvsp[-3].ttype, NULL_TREE, yyvsp[-1].ttype); ; break;} case 346: -#line 1511 "parse.y" +#line 1510 "parse.y" { yyval.ttype = finish_pseudo_destructor_call_expr (yyvsp[-5].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ; break;} case 347: -#line 1513 "parse.y" +#line 1512 "parse.y" { yyval.ttype = error_mark_node; ; break;} case 348: -#line 1558 "parse.y" +#line 1557 "parse.y" { yyval.itype = 0; ; break;} case 349: -#line 1560 "parse.y" +#line 1559 "parse.y" { got_scope = NULL_TREE; yyval.itype = 1; ; break;} case 350: -#line 1565 "parse.y" +#line 1564 "parse.y" { yyval.itype = 0; ; break;} case 351: -#line 1567 "parse.y" +#line 1566 "parse.y" { got_scope = NULL_TREE; yyval.itype = 1; ; break;} case 352: -#line 1572 "parse.y" +#line 1571 "parse.y" { yyval.ttype = boolean_true_node; ; break;} case 353: -#line 1574 "parse.y" +#line 1573 "parse.y" { yyval.ttype = boolean_false_node; ; break;} case 355: -#line 1581 "parse.y" +#line 1580 "parse.y" { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ; break;} case 356: -#line 1586 "parse.y" +#line 1585 "parse.y" { if (! current_function_parms_stored) store_parm_decls (); @@ -5879,156 +5879,156 @@ case 356: ; break;} case 357: -#line 1595 "parse.y" +#line 1594 "parse.y" { got_object = TREE_TYPE (yyval.ttype); ; break;} case 358: -#line 1597 "parse.y" +#line 1596 "parse.y" { yyval.ttype = build_x_arrow (yyval.ttype); got_object = TREE_TYPE (yyval.ttype); ; break;} case 359: -#line 1605 "parse.y" +#line 1604 "parse.y" { if (yyvsp[-2].ftype.t && IS_AGGR_TYPE_CODE (TREE_CODE (yyvsp[-2].ftype.t))) note_got_semicolon (yyvsp[-2].ftype.t); ; break;} case 360: -#line 1610 "parse.y" +#line 1609 "parse.y" { note_list_got_semicolon (yyvsp[-2].ftype.t); ; break;} case 361: -#line 1614 "parse.y" +#line 1613 "parse.y" {; break;} case 362: -#line 1616 "parse.y" +#line 1615 "parse.y" { shadow_tag (yyvsp[-1].ftype.t); note_list_got_semicolon (yyvsp[-1].ftype.t); ; break;} case 363: -#line 1621 "parse.y" +#line 1620 "parse.y" { warning ("empty declaration"); ; break;} case 364: -#line 1623 "parse.y" +#line 1622 "parse.y" { pedantic = yyvsp[-1].itype; ; break;} case 367: -#line 1637 "parse.y" +#line 1636 "parse.y" { yyval.ttype = make_call_declarator (NULL_TREE, empty_parms (), NULL_TREE, NULL_TREE); ; break;} case 368: -#line 1640 "parse.y" +#line 1639 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), NULL_TREE, NULL_TREE); ; break;} case 369: -#line 1647 "parse.y" +#line 1646 "parse.y" { yyval.ftype.t = build_decl_list (yyvsp[-1].ftype.t, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 370: -#line 1650 "parse.y" +#line 1649 "parse.y" { yyval.ftype.t = build_decl_list (yyvsp[-1].ftype.t, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 371: -#line 1653 "parse.y" +#line 1652 "parse.y" { yyval.ftype.t = build_decl_list (build_decl_list (NULL_TREE, yyvsp[-1].ftype.t), yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 372: -#line 1657 "parse.y" +#line 1656 "parse.y" { yyval.ftype.t = build_decl_list (yyvsp[0].ftype.t, NULL_TREE); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 373: -#line 1660 "parse.y" +#line 1659 "parse.y" { yyval.ftype.t = build_decl_list (yyvsp[0].ftype.t, NULL_TREE); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 376: -#line 1676 "parse.y" +#line 1675 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ttype); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 377: -#line 1679 "parse.y" +#line 1678 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 378: -#line 1682 "parse.y" +#line 1681 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-2].ftype.t, chainon (yyvsp[-1].ttype, yyvsp[0].ttype)); yyval.ftype.new_type_flag = yyvsp[-2].ftype.new_type_flag; ; break;} case 379: -#line 1685 "parse.y" +#line 1684 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, chainon (yyvsp[0].ttype, yyvsp[-2].ttype)); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 380: -#line 1688 "parse.y" +#line 1687 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, chainon (yyvsp[0].ttype, yyvsp[-2].ttype)); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 381: -#line 1691 "parse.y" +#line 1690 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-2].ftype.t, chainon (yyvsp[-1].ttype, chainon (yyvsp[0].ttype, yyvsp[-3].ttype))); yyval.ftype.new_type_flag = yyvsp[-2].ftype.new_type_flag; ; break;} case 382: -#line 1698 "parse.y" +#line 1697 "parse.y" { if (extra_warnings) warning ("`%s' is not at beginning of declaration", IDENTIFIER_POINTER (yyval.ttype)); yyval.ttype = build_decl_list (NULL_TREE, yyval.ttype); ; break;} case 383: -#line 1703 "parse.y" +#line 1702 "parse.y" { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyval.ttype); ; break;} case 384: -#line 1705 "parse.y" +#line 1704 "parse.y" { if (extra_warnings) warning ("`%s' is not at beginning of declaration", IDENTIFIER_POINTER (yyvsp[0].ttype)); yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ; break;} case 385: -#line 1710 "parse.y" +#line 1709 "parse.y" { yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ; break;} case 386: -#line 1712 "parse.y" +#line 1711 "parse.y" { yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); ; break;} case 387: -#line 1731 "parse.y" +#line 1730 "parse.y" { yyval.ttype = yyvsp[0].ftype.t; TREE_STATIC (yyval.ttype) = 1; ; break;} case 388: -#line 1733 "parse.y" +#line 1732 "parse.y" { yyval.ttype = hash_tree_cons (NULL_TREE, yyval.ttype, NULL_TREE); ; break;} case 389: -#line 1735 "parse.y" +#line 1734 "parse.y" { yyval.ttype = hash_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); TREE_STATIC (yyval.ttype) = 1; ; break;} case 390: -#line 1738 "parse.y" +#line 1737 "parse.y" { if (extra_warnings && TREE_STATIC (yyval.ttype)) warning ("`%s' is not at beginning of declaration", IDENTIFIER_POINTER (yyvsp[0].ttype)); @@ -6036,61 +6036,61 @@ case 390: TREE_STATIC (yyval.ttype) = TREE_STATIC (yyvsp[-1].ttype); ; break;} case 391: -#line 1744 "parse.y" +#line 1743 "parse.y" { yyval.ttype = hash_tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ; break;} case 392: -#line 1746 "parse.y" +#line 1745 "parse.y" { yyval.ttype = hash_tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); ; break;} case 393: -#line 1757 "parse.y" +#line 1756 "parse.y" { yyval.ftype.t = build_decl_list (NULL_TREE, yyvsp[0].ftype.t); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 394: -#line 1760 "parse.y" +#line 1759 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 395: -#line 1763 "parse.y" +#line 1762 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 396: -#line 1766 "parse.y" +#line 1765 "parse.y" { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, chainon (yyvsp[0].ttype, yyvsp[-2].ftype.t)); yyval.ftype.new_type_flag = yyvsp[-2].ftype.new_type_flag; ; break;} case 397: -#line 1772 "parse.y" +#line 1771 "parse.y" { yyval.ttype = build_decl_list (NULL_TREE, yyvsp[0].ftype.t); ; break;} case 398: -#line 1774 "parse.y" +#line 1773 "parse.y" { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ttype); ; break;} case 400: -#line 1784 "parse.y" +#line 1783 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 401: -#line 1786 "parse.y" +#line 1785 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 402: -#line 1788 "parse.y" +#line 1787 "parse.y" { yyval.ftype.t = finish_typeof (yyvsp[-1].ttype); yyval.ftype.new_type_flag = 0; ; break;} case 403: -#line 1791 "parse.y" +#line 1790 "parse.y" { yyval.ftype.t = groktypename (yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = 0; ; break;} case 404: -#line 1794 "parse.y" +#line 1793 "parse.y" { tree type = TREE_TYPE (yyvsp[-1].ttype); yyval.ftype.new_type_flag = 0; @@ -6107,7 +6107,7 @@ case 404: ; break;} case 405: -#line 1809 "parse.y" +#line 1808 "parse.y" { tree type = groktypename (yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = 0; @@ -6124,282 +6124,280 @@ case 405: ; break;} case 406: -#line 1829 "parse.y" +#line 1828 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 407: -#line 1831 "parse.y" +#line 1830 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 410: -#line 1838 "parse.y" +#line 1837 "parse.y" { check_multiple_declarators (); ; break;} case 412: -#line 1844 "parse.y" +#line 1843 "parse.y" { check_multiple_declarators (); ; break;} case 414: -#line 1850 "parse.y" +#line 1849 "parse.y" { check_multiple_declarators (); ; break;} case 415: -#line 1855 "parse.y" +#line 1854 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 416: -#line 1857 "parse.y" +#line 1856 "parse.y" { if (TREE_CHAIN (yyvsp[-1].ttype)) yyvsp[-1].ttype = combine_strings (yyvsp[-1].ttype); yyval.ttype = yyvsp[-1].ttype; ; break;} case 417: -#line 1862 "parse.y" +#line 1861 "parse.y" { yyval.ttype = start_decl (yyvsp[-3].ttype, current_declspecs, 1, yyvsp[-1].ttype, prefix_attributes); ; break;} case 418: -#line 1866 "parse.y" +#line 1865 "parse.y" { cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype, LOOKUP_ONLYCONVERTING); ; break;} case 419: -#line 1868 "parse.y" +#line 1867 "parse.y" { yyval.ttype = start_decl (yyvsp[-2].ttype, current_declspecs, 0, yyvsp[0].ttype, prefix_attributes); cp_finish_decl (yyval.ttype, NULL_TREE, yyvsp[-1].ttype, 0); ; break;} case 420: -#line 1881 "parse.y" +#line 1880 "parse.y" { parse_decl (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype, 1, &yyval.ttype); ; break;} case 421: -#line 1885 "parse.y" +#line 1884 "parse.y" { cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype, LOOKUP_ONLYCONVERTING); ; break;} case 422: -#line 1888 "parse.y" +#line 1887 "parse.y" { tree d; parse_decl (yyvsp[-2].ttype, yyvsp[-3].ttype, yyvsp[0].ttype, 0, &d); cp_finish_decl (d, NULL_TREE, yyvsp[-1].ttype, 0); ; break;} case 423: -#line 1895 "parse.y" +#line 1894 "parse.y" {; break;} case 424: -#line 1900 "parse.y" +#line 1899 "parse.y" {; break;} case 425: -#line 1905 "parse.y" +#line 1904 "parse.y" { /* Set things up as initdcl0_innards expects. */ yyvsp[0].ttype = yyvsp[-1].ttype; yyvsp[-1].ttype = NULL_TREE; ; break;} case 426: -#line 1909 "parse.y" +#line 1908 "parse.y" {; break;} case 427: -#line 1911 "parse.y" +#line 1910 "parse.y" { tree d; parse_decl(yyvsp[-2].ttype, NULL_TREE, yyvsp[0].ttype, 0, &d); cp_finish_decl (d, NULL_TREE, yyvsp[-1].ttype, 0); ; break;} case 428: -#line 1920 "parse.y" +#line 1919 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 429: -#line 1922 "parse.y" +#line 1921 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 430: -#line 1927 "parse.y" +#line 1926 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 431: -#line 1929 "parse.y" +#line 1928 "parse.y" { yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 432: -#line 1934 "parse.y" +#line 1933 "parse.y" { yyval.ttype = yyvsp[-2].ttype; ; break;} case 433: -#line 1939 "parse.y" +#line 1938 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 434: -#line 1941 "parse.y" +#line 1940 "parse.y" { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 435: -#line 1946 "parse.y" +#line 1945 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 436: -#line 1948 "parse.y" +#line 1947 "parse.y" { yyval.ttype = build_tree_list (yyvsp[0].ttype, NULL_TREE); ; break;} case 437: -#line 1950 "parse.y" +#line 1949 "parse.y" { yyval.ttype = build_tree_list (yyvsp[-3].ttype, build_tree_list (NULL_TREE, yyvsp[-1].ttype)); ; break;} case 438: -#line 1952 "parse.y" +#line 1951 "parse.y" { yyval.ttype = build_tree_list (yyvsp[-5].ttype, tree_cons (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype)); ; break;} case 439: -#line 1954 "parse.y" +#line 1953 "parse.y" { yyval.ttype = build_tree_list (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 444: -#line 1970 "parse.y" +#line 1969 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ; break;} case 445: -#line 1972 "parse.y" +#line 1971 "parse.y" { yyval.ttype = chainon (yyvsp[-2].ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 446: -#line 1977 "parse.y" +#line 1976 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 447: -#line 1979 "parse.y" +#line 1978 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 449: -#line 1987 "parse.y" +#line 1986 "parse.y" { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, NULL_TREE); TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ; break;} case 450: -#line 1990 "parse.y" +#line 1989 "parse.y" { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-1].ttype)); TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ; break;} case 451: -#line 1993 "parse.y" +#line 1992 "parse.y" { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-2].ttype)); TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ; break;} case 452: -#line 1996 "parse.y" +#line 1995 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 453: -#line 2003 "parse.y" +#line 2002 "parse.y" { yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ; break;} case 454: -#line 2005 "parse.y" +#line 2004 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ; break;} case 455: -#line 2008 "parse.y" +#line 2007 "parse.y" { yyval.ttype = build_expr_list (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 456: -#line 2010 "parse.y" +#line 2009 "parse.y" { yyval.ttype = build_expr_list (yyval.ttype, yyvsp[0].ttype); ; break;} case 457: -#line 2012 "parse.y" +#line 2011 "parse.y" { yyval.ttype = tree_cons (yyvsp[-2].ttype, yyvsp[0].ttype, yyval.ttype); ; break;} case 458: -#line 2017 "parse.y" +#line 2016 "parse.y" { start_function (NULL_TREE, yyvsp[0].pi->fndecl, NULL_TREE, (SF_DEFAULT | SF_PRE_PARSED | SF_INCLASS_INLINE)); reinit_parse_for_function (); ; break;} case 459: -#line 2024 "parse.y" +#line 2023 "parse.y" { expand_body (finish_function (lineno, (int)yyvsp[-1].itype | 2)); process_next_inline (yyvsp[-3].pi); ; break;} case 460: -#line 2029 "parse.y" +#line 2028 "parse.y" { expand_body (finish_function (lineno, (int)yyvsp[0].itype | 2)); process_next_inline (yyvsp[-2].pi); ; break;} case 461: -#line 2034 "parse.y" +#line 2033 "parse.y" { finish_function (lineno, 2); process_next_inline (yyvsp[-2].pi); ; break;} case 464: -#line 2048 "parse.y" +#line 2047 "parse.y" { replace_defarg (yyvsp[-2].ttype, yyvsp[-1].ttype); ; break;} case 465: -#line 2050 "parse.y" +#line 2049 "parse.y" { replace_defarg (yyvsp[-2].ttype, error_mark_node); ; break;} case 467: -#line 2055 "parse.y" +#line 2054 "parse.y" { do_pending_defargs (); ; break;} case 468: -#line 2057 "parse.y" +#line 2056 "parse.y" { do_pending_defargs (); ; break;} case 469: -#line 2062 "parse.y" +#line 2061 "parse.y" { yyval.ttype = current_enum_type; current_enum_type = start_enum (yyvsp[-1].ttype); ; break;} case 470: -#line 2065 "parse.y" -{ TYPE_VALUES (current_enum_type) = yyvsp[-1].ttype; - yyval.ftype.t = finish_enum (current_enum_type); +#line 2064 "parse.y" +{ yyval.ftype.t = finish_enum (current_enum_type); yyval.ftype.new_type_flag = 1; current_enum_type = yyvsp[-2].ttype; check_for_missing_semicolon (yyval.ftype.t); ; break;} case 471: -#line 2071 "parse.y" +#line 2069 "parse.y" { yyval.ttype = current_enum_type; current_enum_type = start_enum (make_anon_name ()); ; break;} case 472: -#line 2074 "parse.y" -{ TYPE_VALUES (current_enum_type) = yyvsp[-1].ttype; - yyval.ftype.t = finish_enum (current_enum_type); +#line 2072 "parse.y" +{ yyval.ftype.t = finish_enum (current_enum_type); yyval.ftype.new_type_flag = 1; current_enum_type = yyvsp[-2].ttype; check_for_missing_semicolon (yyval.ftype.t); ; break;} case 473: -#line 2080 "parse.y" +#line 2077 "parse.y" { yyval.ftype.t = xref_tag (enum_type_node, yyvsp[0].ttype, 1); yyval.ftype.new_type_flag = 0; ; break;} case 474: -#line 2083 "parse.y" +#line 2080 "parse.y" { yyval.ftype.t = xref_tag (enum_type_node, yyvsp[0].ttype, 1); yyval.ftype.new_type_flag = 0; ; break;} case 475: -#line 2086 "parse.y" +#line 2083 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; if (!processing_template_decl) cp_pedwarn ("using `typename' outside of template"); ; break;} case 476: -#line 2092 "parse.y" +#line 2089 "parse.y" { yyvsp[-1].ftype.t = begin_class_definition (yyvsp[-1].ftype.t); ; break;} case 477: -#line 2094 "parse.y" +#line 2091 "parse.y" { int semi; @@ -6412,13 +6410,13 @@ case 477: ; break;} case 478: -#line 2105 "parse.y" +#line 2102 "parse.y" { begin_inline_definitions (); ; break;} case 479: -#line 2109 "parse.y" +#line 2106 "parse.y" { finish_inline_definitions (); yyval.ftype.t = yyvsp[-3].ttype; @@ -6426,7 +6424,7 @@ case 479: ; break;} case 480: -#line 2115 "parse.y" +#line 2112 "parse.y" { if (yyvsp[0].ftype.new_type_flag && yyvsp[0].ftype.t != error_mark_node) pop_scope (CP_DECL_CONTEXT (TYPE_MAIN_DECL (yyvsp[0].ftype.t))); @@ -6450,51 +6448,51 @@ case 480: ; break;} case 484: -#line 2146 "parse.y" +#line 2143 "parse.y" { if (pedantic && !in_system_header) pedwarn ("comma at end of enumerator list"); ; break;} case 486: -#line 2153 "parse.y" +#line 2150 "parse.y" { error ("storage class specifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ; break;} case 487: -#line 2155 "parse.y" +#line 2152 "parse.y" { error ("type specifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ; break;} case 488: -#line 2157 "parse.y" +#line 2154 "parse.y" { error ("type qualifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ; break;} case 489: -#line 2159 "parse.y" +#line 2156 "parse.y" { error ("no body nor ';' separates two class, struct or union declarations"); ; break;} case 490: -#line 2161 "parse.y" +#line 2158 "parse.y" { yyval.ttype = build_decl_list (yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 491: -#line 2166 "parse.y" +#line 2163 "parse.y" { current_aggr = yyvsp[-1].ttype; yyval.ttype = yyvsp[0].ttype; ; break;} case 492: -#line 2174 "parse.y" +#line 2171 "parse.y" { current_aggr = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ; break;} case 493: -#line 2176 "parse.y" +#line 2173 "parse.y" { yyungetc ('{', 1); ; break;} case 494: -#line 2178 "parse.y" +#line 2175 "parse.y" { yyungetc (':', 1); ; break;} case 495: -#line 2183 "parse.y" +#line 2180 "parse.y" { current_aggr = yyvsp[-2].ttype; yyval.ftype.t = handle_class_head (yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); @@ -6502,7 +6500,7 @@ case 495: ; break;} case 496: -#line 2189 "parse.y" +#line 2186 "parse.y" { current_aggr = yyvsp[-3].ttype; yyval.ftype.t = handle_class_head (yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); @@ -6510,7 +6508,7 @@ case 496: ; break;} case 497: -#line 2195 "parse.y" +#line 2192 "parse.y" { current_aggr = yyvsp[-2].ttype; yyval.ftype.t = handle_class_head (yyvsp[-2].ttype, NULL_TREE, yyvsp[0].ttype); @@ -6518,7 +6516,7 @@ case 497: ; break;} case 498: -#line 2201 "parse.y" +#line 2198 "parse.y" { current_aggr = yyvsp[-1].ttype; yyval.ftype.t = yyvsp[0].ttype; @@ -6526,7 +6524,7 @@ case 498: ; break;} case 499: -#line 2207 "parse.y" +#line 2204 "parse.y" { current_aggr = yyvsp[-2].ttype; yyval.ftype.t = yyvsp[0].ttype; @@ -6536,18 +6534,18 @@ case 499: ; break;} case 500: -#line 2218 "parse.y" +#line 2215 "parse.y" { yyval.ftype.t = xref_tag (current_aggr, yyvsp[0].ttype, 1); yyval.ftype.new_type_flag = 0; ; break;} case 501: -#line 2223 "parse.y" +#line 2220 "parse.y" { yyval.ttype = xref_tag (current_aggr, yyvsp[0].ttype, 0); ; break;} case 502: -#line 2227 "parse.y" +#line 2224 "parse.y" { yyval.ftype.t = yyvsp[-1].ttype; yyval.ftype.new_type_flag = 0; @@ -6556,7 +6554,7 @@ case 502: ; break;} case 503: -#line 2235 "parse.y" +#line 2232 "parse.y" { if (yyvsp[-1].ftype.t != error_mark_node) { @@ -6583,53 +6581,53 @@ case 503: ; break;} case 504: -#line 2263 "parse.y" +#line 2260 "parse.y" { yyval.ttype = xref_tag (yyval.ttype, make_anon_name (), 0); yyungetc ('{', 1); ; break;} case 505: -#line 2273 "parse.y" +#line 2270 "parse.y" { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ; break;} case 507: -#line 2282 "parse.y" +#line 2279 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 508: -#line 2284 "parse.y" +#line 2281 "parse.y" { yyungetc(':', 1); yyval.ttype = NULL_TREE; ; break;} case 509: -#line 2286 "parse.y" +#line 2283 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 511: -#line 2292 "parse.y" +#line 2289 "parse.y" { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ; break;} case 512: -#line 2297 "parse.y" +#line 2294 "parse.y" { yyval.ttype = finish_base_specifier (access_default_node, yyvsp[0].ttype); ; break;} case 513: -#line 2299 "parse.y" +#line 2296 "parse.y" { yyval.ttype = finish_base_specifier (yyvsp[-2].ttype, yyvsp[0].ttype); ; break;} case 514: -#line 2304 "parse.y" +#line 2301 "parse.y" { if (yyval.ttype != error_mark_node) yyval.ttype = TYPE_MAIN_DECL (yyvsp[0].ttype); ; break;} case 517: -#line 2311 "parse.y" +#line 2308 "parse.y" { if (yyvsp[-1].ttype != ridpointers[(int)RID_VIRTUAL]) cp_error ("`%D' access", yyvsp[-1].ttype); yyval.ttype = access_default_virtual_node; ; break;} case 518: -#line 2315 "parse.y" +#line 2312 "parse.y" { if (yyvsp[-2].ttype != access_default_virtual_node) error ("multiple access specifiers"); @@ -6642,7 +6640,7 @@ case 518: ; break;} case 519: -#line 2326 "parse.y" +#line 2323 "parse.y" { if (yyvsp[-1].ttype != ridpointers[(int)RID_VIRTUAL]) cp_error ("`%D' access", yyvsp[-1].ttype); else if (yyval.ttype == access_public_node) @@ -6656,55 +6654,55 @@ case 519: ; break;} case 524: -#line 2347 "parse.y" +#line 2344 "parse.y" { current_access_specifier = yyvsp[-1].ttype; ; break;} case 525: -#line 2356 "parse.y" +#line 2353 "parse.y" { finish_member_declaration (yyvsp[0].ttype); ; break;} case 526: -#line 2360 "parse.y" +#line 2357 "parse.y" { finish_member_declaration (yyvsp[0].ttype); ; break;} case 528: -#line 2368 "parse.y" +#line 2365 "parse.y" { error ("missing ';' before right brace"); yyungetc ('}', 0); ; break;} case 529: -#line 2373 "parse.y" +#line 2370 "parse.y" { yyval.ttype = finish_method (yyval.ttype); ; break;} case 530: -#line 2375 "parse.y" +#line 2372 "parse.y" { yyval.ttype = finish_method (yyval.ttype); ; break;} case 531: -#line 2377 "parse.y" +#line 2374 "parse.y" { yyval.ttype = finish_method (yyval.ttype); ; break;} case 532: -#line 2379 "parse.y" +#line 2376 "parse.y" { yyval.ttype = finish_method (yyval.ttype); ; break;} case 533: -#line 2381 "parse.y" +#line 2378 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 534: -#line 2383 "parse.y" +#line 2380 "parse.y" { yyval.ttype = yyvsp[0].ttype; pedantic = yyvsp[-1].itype; ; break;} case 535: -#line 2386 "parse.y" +#line 2383 "parse.y" { if (yyvsp[0].ttype) yyval.ttype = finish_member_template_decl (yyvsp[0].ttype); @@ -6716,14 +6714,14 @@ case 535: ; break;} case 536: -#line 2396 "parse.y" +#line 2393 "parse.y" { yyval.ttype = finish_member_class_template (yyvsp[-1].ftype.t); finish_template_decl (yyvsp[-2].ttype); ; break;} case 537: -#line 2407 "parse.y" +#line 2404 "parse.y" { /* Most of the productions for component_decl only allow the creation of one new member, so we call @@ -6746,7 +6744,7 @@ case 537: ; break;} case 538: -#line 2428 "parse.y" +#line 2425 "parse.y" { if (!yyvsp[0].itype) grok_x_components (yyvsp[-1].ttype); @@ -6754,45 +6752,45 @@ case 538: ; break;} case 539: -#line 2434 "parse.y" +#line 2431 "parse.y" { yyval.ttype = grokfield (yyval.ttype, NULL_TREE, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, NULL_TREE)); ; break;} case 540: -#line 2437 "parse.y" +#line 2434 "parse.y" { yyval.ttype = grokfield (yyval.ttype, NULL_TREE, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, NULL_TREE)); ; break;} case 541: -#line 2440 "parse.y" +#line 2437 "parse.y" { yyval.ttype = grokbitfield (NULL_TREE, NULL_TREE, yyvsp[0].ttype); ; break;} case 542: -#line 2442 "parse.y" +#line 2439 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 543: -#line 2453 "parse.y" +#line 2450 "parse.y" { tree specs, attrs; split_specs_attrs (yyvsp[-4].ttype, &specs, &attrs); yyval.ttype = grokfield (yyvsp[-3].ttype, specs, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, attrs)); ; break;} case 544: -#line 2458 "parse.y" +#line 2455 "parse.y" { yyval.ttype = grokfield (yyval.ttype, NULL_TREE, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, NULL_TREE)); ; break;} case 545: -#line 2461 "parse.y" +#line 2458 "parse.y" { yyval.ttype = do_class_using_decl (yyvsp[0].ttype); ; break;} case 546: -#line 2467 "parse.y" +#line 2464 "parse.y" { yyval.itype = 0; ; break;} case 547: -#line 2469 "parse.y" +#line 2466 "parse.y" { if (PROCESSING_REAL_TEMPLATE_DECL_P ()) yyvsp[0].ttype = finish_member_template_decl (yyvsp[0].ttype); @@ -6801,7 +6799,7 @@ case 547: ; break;} case 548: -#line 2476 "parse.y" +#line 2473 "parse.y" { check_multiple_declarators (); if (PROCESSING_REAL_TEMPLATE_DECL_P ()) @@ -6811,11 +6809,11 @@ case 548: ; break;} case 549: -#line 2487 "parse.y" +#line 2484 "parse.y" { yyval.itype = 0; ; break;} case 550: -#line 2489 "parse.y" +#line 2486 "parse.y" { if (PROCESSING_REAL_TEMPLATE_DECL_P ()) yyvsp[0].ttype = finish_member_template_decl (yyvsp[0].ttype); @@ -6824,7 +6822,7 @@ case 550: ; break;} case 551: -#line 2496 "parse.y" +#line 2493 "parse.y" { check_multiple_declarators (); if (PROCESSING_REAL_TEMPLATE_DECL_P ()) @@ -6834,7 +6832,7 @@ case 551: ; break;} case 556: -#line 2517 "parse.y" +#line 2514 "parse.y" { split_specs_attrs (yyvsp[-4].ttype, ¤t_declspecs, &prefix_attributes); yyvsp[-4].ttype = current_declspecs; @@ -6842,7 +6840,7 @@ case 556: build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; break;} case 557: -#line 2523 "parse.y" +#line 2520 "parse.y" { split_specs_attrs (yyvsp[-4].ttype, ¤t_declspecs, &prefix_attributes); yyvsp[-4].ttype = current_declspecs; @@ -6850,7 +6848,7 @@ case 557: cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; break;} case 558: -#line 2532 "parse.y" +#line 2529 "parse.y" { split_specs_attrs (yyvsp[-4].ttype, ¤t_declspecs, &prefix_attributes); yyvsp[-4].ttype = current_declspecs; @@ -6858,7 +6856,7 @@ case 558: build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; break;} case 559: -#line 2538 "parse.y" +#line 2535 "parse.y" { split_specs_attrs (yyvsp[-4].ttype, ¤t_declspecs, &prefix_attributes); yyvsp[-4].ttype = current_declspecs; @@ -6866,7 +6864,7 @@ case 559: build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; break;} case 560: -#line 2544 "parse.y" +#line 2541 "parse.y" { split_specs_attrs (yyvsp[-4].ttype, ¤t_declspecs, &prefix_attributes); yyvsp[-4].ttype = current_declspecs; @@ -6874,7 +6872,7 @@ case 560: cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; break;} case 561: -#line 2550 "parse.y" +#line 2547 "parse.y" { split_specs_attrs (yyvsp[-3].ttype, ¤t_declspecs, &prefix_attributes); yyvsp[-3].ttype = current_declspecs; @@ -6882,58 +6880,50 @@ case 561: cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; break;} case 562: -#line 2559 "parse.y" +#line 2556 "parse.y" { yyval.ttype = grokfield (yyval.ttype, current_declspecs, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; break;} case 563: -#line 2562 "parse.y" +#line 2559 "parse.y" { yyval.ttype = grokbitfield (yyval.ttype, current_declspecs, yyvsp[-1].ttype); cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; break;} case 564: -#line 2568 "parse.y" +#line 2565 "parse.y" { yyval.ttype = grokfield (yyval.ttype, current_declspecs, yyvsp[0].ttype, yyvsp[-2].ttype, build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ; break;} case 565: -#line 2571 "parse.y" +#line 2568 "parse.y" { yyval.ttype = grokbitfield (yyval.ttype, current_declspecs, yyvsp[-1].ttype); cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; break;} case 566: -#line 2574 "parse.y" +#line 2571 "parse.y" { yyval.ttype = grokbitfield (NULL_TREE, current_declspecs, yyvsp[-1].ttype); cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ; break;} -case 568: -#line 2581 "parse.y" -{ yyval.ttype = NULL_TREE; ; - break;} -case 570: -#line 2591 "parse.y" -{ TREE_CHAIN (yyvsp[0].ttype) = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ; - break;} case 571: -#line 2596 "parse.y" -{ yyval.ttype = build_enumerator (yyval.ttype, NULL_TREE, current_enum_type); ; +#line 2591 "parse.y" +{ build_enumerator (yyvsp[0].ttype, NULL_TREE, current_enum_type); ; break;} case 572: -#line 2598 "parse.y" -{ yyval.ttype = build_enumerator (yyval.ttype, yyvsp[0].ttype, current_enum_type); ; +#line 2593 "parse.y" +{ build_enumerator (yyvsp[-2].ttype, yyvsp[0].ttype, current_enum_type); ; break;} case 573: -#line 2604 "parse.y" +#line 2599 "parse.y" { yyval.ftype.t = build_decl_list (yyvsp[-1].ftype.t, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 574: -#line 2607 "parse.y" +#line 2602 "parse.y" { yyval.ftype.t = build_decl_list (yyvsp[0].ftype.t, NULL_TREE); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 575: -#line 2612 "parse.y" +#line 2607 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids array dimensions with parenthesized type in new"); @@ -6943,41 +6933,41 @@ case 575: ; break;} case 576: -#line 2623 "parse.y" +#line 2618 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 577: -#line 2625 "parse.y" +#line 2620 "parse.y" { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ; break;} case 578: -#line 2630 "parse.y" +#line 2625 "parse.y" { yyval.ftype.t = hash_tree_cons (NULL_TREE, yyvsp[0].ttype, NULL_TREE); yyval.ftype.new_type_flag = 0; ; break;} case 579: -#line 2633 "parse.y" +#line 2628 "parse.y" { yyval.ftype.t = hash_tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 580: -#line 2643 "parse.y" +#line 2638 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 581: -#line 2645 "parse.y" +#line 2640 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 582: -#line 2647 "parse.y" +#line 2642 "parse.y" { yyval.ttype = empty_parms (); ; break;} case 583: -#line 2649 "parse.y" +#line 2644 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 585: -#line 2657 "parse.y" +#line 2652 "parse.y" { /* Provide support for '(' attributes '*' declarator ')' etc */ @@ -6985,51 +6975,51 @@ case 585: ; break;} case 586: -#line 2667 "parse.y" +#line 2662 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 587: -#line 2669 "parse.y" +#line 2664 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 588: -#line 2671 "parse.y" +#line 2666 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 589: -#line 2673 "parse.y" +#line 2668 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 590: -#line 2675 "parse.y" +#line 2670 "parse.y" { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg); ; break;} case 592: -#line 2683 "parse.y" +#line 2678 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 593: -#line 2685 "parse.y" +#line 2680 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ; break;} case 594: -#line 2687 "parse.y" +#line 2682 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ; break;} case 595: -#line 2689 "parse.y" +#line 2684 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 596: -#line 2691 "parse.y" +#line 2686 "parse.y" { push_nested_class (yyvsp[-1].ttype, 3); yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); TREE_COMPLEXITY (yyval.ttype) = current_class_depth; ; break;} case 598: -#line 2699 "parse.y" +#line 2694 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) { @@ -7041,7 +7031,7 @@ case 598: ; break;} case 599: -#line 2709 "parse.y" +#line 2704 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) yyval.ttype = IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype); @@ -7051,15 +7041,15 @@ case 599: ; break;} case 602: -#line 2722 "parse.y" +#line 2717 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 603: -#line 2727 "parse.y" +#line 2722 "parse.y" { yyval.ttype = get_type_decl (yyvsp[0].ttype); ; break;} case 605: -#line 2736 "parse.y" +#line 2731 "parse.y" { /* Provide support for '(' attributes '*' declarator ')' etc */ @@ -7067,123 +7057,123 @@ case 605: ; break;} case 606: -#line 2745 "parse.y" +#line 2740 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 607: -#line 2747 "parse.y" +#line 2742 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 608: -#line 2749 "parse.y" +#line 2744 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 609: -#line 2751 "parse.y" +#line 2746 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 610: -#line 2753 "parse.y" +#line 2748 "parse.y" { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg); ; break;} case 612: -#line 2761 "parse.y" +#line 2756 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 613: -#line 2763 "parse.y" +#line 2758 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 614: -#line 2765 "parse.y" +#line 2760 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 615: -#line 2767 "parse.y" +#line 2762 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 616: -#line 2769 "parse.y" +#line 2764 "parse.y" { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg); ; break;} case 618: -#line 2777 "parse.y" +#line 2772 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 619: -#line 2779 "parse.y" +#line 2774 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 620: -#line 2781 "parse.y" +#line 2776 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ; break;} case 621: -#line 2783 "parse.y" +#line 2778 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ; break;} case 622: -#line 2785 "parse.y" +#line 2780 "parse.y" { enter_scope_of (yyvsp[0].ttype); ; break;} case 623: -#line 2787 "parse.y" +#line 2782 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); enter_scope_of (yyval.ttype); ; break;} case 624: -#line 2795 "parse.y" +#line 2790 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); ; break;} case 625: -#line 2798 "parse.y" +#line 2793 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 626: -#line 2804 "parse.y" +#line 2799 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); ; break;} case 627: -#line 2807 "parse.y" +#line 2802 "parse.y" { got_scope = NULL_TREE; yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 629: -#line 2814 "parse.y" +#line 2809 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 630: -#line 2819 "parse.y" +#line 2814 "parse.y" { yyval.ttype = build_functional_cast (yyvsp[-3].ftype.t, yyvsp[-1].ttype); ; break;} case 631: -#line 2821 "parse.y" +#line 2816 "parse.y" { yyval.ttype = reparse_decl_as_expr (yyvsp[-3].ftype.t, yyvsp[-1].ttype); ; break;} case 632: -#line 2823 "parse.y" +#line 2818 "parse.y" { yyval.ttype = reparse_absdcl_as_expr (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 637: -#line 2834 "parse.y" +#line 2829 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 638: -#line 2836 "parse.y" +#line 2831 "parse.y" { got_scope = yyval.ttype = make_typename_type (yyvsp[-3].ttype, yyvsp[-1].ttype, /*complain=*/1); ; break;} case 639: -#line 2844 "parse.y" +#line 2839 "parse.y" { if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE) { @@ -7195,7 +7185,7 @@ case 639: ; break;} case 640: -#line 2854 "parse.y" +#line 2849 "parse.y" { if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -7203,7 +7193,7 @@ case 640: ; break;} case 641: -#line 2860 "parse.y" +#line 2855 "parse.y" { if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -7211,15 +7201,15 @@ case 641: ; break;} case 642: -#line 2866 "parse.y" +#line 2861 "parse.y" { got_scope = yyval.ttype = complete_type (TREE_TYPE (yyvsp[-1].ttype)); ; break;} case 644: -#line 2882 "parse.y" +#line 2877 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 645: -#line 2887 "parse.y" +#line 2882 "parse.y" { if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-1].ttype)) == 't') yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype, /*complain=*/1); @@ -7234,26 +7224,26 @@ case 645: ; break;} case 646: -#line 2900 "parse.y" +#line 2895 "parse.y" { yyval.ttype = TREE_TYPE (yyvsp[0].ttype); ; break;} case 647: -#line 2902 "parse.y" +#line 2897 "parse.y" { yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype, /*complain=*/1); ; break;} case 648: -#line 2904 "parse.y" +#line 2899 "parse.y" { yyval.ttype = make_typename_type (yyvsp[-2].ttype, yyvsp[0].ttype, /*complain=*/1); ; break;} case 649: -#line 2909 "parse.y" +#line 2904 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) cp_error ("`%T' is not a class or namespace", yyvsp[0].ttype); ; break;} case 650: -#line 2914 "parse.y" +#line 2909 "parse.y" { if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-1].ttype)) == 't') yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype, /*complain=*/1); @@ -7268,17 +7258,17 @@ case 650: ; break;} case 651: -#line 2927 "parse.y" +#line 2922 "parse.y" { got_scope = yyval.ttype = make_typename_type (yyvsp[-2].ttype, yyvsp[-1].ttype, /*complain=*/1); ; break;} case 652: -#line 2930 "parse.y" +#line 2925 "parse.y" { got_scope = yyval.ttype = make_typename_type (yyvsp[-3].ttype, yyvsp[-1].ttype, /*complain=*/1); ; break;} case 653: -#line 2936 "parse.y" +#line 2931 "parse.y" { if (TREE_CODE (yyvsp[-1].ttype) != IDENTIFIER_NODE) yyvsp[-1].ttype = lastiddecl; @@ -7292,7 +7282,7 @@ case 653: ; break;} case 654: -#line 2948 "parse.y" +#line 2943 "parse.y" { if (TREE_CODE (yyvsp[-1].ttype) != IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -7300,11 +7290,11 @@ case 654: ; break;} case 655: -#line 2954 "parse.y" +#line 2949 "parse.y" { got_scope = yyval.ttype = complete_type (TREE_TYPE (yyval.ttype)); ; break;} case 658: -#line 2958 "parse.y" +#line 2953 "parse.y" { if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE) yyval.ttype = lastiddecl; @@ -7312,11 +7302,11 @@ case 658: ; break;} case 659: -#line 2967 "parse.y" +#line 2962 "parse.y" { yyval.ttype = build_min_nt (TEMPLATE_ID_EXPR, yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 660: -#line 2972 "parse.y" +#line 2967 "parse.y" { if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE) yyval.ttype = IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype); @@ -7326,59 +7316,59 @@ case 660: ; break;} case 662: -#line 2981 "parse.y" +#line 2976 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 663: -#line 2986 "parse.y" +#line 2981 "parse.y" { got_scope = NULL_TREE; ; break;} case 664: -#line 2988 "parse.y" +#line 2983 "parse.y" { yyval.ttype = yyvsp[-1].ttype; got_scope = NULL_TREE; ; break;} case 665: -#line 2995 "parse.y" +#line 2990 "parse.y" { got_scope = void_type_node; ; break;} case 666: -#line 3001 "parse.y" +#line 2996 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 667: -#line 3003 "parse.y" +#line 2998 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE); ; break;} case 668: -#line 3005 "parse.y" +#line 3000 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 669: -#line 3007 "parse.y" +#line 3002 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[0].ttype, NULL_TREE); ; break;} case 670: -#line 3009 "parse.y" +#line 3004 "parse.y" { tree arg = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, arg); ; break;} case 671: -#line 3013 "parse.y" +#line 3008 "parse.y" { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg); ; break;} case 673: -#line 3022 "parse.y" +#line 3017 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ; break;} case 674: -#line 3024 "parse.y" +#line 3019 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ; break;} case 676: -#line 3030 "parse.y" +#line 3025 "parse.y" { /* Provide support for '(' attributes '*' declarator ')' etc */ @@ -7386,96 +7376,96 @@ case 676: ; break;} case 677: -#line 3040 "parse.y" +#line 3035 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 678: -#line 3042 "parse.y" +#line 3037 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 679: -#line 3044 "parse.y" +#line 3039 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[0].ftype.t, NULL_TREE); ; break;} case 680: -#line 3046 "parse.y" +#line 3041 "parse.y" { yyval.ttype = make_pointer_declarator (NULL_TREE, NULL_TREE); ; break;} case 681: -#line 3048 "parse.y" +#line 3043 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 682: -#line 3050 "parse.y" +#line 3045 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ; break;} case 683: -#line 3052 "parse.y" +#line 3047 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[0].ftype.t, NULL_TREE); ; break;} case 684: -#line 3054 "parse.y" +#line 3049 "parse.y" { yyval.ttype = make_reference_declarator (NULL_TREE, NULL_TREE); ; break;} case 685: -#line 3056 "parse.y" +#line 3051 "parse.y" { tree arg = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, arg); ; break;} case 686: -#line 3060 "parse.y" +#line 3055 "parse.y" { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg); ; break;} case 688: -#line 3069 "parse.y" +#line 3064 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 689: -#line 3072 "parse.y" +#line 3067 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 690: -#line 3074 "parse.y" +#line 3069 "parse.y" { yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 691: -#line 3076 "parse.y" +#line 3071 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ; break;} case 692: -#line 3078 "parse.y" +#line 3073 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ; break;} case 693: -#line 3080 "parse.y" +#line 3075 "parse.y" { yyval.ttype = make_call_declarator (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 694: -#line 3082 "parse.y" +#line 3077 "parse.y" { set_quals_and_spec (yyval.ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 695: -#line 3084 "parse.y" +#line 3079 "parse.y" { set_quals_and_spec (yyval.ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 696: -#line 3086 "parse.y" +#line 3081 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ; break;} case 697: -#line 3088 "parse.y" +#line 3083 "parse.y" { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, NULL_TREE); ; break;} case 704: -#line 3111 "parse.y" +#line 3106 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids label declarations"); ; break;} case 707: -#line 3122 "parse.y" +#line 3117 "parse.y" { while (yyvsp[-1].ttype) { @@ -7485,181 +7475,181 @@ case 707: ; break;} case 708: -#line 3135 "parse.y" +#line 3130 "parse.y" {; break;} case 710: -#line 3141 "parse.y" +#line 3136 "parse.y" { yyval.ttype = begin_compound_stmt (0); ; break;} case 711: -#line 3143 "parse.y" +#line 3138 "parse.y" { yyval.ttype = finish_compound_stmt (0, yyvsp[-1].ttype); ; break;} case 712: -#line 3148 "parse.y" +#line 3143 "parse.y" { yyval.ttype = begin_if_stmt (); cond_stmt_keyword = "if"; ; break;} case 713: -#line 3153 "parse.y" +#line 3148 "parse.y" { finish_if_stmt_cond (yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 714: -#line 3155 "parse.y" +#line 3150 "parse.y" { yyval.ttype = finish_then_clause (yyvsp[-3].ttype); ; break;} case 716: -#line 3160 "parse.y" +#line 3155 "parse.y" { yyval.ttype = begin_compound_stmt (0); ; break;} case 717: -#line 3162 "parse.y" +#line 3157 "parse.y" { yyval.ttype = finish_compound_stmt (0, yyvsp[-1].ttype); ; break;} case 718: -#line 3167 "parse.y" +#line 3162 "parse.y" {; break;} case 720: -#line 3173 "parse.y" +#line 3168 "parse.y" { finish_stmt (); ; break;} case 721: -#line 3175 "parse.y" +#line 3170 "parse.y" { finish_expr_stmt (yyvsp[-1].ttype); ; break;} case 722: -#line 3177 "parse.y" +#line 3172 "parse.y" { begin_else_clause (); ; break;} case 723: -#line 3179 "parse.y" +#line 3174 "parse.y" { finish_else_clause (yyvsp[-3].ttype); finish_if_stmt (); ; break;} case 724: -#line 3184 "parse.y" +#line 3179 "parse.y" { finish_if_stmt (); ; break;} case 725: -#line 3186 "parse.y" +#line 3181 "parse.y" { yyval.ttype = begin_while_stmt (); cond_stmt_keyword = "while"; ; break;} case 726: -#line 3191 "parse.y" +#line 3186 "parse.y" { finish_while_stmt_cond (yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 727: -#line 3193 "parse.y" +#line 3188 "parse.y" { finish_while_stmt (yyvsp[-3].ttype); ; break;} case 728: -#line 3195 "parse.y" +#line 3190 "parse.y" { yyval.ttype = begin_do_stmt (); ; break;} case 729: -#line 3197 "parse.y" +#line 3192 "parse.y" { finish_do_body (yyvsp[-2].ttype); cond_stmt_keyword = "do"; ; break;} case 730: -#line 3202 "parse.y" +#line 3197 "parse.y" { finish_do_stmt (yyvsp[-1].ttype, yyvsp[-5].ttype); ; break;} case 731: -#line 3204 "parse.y" +#line 3199 "parse.y" { yyval.ttype = begin_for_stmt (); ; break;} case 732: -#line 3206 "parse.y" +#line 3201 "parse.y" { finish_for_init_stmt (yyvsp[-2].ttype); ; break;} case 733: -#line 3208 "parse.y" +#line 3203 "parse.y" { finish_for_cond (yyvsp[-1].ttype, yyvsp[-5].ttype); ; break;} case 734: -#line 3210 "parse.y" +#line 3205 "parse.y" { finish_for_expr (yyvsp[-1].ttype, yyvsp[-8].ttype); ; break;} case 735: -#line 3212 "parse.y" +#line 3207 "parse.y" { finish_for_stmt (yyvsp[-3].ttype, yyvsp[-10].ttype); ; break;} case 736: -#line 3214 "parse.y" +#line 3209 "parse.y" { yyval.ttype = begin_switch_stmt (); ; break;} case 737: -#line 3216 "parse.y" +#line 3211 "parse.y" { finish_switch_cond (yyvsp[-1].ttype, yyvsp[-3].ttype); ; break;} case 738: -#line 3218 "parse.y" +#line 3213 "parse.y" { finish_switch_stmt (yyvsp[-3].ttype, yyvsp[-5].ttype); ; break;} case 739: -#line 3220 "parse.y" +#line 3215 "parse.y" { finish_case_label (yyvsp[-1].ttype, NULL_TREE); ; break;} case 741: -#line 3223 "parse.y" +#line 3218 "parse.y" { finish_case_label (yyvsp[-3].ttype, yyvsp[-1].ttype); ; break;} case 743: -#line 3226 "parse.y" +#line 3221 "parse.y" { finish_case_label (NULL_TREE, NULL_TREE); ; break;} case 745: -#line 3229 "parse.y" +#line 3224 "parse.y" { finish_break_stmt (); ; break;} case 746: -#line 3231 "parse.y" +#line 3226 "parse.y" { finish_continue_stmt (); ; break;} case 747: -#line 3233 "parse.y" +#line 3228 "parse.y" { finish_return_stmt (NULL_TREE); ; break;} case 748: -#line 3235 "parse.y" +#line 3230 "parse.y" { finish_return_stmt (yyvsp[-1].ttype); ; break;} case 749: -#line 3237 "parse.y" +#line 3232 "parse.y" { finish_asm_stmt (yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE, NULL_TREE, NULL_TREE); ; break;} case 750: -#line 3243 "parse.y" +#line 3238 "parse.y" { finish_asm_stmt (yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE, NULL_TREE); ; break;} case 751: -#line 3249 "parse.y" +#line 3244 "parse.y" { finish_asm_stmt (yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE); ; break;} case 752: -#line 3253 "parse.y" +#line 3248 "parse.y" { finish_asm_stmt (yyvsp[-10].ttype, yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype); ; break;} case 753: -#line 3255 "parse.y" +#line 3250 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids computed gotos"); @@ -7667,67 +7657,67 @@ case 753: ; break;} case 754: -#line 3261 "parse.y" +#line 3256 "parse.y" { finish_goto_stmt (yyvsp[-1].ttype); ; break;} case 756: -#line 3264 "parse.y" +#line 3259 "parse.y" { error ("label must be followed by statement"); yyungetc ('}', 0); ; break;} case 757: -#line 3267 "parse.y" +#line 3262 "parse.y" { finish_stmt (); ; break;} case 760: -#line 3271 "parse.y" +#line 3266 "parse.y" { do_local_using_decl (yyvsp[0].ttype); ; break;} case 762: -#line 3277 "parse.y" +#line 3272 "parse.y" { yyval.ttype = begin_function_try_block (); ; break;} case 763: -#line 3279 "parse.y" +#line 3274 "parse.y" { finish_function_try_block (yyvsp[-2].ttype); ; break;} case 764: -#line 3281 "parse.y" +#line 3276 "parse.y" { finish_function_handler_sequence (yyvsp[-4].ttype); yyval.itype = yyvsp[-3].itype; ; break;} case 765: -#line 3289 "parse.y" +#line 3284 "parse.y" { yyval.ttype = begin_try_block (); ; break;} case 766: -#line 3291 "parse.y" +#line 3286 "parse.y" { finish_try_block (yyvsp[-1].ttype); ; break;} case 767: -#line 3293 "parse.y" +#line 3288 "parse.y" { finish_handler_sequence (yyvsp[-3].ttype); ; break;} case 770: -#line 3303 "parse.y" +#line 3298 "parse.y" { yyval.ttype = begin_handler(); ; break;} case 771: -#line 3305 "parse.y" +#line 3300 "parse.y" { yyval.ttype = finish_handler_parms (yyvsp[0].ttype, yyvsp[-1].ttype); ; break;} case 772: -#line 3307 "parse.y" +#line 3302 "parse.y" { finish_handler (yyvsp[-1].ttype, yyvsp[-3].ttype); ; break;} case 775: -#line 3317 "parse.y" +#line 3312 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 776: -#line 3333 "parse.y" +#line 3328 "parse.y" { check_for_new_type ("inside exception declarations", yyvsp[-1].ftype); yyval.ttype = start_handler_parms (TREE_PURPOSE (yyvsp[-1].ftype.t), @@ -7735,102 +7725,102 @@ case 776: ; break;} case 777: -#line 3342 "parse.y" +#line 3337 "parse.y" { finish_label_stmt (yyvsp[-1].ttype); ; break;} case 778: -#line 3344 "parse.y" +#line 3339 "parse.y" { finish_label_stmt (yyvsp[-1].ttype); ; break;} case 779: -#line 3346 "parse.y" +#line 3341 "parse.y" { finish_label_stmt (yyvsp[-1].ttype); ; break;} case 780: -#line 3348 "parse.y" +#line 3343 "parse.y" { finish_label_stmt (yyvsp[-1].ttype); ; break;} case 781: -#line 3353 "parse.y" +#line 3348 "parse.y" { finish_expr_stmt (yyvsp[-1].ttype); ; break;} case 783: -#line 3356 "parse.y" +#line 3351 "parse.y" { if (pedantic) pedwarn ("ANSI C++ forbids compound statements inside for initializations"); ; break;} case 784: -#line 3365 "parse.y" +#line 3360 "parse.y" { emit_line_note (input_filename, lineno); yyval.ttype = NULL_TREE; ; break;} case 785: -#line 3368 "parse.y" +#line 3363 "parse.y" { emit_line_note (input_filename, lineno); ; break;} case 786: -#line 3373 "parse.y" +#line 3368 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 788: -#line 3376 "parse.y" +#line 3371 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 789: -#line 3383 "parse.y" +#line 3378 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 792: -#line 3390 "parse.y" +#line 3385 "parse.y" { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ; break;} case 793: -#line 3395 "parse.y" +#line 3390 "parse.y" { yyval.ttype = build_tree_list (yyval.ttype, yyvsp[-1].ttype); ; break;} case 794: -#line 3400 "parse.y" +#line 3395 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, NULL_TREE); ; break;} case 795: -#line 3402 "parse.y" +#line 3397 "parse.y" { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ; break;} case 796: -#line 3413 "parse.y" +#line 3408 "parse.y" { yyval.ttype = empty_parms(); ; break;} case 798: -#line 3418 "parse.y" +#line 3413 "parse.y" { yyval.ttype = finish_parmlist (build_tree_list (NULL_TREE, yyvsp[0].ftype.t), 0); check_for_new_type ("inside parameter list", yyvsp[0].ftype); ; break;} case 799: -#line 3426 "parse.y" +#line 3421 "parse.y" { yyval.ttype = finish_parmlist (yyval.ttype, 0); ; break;} case 800: -#line 3428 "parse.y" +#line 3423 "parse.y" { yyval.ttype = finish_parmlist (yyvsp[-1].ttype, 1); ; break;} case 801: -#line 3431 "parse.y" +#line 3426 "parse.y" { yyval.ttype = finish_parmlist (yyvsp[-1].ttype, 1); ; break;} case 802: -#line 3433 "parse.y" +#line 3428 "parse.y" { yyval.ttype = finish_parmlist (build_tree_list (NULL_TREE, yyvsp[-1].ftype.t), 1); ; break;} case 803: -#line 3436 "parse.y" +#line 3431 "parse.y" { yyval.ttype = finish_parmlist (NULL_TREE, 1); ; break;} case 804: -#line 3438 "parse.y" +#line 3433 "parse.y" { /* This helps us recover from really nasty parse errors, for example, a missing right @@ -7842,7 +7832,7 @@ case 804: ; break;} case 805: -#line 3448 "parse.y" +#line 3443 "parse.y" { /* This helps us recover from really nasty parse errors, for example, a missing right @@ -7855,99 +7845,99 @@ case 805: ; break;} case 806: -#line 3463 "parse.y" +#line 3458 "parse.y" { maybe_snarf_defarg (); ; break;} case 807: -#line 3465 "parse.y" +#line 3460 "parse.y" { yyval.ttype = yyvsp[0].ttype; ; break;} case 810: -#line 3476 "parse.y" +#line 3471 "parse.y" { check_for_new_type ("in a parameter list", yyvsp[0].ftype); yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ftype.t); ; break;} case 811: -#line 3479 "parse.y" +#line 3474 "parse.y" { check_for_new_type ("in a parameter list", yyvsp[-1].ftype); yyval.ttype = build_tree_list (yyvsp[0].ttype, yyvsp[-1].ftype.t); ; break;} case 812: -#line 3482 "parse.y" +#line 3477 "parse.y" { check_for_new_type ("in a parameter list", yyvsp[0].ftype); yyval.ttype = chainon (yyval.ttype, yyvsp[0].ftype.t); ; break;} case 813: -#line 3485 "parse.y" +#line 3480 "parse.y" { yyval.ttype = chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ; break;} case 814: -#line 3487 "parse.y" +#line 3482 "parse.y" { yyval.ttype = chainon (yyval.ttype, build_tree_list (yyvsp[0].ttype, yyvsp[-2].ttype)); ; break;} case 816: -#line 3493 "parse.y" +#line 3488 "parse.y" { check_for_new_type ("in a parameter list", yyvsp[-1].ftype); yyval.ttype = build_tree_list (NULL_TREE, yyvsp[-1].ftype.t); ; break;} case 817: -#line 3503 "parse.y" +#line 3498 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; yyval.ftype.t = build_tree_list (specs, yyvsp[0].ttype); ; break;} case 818: -#line 3507 "parse.y" +#line 3502 "parse.y" { yyval.ftype.t = build_tree_list (yyvsp[-1].ftype.t, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 819: -#line 3510 "parse.y" +#line 3505 "parse.y" { yyval.ftype.t = build_tree_list (build_decl_list (NULL_TREE, yyvsp[-1].ftype.t), yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 820: -#line 3514 "parse.y" +#line 3509 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ftype.t); yyval.ftype.t = build_tree_list (specs, yyvsp[0].ttype); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 821: -#line 3518 "parse.y" +#line 3513 "parse.y" { tree specs = strip_attrs (yyvsp[0].ftype.t); yyval.ftype.t = build_tree_list (specs, NULL_TREE); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 822: -#line 3522 "parse.y" +#line 3517 "parse.y" { tree specs = strip_attrs (yyvsp[-1].ttype); yyval.ftype.t = build_tree_list (specs, yyvsp[0].ttype); yyval.ftype.new_type_flag = 0; ; break;} case 823: -#line 3529 "parse.y" +#line 3524 "parse.y" { yyval.ftype.t = build_tree_list (NULL_TREE, yyvsp[0].ftype.t); yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ; break;} case 824: -#line 3532 "parse.y" +#line 3527 "parse.y" { yyval.ftype.t = build_tree_list (yyvsp[0].ttype, yyvsp[-1].ftype.t); yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ; break;} case 827: -#line 3543 "parse.y" +#line 3538 "parse.y" { see_typename (); ; break;} case 828: -#line 3548 "parse.y" +#line 3543 "parse.y" { error ("type specifier omitted for parameter"); yyval.ttype = build_tree_list (integer_type_node, NULL_TREE); ; break;} case 829: -#line 3553 "parse.y" +#line 3548 "parse.y" { error ("type specifier omitted for parameter"); if (TREE_CODE (yyval.ttype) == SCOPE_REF @@ -7958,192 +7948,192 @@ case 829: ; break;} case 830: -#line 3565 "parse.y" +#line 3560 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 831: -#line 3567 "parse.y" +#line 3562 "parse.y" { yyval.ttype = yyvsp[-1].ttype; ; break;} case 832: -#line 3569 "parse.y" +#line 3564 "parse.y" { yyval.ttype = empty_except_spec; ; break;} case 833: -#line 3574 "parse.y" +#line 3569 "parse.y" { check_for_new_type ("exception specifier", yyvsp[0].ftype); yyval.ttype = groktypename (yyvsp[0].ftype.t); ; break;} case 834: -#line 3582 "parse.y" +#line 3577 "parse.y" { yyval.ttype = add_exception_specifier (NULL_TREE, yyvsp[0].ttype, 1); ; break;} case 835: -#line 3584 "parse.y" +#line 3579 "parse.y" { yyval.ttype = add_exception_specifier (yyvsp[-2].ttype, yyvsp[0].ttype, 1); ; break;} case 836: -#line 3589 "parse.y" +#line 3584 "parse.y" { yyval.ttype = NULL_TREE; ; break;} case 837: -#line 3591 "parse.y" +#line 3586 "parse.y" { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 838: -#line 3593 "parse.y" +#line 3588 "parse.y" { yyval.ttype = make_reference_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ; break;} case 839: -#line 3595 "parse.y" +#line 3590 "parse.y" { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg); ; break;} case 840: -#line 3602 "parse.y" +#line 3597 "parse.y" { got_scope = NULL_TREE; ; break;} case 841: -#line 3607 "parse.y" +#line 3602 "parse.y" { yyval.ttype = ansi_opname[MULT_EXPR]; ; break;} case 842: -#line 3609 "parse.y" +#line 3604 "parse.y" { yyval.ttype = ansi_opname[TRUNC_DIV_EXPR]; ; break;} case 843: -#line 3611 "parse.y" +#line 3606 "parse.y" { yyval.ttype = ansi_opname[TRUNC_MOD_EXPR]; ; break;} case 844: -#line 3613 "parse.y" +#line 3608 "parse.y" { yyval.ttype = ansi_opname[PLUS_EXPR]; ; break;} case 845: -#line 3615 "parse.y" +#line 3610 "parse.y" { yyval.ttype = ansi_opname[MINUS_EXPR]; ; break;} case 846: -#line 3617 "parse.y" +#line 3612 "parse.y" { yyval.ttype = ansi_opname[BIT_AND_EXPR]; ; break;} case 847: -#line 3619 "parse.y" +#line 3614 "parse.y" { yyval.ttype = ansi_opname[BIT_IOR_EXPR]; ; break;} case 848: -#line 3621 "parse.y" +#line 3616 "parse.y" { yyval.ttype = ansi_opname[BIT_XOR_EXPR]; ; break;} case 849: -#line 3623 "parse.y" +#line 3618 "parse.y" { yyval.ttype = ansi_opname[BIT_NOT_EXPR]; ; break;} case 850: -#line 3625 "parse.y" +#line 3620 "parse.y" { yyval.ttype = ansi_opname[COMPOUND_EXPR]; ; break;} case 851: -#line 3627 "parse.y" +#line 3622 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 852: -#line 3629 "parse.y" +#line 3624 "parse.y" { yyval.ttype = ansi_opname[LT_EXPR]; ; break;} case 853: -#line 3631 "parse.y" +#line 3626 "parse.y" { yyval.ttype = ansi_opname[GT_EXPR]; ; break;} case 854: -#line 3633 "parse.y" +#line 3628 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 855: -#line 3635 "parse.y" +#line 3630 "parse.y" { yyval.ttype = ansi_assopname[yyvsp[0].code]; ; break;} case 856: -#line 3637 "parse.y" +#line 3632 "parse.y" { yyval.ttype = ansi_opname [MODIFY_EXPR]; ; break;} case 857: -#line 3639 "parse.y" +#line 3634 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 858: -#line 3641 "parse.y" +#line 3636 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 859: -#line 3643 "parse.y" +#line 3638 "parse.y" { yyval.ttype = ansi_opname[POSTINCREMENT_EXPR]; ; break;} case 860: -#line 3645 "parse.y" +#line 3640 "parse.y" { yyval.ttype = ansi_opname[PREDECREMENT_EXPR]; ; break;} case 861: -#line 3647 "parse.y" +#line 3642 "parse.y" { yyval.ttype = ansi_opname[TRUTH_ANDIF_EXPR]; ; break;} case 862: -#line 3649 "parse.y" +#line 3644 "parse.y" { yyval.ttype = ansi_opname[TRUTH_ORIF_EXPR]; ; break;} case 863: -#line 3651 "parse.y" +#line 3646 "parse.y" { yyval.ttype = ansi_opname[TRUTH_NOT_EXPR]; ; break;} case 864: -#line 3653 "parse.y" +#line 3648 "parse.y" { yyval.ttype = ansi_opname[COND_EXPR]; ; break;} case 865: -#line 3655 "parse.y" +#line 3650 "parse.y" { yyval.ttype = ansi_opname[yyvsp[0].code]; ; break;} case 866: -#line 3657 "parse.y" +#line 3652 "parse.y" { yyval.ttype = ansi_opname[COMPONENT_REF]; ; break;} case 867: -#line 3659 "parse.y" +#line 3654 "parse.y" { yyval.ttype = ansi_opname[MEMBER_REF]; ; break;} case 868: -#line 3661 "parse.y" +#line 3656 "parse.y" { yyval.ttype = ansi_opname[CALL_EXPR]; ; break;} case 869: -#line 3663 "parse.y" +#line 3658 "parse.y" { yyval.ttype = ansi_opname[ARRAY_REF]; ; break;} case 870: -#line 3665 "parse.y" +#line 3660 "parse.y" { yyval.ttype = ansi_opname[NEW_EXPR]; ; break;} case 871: -#line 3667 "parse.y" +#line 3662 "parse.y" { yyval.ttype = ansi_opname[DELETE_EXPR]; ; break;} case 872: -#line 3669 "parse.y" +#line 3664 "parse.y" { yyval.ttype = ansi_opname[VEC_NEW_EXPR]; ; break;} case 873: -#line 3671 "parse.y" +#line 3666 "parse.y" { yyval.ttype = ansi_opname[VEC_DELETE_EXPR]; ; break;} case 874: -#line 3674 "parse.y" +#line 3669 "parse.y" { yyval.ttype = grokoptypename (yyvsp[-1].ftype.t, yyvsp[0].ttype); ; break;} case 875: -#line 3676 "parse.y" +#line 3671 "parse.y" { yyval.ttype = ansi_opname[ERROR_MARK]; ; break;} } @@ -8368,7 +8358,7 @@ yyerrhandle: } return 1; } -#line 3679 "parse.y" +#line 3674 "parse.y" #ifdef SPEW_DEBUG diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y index 5e31354b58d..de8b450272b 100644 --- a/gcc/cp/parse.y +++ b/gcc/cp/parse.y @@ -215,7 +215,6 @@ empty_parms () %type component_declarator component_declarator0 %type notype_component_declarator notype_component_declarator0 %type after_type_component_declarator after_type_component_declarator0 -%type enumlist_opt enumlist enumerator %type absdcl cv_qualifiers %type direct_abstract_declarator conversion_declarator %type new_declarator direct_new_declarator @@ -2062,8 +2061,7 @@ structsp: { $$ = current_enum_type; current_enum_type = start_enum ($2); } enumlist_opt '}' - { TYPE_VALUES (current_enum_type) = $5; - $$.t = finish_enum (current_enum_type); + { $$.t = finish_enum (current_enum_type); $$.new_type_flag = 1; current_enum_type = $4; check_for_missing_semicolon ($$.t); } @@ -2071,8 +2069,7 @@ structsp: { $$ = current_enum_type; current_enum_type = start_enum (make_anon_name ()); } enumlist_opt '}' - { TYPE_VALUES (current_enum_type) = $4; - $$.t = finish_enum (current_enum_type); + { $$.t = finish_enum (current_enum_type); $$.new_type_flag = 1; current_enum_type = $3; check_for_missing_semicolon ($$.t); } @@ -2578,7 +2575,6 @@ notype_component_declarator: enumlist_opt: enumlist maybecomma_warn | maybecomma_warn - { $$ = NULL_TREE; } ; /* We chain the enumerators in reverse order. @@ -2588,14 +2584,13 @@ enumlist_opt: enumlist: enumerator | enumlist ',' enumerator - { TREE_CHAIN ($3) = $$; $$ = $3; } ; enumerator: identifier - { $$ = build_enumerator ($$, NULL_TREE, current_enum_type); } + { build_enumerator ($1, NULL_TREE, current_enum_type); } | identifier '=' expr_no_commas - { $$ = build_enumerator ($$, $3, current_enum_type); } + { build_enumerator ($1, $3, current_enum_type); } ; /* ANSI new-type-id (5.3.4) */ diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c94fffed629..7e72accd62f 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -9737,8 +9737,7 @@ tsubst_enum (tag, newtag, args) for (e = TYPE_VALUES (tag); e; e = TREE_CHAIN (e)) { tree value; - tree elt; - + /* Note that in a template enum, the TREE_VALUE is the CONST_DECL, not the corresponding INTEGER_CST. */ value = tsubst_expr (DECL_INITIAL (TREE_VALUE (e)), @@ -9749,14 +9748,7 @@ tsubst_enum (tag, newtag, args) set_current_access_from_decl (TREE_VALUE (e)); /* Actually build the enumerator itself. */ - elt = build_enumerator (TREE_PURPOSE (e), value, newtag); - - /* We save the enumerators we have built so far in the - TYPE_VALUES so that if the enumeration constants for - subsequent enumerators involve those for previous ones, - tsubst_copy will be able to find them. */ - TREE_CHAIN (elt) = TYPE_VALUES (newtag); - TYPE_VALUES (newtag) = elt; + build_enumerator (TREE_PURPOSE (e), value, newtag); } finish_enum (newtag); -- 2.30.2