diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-11-30 16:27:50 -0600 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-11-30 16:27:50 -0600 |
| commit | 3ed4ba195d80e96a502d5b157610549696d29f23 (patch) | |
| tree | 32f74df45e31c64674f7bebfb716ab524ec10a13 | |
| parent | 3c91f4dcc4281659f23b7597e5abff6b97b58f03 (diff) | |
| download | ATCD-3ed4ba195d80e96a502d5b157610549696d29f23.tar.gz | |
tao_idl: Update Grammer File
- Fixed Seg Fault when compiling TAO caused by not setting action result
in string template actions in Grammer File.
- Support for referencing Enums and Constants from the annotation in the
annotation parameters.
- Unknown annotations, by default, will now just be a warning, and only
once per unique local annotation name. Added Options to warn about all,
error, and ignore them.
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_expression.cpp | 21 | ||||
| -rw-r--r-- | TAO/TAO_IDL/driver/drv_args.cpp | 63 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.tab.cpp | 4314 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.tab.hpp | 3 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.ypp | 80 | ||||
| -rw-r--r-- | TAO/TAO_IDL/include/idl_global.h | 24 | ||||
| -rw-r--r-- | TAO/TAO_IDL/include/utl_err.h | 3 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_err.cpp | 12 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_global.cpp | 4 |
9 files changed, 2358 insertions, 2166 deletions
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp index d14e551ed12..4969575875a 100644 --- a/TAO/TAO_IDL/ast/ast_expression.cpp +++ b/TAO/TAO_IDL/ast/ast_expression.cpp @@ -2850,28 +2850,19 @@ AST_Expression::operator== (AST_Expression *vc) case EV_bool: return this->pd_ev->u.lval == vc->ev ()->u.lval; case EV_string: - if (this->pd_ev->u.strval == 0) - { - return vc->ev ()->u.strval == 0; - } - else if (vc->ev ()->u.strval == 0) - { - return false; - } - else - { - return this->pd_ev->u.strval == vc->ev ()->u.strval; - } - + return !ACE_OS::strcmp (pd_ev->u.strval->get_string (), + vc->ev ()->u.strval->get_string ()); + case EV_wstring: + return !ACE_OS::strcmp (pd_ev->u.wstrval, vc->ev ()->u.wstrval); case EV_longlong: return pd_ev->u.llval == vc->ev ()->u.llval; case EV_ulonglong: return pd_ev->u.ullval == vc->ev ()->u.ullval; case EV_fixed: return pd_ev->u.fixedval == vc->ev ()->u.fixedval; - case EV_longdouble: - case EV_wstring: case EV_enum: + return pd_ev->u.eval == vc->ev ()->u.eval; + case EV_longdouble: case EV_void: case EV_none: case EV_any: diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp index 4448bd8e33d..e407e665861 100644 --- a/TAO/TAO_IDL/driver/drv_args.cpp +++ b/TAO/TAO_IDL/driver/drv_args.cpp @@ -139,7 +139,7 @@ DRV_usage (void) ACE_TEXT ("(default is error)\n") ACE_TEXT (" -as\t\t\tSilences the anonymous type diagnostic ") ACE_TEXT ("(default is error)\n") - ACE_TEXT (" -d | --dump\tPrints a dump of the AST and exits\n") + ACE_TEXT (" -d | --dump\t\tPrints a dump of the AST and exits\n") ACE_TEXT (" -Dname[=value]\t\tdefines name for preprocessor\n") ACE_TEXT (" -E\t\t\truns preprocessor only, prints on stdout\n") ACE_TEXT (" -Idir\t\t\tincludes dir in search path for preprocessor\n") @@ -158,6 +158,12 @@ DRV_usage (void) ACE_TEXT (" --bison-trace\t\tEnable Bison Tracing (sets yydebug to 1)\n") ACE_TEXT (" --dump-builtins\tDump the compiler and user defined IDL.\n") ACE_TEXT (" --just-dump-builtins\tJust dump the compiler defined IDL and exit.\n") + ACE_TEXT (" --unknown-annotations ARG\t") + ACE_TEXT ("Set reaction to unknown annotations. ARG must be one of the following:\n") + ACE_TEXT ("\t\t\t\twarn-once\tThe default, warn once per unique local name\n") + ACE_TEXT ("\t\t\t\twarn-all\tWarn for all unknown annotations\n") + ACE_TEXT ("\t\t\t\terror\t\tCauses the process to exit with a failed return status\n") + ACE_TEXT ("\t\t\t\tignore\t\tDon't report unknown annotations\n") )); be_util::usage (); @@ -581,7 +587,7 @@ process_long_option(long ac, char **av, long &i) bool invalid_version = no_more_args; if (no_more_args) { - ACE_DEBUG ((LM_ERROR, + ACE_ERROR ((LM_ERROR, ACE_TEXT ("--idl-version is missing a required argument, ") ACE_TEXT ("the IDL version to use.\n") )); @@ -592,7 +598,7 @@ process_long_option(long ac, char **av, long &i) invalid_version = !idl_global->idl_version_.is_valid (); if (invalid_version) { - ACE_DEBUG ((LM_ERROR, + ACE_ERROR ((LM_ERROR, ACE_TEXT ("\"%C\" is not a valid IDL version supported\n"), av[i] )); @@ -646,6 +652,57 @@ process_long_option(long ac, char **av, long &i) { idl_global->dump_ast (); } + else if (!ACE_OS::strcmp (long_option, "unknown-annotations")) + { + bool invalid_argument = no_more_args; + if (no_more_args) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("--unknown-annotations is missing its required argument.") + )); + } + else + { + i++; + if (!ACE_OS::strcmp (long_option, "warn-once")) + { + idl_global->unknown_annotations_ = + IDL_GlobalData::UNKNOWN_ANNOTATIONS_WARN_ONCE; + } + else if (!ACE_OS::strcmp (long_option, "warn-all")) + { + idl_global->unknown_annotations_ = + IDL_GlobalData::UNKNOWN_ANNOTATIONS_WARN_ALL; + } + else if (!ACE_OS::strcmp (long_option, "error")) + { + idl_global->unknown_annotations_ = + IDL_GlobalData::UNKNOWN_ANNOTATIONS_ERROR; + } + else if (!ACE_OS::strcmp (long_option, "ignore")) + { + idl_global->unknown_annotations_ = + IDL_GlobalData::UNKNOWN_ANNOTATIONS_IGNORE; + } + else + { + invalid_argument = true; + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("\"%C\" is not a valid argument.\n"), + av[i] + )); + } + } + if (invalid_argument) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("Use either \"warn-once\", \"warn-all\", ") + ACE_TEXT ("\"error\" or \"ignore\".\n"), + av[i] + )); + idl_global->parse_args_exit (1); + } + } else { ACE_DEBUG ((LM_ERROR, diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index 90218b57e3b..f2423eb17c3 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -321,10 +321,11 @@ union YYSTYPE AST_Annotation_Appls *annotations_val; AST_Annotation_Appl::Param *annotation_param_val; AST_Annotation_Appl::Params *annotation_params_val; + AST_Annotation_Decl *annotation_decl_val; AST_Decls *decls_val; Decl_Annotations_Pair *decl_annotations_pair_val; -#line 328 "fe/idl.tab.cpp" /* yacc.c:355 */ +#line 329 "fe/idl.tab.cpp" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -341,7 +342,7 @@ int tao_yyparse (void); /* Copy the second part of user declarations. */ -#line 345 "fe/idl.tab.cpp" /* yacc.c:358 */ +#line 346 "fe/idl.tab.cpp" /* yacc.c:358 */ #ifdef short # undef short @@ -583,16 +584,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1679 +#define YYLAST 1654 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 109 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 399 +#define YYNNTS 400 /* YYNRULES -- Number of rules. */ -#define YYNRULES 596 +#define YYNRULES 597 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 877 +#define YYNSTATES 878 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ @@ -647,66 +648,66 @@ static const yytype_uint8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 385, 385, 388, 389, 397, 410, 416, 420, 424, - 432, 431, 441, 440, 450, 449, 459, 458, 468, 467, - 477, 476, 486, 485, 495, 494, 504, 503, 513, 512, - 522, 521, 531, 530, 540, 539, 549, 548, 558, 557, - 571, 570, 582, 621, 625, 581, 641, 649, 663, 673, - 703, 707, 648, 730, 734, 735, 739, 740, 745, 750, - 744, 836, 841, 835, 910, 911, 916, 954, 958, 915, - 974, 973, 985, 1022, 1052, 1085, 1084, 1093, 1100, 1101, - 1102, 1103, 1107, 1111, 1116, 1159, 1163, 1115, 1190, 1233, - 1237, 1188, 1254, 1252, 1292, 1291, 1303, 1307, 1314, 1319, - 1327, 1352, 1378, 1442, 1443, 1447, 1448, 1449, 1455, 1454, - 1463, 1462, 1473, 1474, 1479, 1478, 1487, 1486, 1495, 1494, - 1503, 1502, 1511, 1510, 1519, 1518, 1527, 1526, 1535, 1534, - 1546, 1558, 1556, 1581, 1588, 1598, 1597, 1623, 1621, 1646, - 1656, 1667, 1711, 1738, 1768, 1772, 1776, 1780, 1767, 1842, - 1843, 1844, 1845, 1846, 1847, 1848, 1852, 1856, 1924, 1926, - 1928, 1929, 1941, 1942, 1954, 1955, 1967, 1968, 1977, 1989, - 1990, 1999, 2011, 2012, 2021, 2030, 2042, 2043, 2052, 2061, - 2073, 2123, 2124, 2131, 2135, 2140, 2147, 2151, 2155, 2160, - 2164, 2168, 2172, 2179, 2248, 2247, 2274, 2275, 2279, 2280, - 2281, 2283, 2282, 2291, 2292, 2296, 2347, 2351, 2358, 2371, - 2381, 2388, 2420, 2424, 2431, 2440, 2447, 2455, 2461, 2468, - 2479, 2478, 2487, 2491, 2495, 2499, 2525, 2533, 2532, 2604, - 2605, 2609, 2616, 2617, 2643, 2644, 2645, 2646, 2647, 2648, - 2649, 2650, 2654, 2655, 2656, 2657, 2661, 2662, 2663, 2667, - 2668, 2672, 2684, 2682, 2707, 2714, 2715, 2719, 2731, 2729, - 2754, 2761, 2777, 2795, 2796, 2800, 2804, 2808, 2815, 2819, - 2823, 2830, 2834, 2838, 2845, 2852, 2856, 2863, 2870, 2877, - 2884, 2892, 2891, 2905, 2936, 2940, 2904, 2957, 2960, 2961, - 2965, 2965, 2984, 2988, 2983, 3052, 3051, 3064, 3063, 3076, - 3080, 3113, 3117, 3173, 3177, 3075, 3199, 3206, 3219, 3228, - 3235, 3236, 3342, 3345, 3346, 3351, 3355, 3350, 3388, 3387, - 3399, 3409, 3427, 3435, 3434, 3448, 3452, 3447, 3468, 3467, - 3518, 3543, 3567, 3571, 3602, 3606, 3566, 3630, 3635, 3633, - 3639, 3643, 3679, 3683, 3677, 3770, 3840, 3849, 3839, 3863, - 3873, 3877, 3871, 3922, 3946, 3955, 3959, 3953, 3995, 4019, - 4027, 4026, 4066, 4076, 4094, 4102, 4106, 4101, 4166, 4167, - 4172, 4176, 4180, 4184, 4171, 4251, 4255, 4259, 4263, 4250, - 4339, 4343, 4372, 4376, 4338, 4392, 4396, 4460, 4464, 4390, - 4499, 4504, 4509, 4516, 4517, 4528, 4533, 4574, 4527, 4594, - 4593, 4602, 4601, 4612, 4617, 4615, 4621, 4626, 4630, 4625, - 4669, 4668, 4677, 4676, 4687, 4692, 4690, 4696, 4701, 4705, - 4700, 4750, 4757, 4758, 4759, 4866, 4870, 4874, 4882, 4886, - 4881, 4895, 4903, 4907, 4902, 4916, 4924, 4928, 4923, 4937, - 4945, 4949, 4944, 4958, 4965, 4977, 4975, 4998, 5005, 5033, - 5070, 5071, 5075, 5104, 5143, 5147, 5103, 5164, 5168, 5162, - 5209, 5208, 5216, 5223, 5224, 5229, 5228, 5237, 5236, 5245, - 5244, 5253, 5252, 5261, 5260, 5269, 5268, 5277, 5276, 5286, - 5376, 5382, 5407, 5513, 5522, 5526, 5532, 5604, 5676, 5750, - 5749, 5797, 5801, 5805, 5809, 5813, 5817, 5796, 5870, 5869, - 5877, 5884, 5889, 5897, 5901, 5896, 5911, 5912, 5916, 5918, - 5917, 5926, 5925, 5938, 5961, 5936, 5987, 6014, 5985, 6038, - 6039, 6040, 6044, 6045, 6049, 6076, 6106, 6150, 6154, 6104, - 6169, 6178, 6196, 6207, 6206, 6244, 6293, 6297, 6242, 6312, - 6316, 6323, 6327, 6331, 6335, 6339, 6343, 6347, 6351, 6355, - 6359, 6367, 6398, 6411, 6418, 6443, 6461, 6468, 6483, 6490, - 6500, 6504, 6522, 6526, 6499, 6539, 6545, 6548, 6555, 6554, - 6561, 6560, 6567, 6566, 6576, 6645, 6695, 6710, 6722, 6729, - 6788, 6793, 6797, 6792, 6856, 6860, 6855, 6873, 6874, 6879, - 6878, 6887, 6886, 6895, 6894, 6903, 6902 + 0, 386, 386, 389, 390, 398, 411, 417, 421, 425, + 433, 432, 442, 441, 451, 450, 460, 459, 469, 468, + 478, 477, 487, 486, 496, 495, 505, 504, 514, 513, + 523, 522, 532, 531, 541, 540, 550, 549, 559, 558, + 572, 571, 583, 622, 626, 582, 642, 650, 664, 674, + 704, 708, 649, 731, 735, 736, 740, 741, 746, 751, + 745, 837, 842, 836, 911, 912, 917, 955, 959, 916, + 975, 974, 986, 1023, 1053, 1086, 1085, 1094, 1101, 1102, + 1103, 1104, 1108, 1112, 1117, 1160, 1164, 1116, 1191, 1234, + 1238, 1189, 1255, 1253, 1293, 1292, 1304, 1308, 1315, 1320, + 1328, 1353, 1379, 1443, 1444, 1448, 1449, 1450, 1456, 1455, + 1464, 1463, 1474, 1475, 1480, 1479, 1488, 1487, 1496, 1495, + 1504, 1503, 1512, 1511, 1520, 1519, 1528, 1527, 1536, 1535, + 1547, 1559, 1557, 1582, 1589, 1599, 1598, 1624, 1622, 1647, + 1657, 1668, 1712, 1739, 1769, 1773, 1777, 1781, 1768, 1843, + 1844, 1845, 1846, 1847, 1848, 1849, 1853, 1857, 1925, 1927, + 1929, 1930, 1942, 1943, 1955, 1956, 1968, 1969, 1978, 1990, + 1991, 2000, 2012, 2013, 2022, 2031, 2043, 2044, 2053, 2062, + 2074, 2127, 2128, 2135, 2139, 2144, 2151, 2155, 2159, 2164, + 2168, 2172, 2176, 2183, 2252, 2251, 2278, 2279, 2283, 2284, + 2285, 2287, 2286, 2295, 2296, 2300, 2351, 2355, 2362, 2375, + 2385, 2393, 2392, 2465, 2469, 2476, 2485, 2492, 2500, 2506, + 2513, 2524, 2523, 2532, 2536, 2540, 2544, 2570, 2578, 2577, + 2649, 2650, 2654, 2661, 2662, 2688, 2689, 2690, 2691, 2692, + 2693, 2694, 2695, 2699, 2700, 2701, 2702, 2706, 2707, 2708, + 2712, 2713, 2717, 2729, 2727, 2752, 2759, 2760, 2764, 2776, + 2774, 2799, 2806, 2822, 2840, 2841, 2845, 2849, 2853, 2860, + 2864, 2868, 2875, 2879, 2883, 2890, 2897, 2901, 2908, 2915, + 2922, 2929, 2937, 2936, 2950, 2981, 2985, 2949, 3002, 3005, + 3006, 3010, 3010, 3029, 3033, 3028, 3097, 3096, 3109, 3108, + 3121, 3125, 3158, 3162, 3218, 3222, 3120, 3244, 3251, 3264, + 3273, 3280, 3281, 3390, 3393, 3394, 3399, 3403, 3398, 3436, + 3435, 3447, 3457, 3475, 3483, 3482, 3496, 3500, 3495, 3516, + 3515, 3566, 3591, 3615, 3619, 3650, 3654, 3614, 3678, 3683, + 3681, 3687, 3691, 3727, 3731, 3725, 3818, 3888, 3897, 3887, + 3911, 3921, 3925, 3919, 3970, 3996, 4005, 4009, 4003, 4045, + 4071, 4079, 4078, 4118, 4128, 4146, 4154, 4158, 4153, 4218, + 4219, 4224, 4228, 4232, 4236, 4223, 4303, 4307, 4311, 4315, + 4302, 4391, 4395, 4424, 4428, 4390, 4444, 4448, 4512, 4516, + 4442, 4551, 4556, 4561, 4568, 4569, 4580, 4585, 4626, 4579, + 4646, 4645, 4654, 4653, 4664, 4669, 4667, 4673, 4678, 4682, + 4677, 4721, 4720, 4729, 4728, 4739, 4744, 4742, 4748, 4753, + 4757, 4752, 4802, 4809, 4810, 4811, 4918, 4922, 4926, 4934, + 4938, 4933, 4947, 4955, 4959, 4954, 4968, 4976, 4980, 4975, + 4989, 4997, 5001, 4996, 5010, 5017, 5029, 5027, 5050, 5057, + 5085, 5122, 5123, 5127, 5156, 5195, 5199, 5155, 5216, 5220, + 5214, 5261, 5260, 5268, 5275, 5276, 5281, 5280, 5289, 5288, + 5297, 5296, 5305, 5304, 5313, 5312, 5321, 5320, 5329, 5328, + 5338, 5428, 5434, 5459, 5565, 5574, 5578, 5584, 5656, 5728, + 5802, 5801, 5849, 5853, 5857, 5861, 5865, 5869, 5848, 5922, + 5921, 5929, 5936, 5941, 5949, 5953, 5948, 5963, 5964, 5968, + 5970, 5969, 5978, 5977, 5990, 6013, 5988, 6039, 6066, 6037, + 6090, 6091, 6092, 6096, 6097, 6101, 6128, 6158, 6202, 6206, + 6156, 6221, 6230, 6248, 6259, 6258, 6296, 6345, 6349, 6294, + 6364, 6368, 6375, 6379, 6383, 6387, 6391, 6395, 6399, 6403, + 6407, 6411, 6419, 6450, 6463, 6470, 6495, 6513, 6520, 6535, + 6542, 6552, 6556, 6574, 6578, 6551, 6591, 6597, 6600, 6607, + 6606, 6613, 6612, 6619, 6618, 6628, 6697, 6747, 6762, 6774, + 6781, 6840, 6845, 6849, 6844, 6908, 6912, 6907, 6925, 6926, + 6931, 6930, 6939, 6938, 6947, 6946, 6955, 6954 }; #endif @@ -762,66 +763,66 @@ static const char *const yytname[] = "annotation_body", "annotation_statement", "$@60", "annotation_member_type", "annotation_member", "annotation_member_default", "at_least_one_annotation", - "annotations_maybe", "annotation_appl", "annotation_appl_params_maybe", - "annotation_appl_params", "named_annotation_appl_params", - "more_named_annotation_appl_params", "named_annotation_appl_param", - "type_dcl", "$@61", "type_declarator", "$@62", "type_spec", - "simple_type_spec", "base_type_spec", "template_type_spec", - "constructed_type_spec", "constructed_forward_type_spec", - "at_least_one_declarator", "declarators", "$@63", "declarator", - "at_least_one_simple_declarator", "simple_declarators", "$@64", - "simple_declarator", "complex_declarator", "integer_type", "signed_int", - "unsigned_int", "floating_pt_type", "fixed_type", "char_type", - "octet_type", "boolean_type", "any_type", "object_type", "struct_decl", - "$@65", "struct_type", "$@66", "$@67", "$@68", "at_least_one_member", - "members", "member", "@69", "member_i", "$@70", "$@71", "$@72", - "union_decl", "$@73", "union_type", "$@74", "$@75", "$@76", "$@77", - "$@78", "$@79", "switch_type_spec", "at_least_one_case_branch", - "case_branches", "case_branch", "$@80", "$@81", "$@82", - "at_least_one_case_label", "case_labels", "case_label", "$@83", "$@84", - "$@85", "element_spec", "$@86", "struct_forward_type", - "union_forward_type", "enum_type", "$@87", "$@88", "$@89", "$@90", - "at_least_one_enumerator", "enumerators", "$@91", "enumerator", - "sequence_type_spec", "$@92", "$@93", "seq_head", "$@94", "$@95", - "fixed_type_spec", "string_type_spec", "$@96", "$@97", "string_head", - "wstring_type_spec", "$@98", "$@99", "wstring_head", "array_declarator", - "$@100", "at_least_one_array_dim", "array_dims", "array_dim", "$@101", - "$@102", "attribute", "attribute_readonly", "$@103", "$@104", "$@105", - "$@106", "attribute_readwrite", "$@107", "$@108", "$@109", "$@110", - "exception", "$@111", "$@112", "$@113", "$@114", "operation", "$@115", - "$@116", "$@117", "$@118", "opt_op_attribute", "op_type_spec", - "init_decl", "$@119", "$@120", "$@121", "init_parameter_list", "$@122", - "$@123", "at_least_one_in_parameter", "in_parameters", "$@124", - "in_parameter", "$@125", "$@126", "parameter_list", "$@127", "$@128", - "at_least_one_parameter", "parameters", "$@129", "parameter", "$@130", - "$@131", "param_type_spec", "direction", "opt_raises", "$@132", "$@133", - "opt_getraises", "$@134", "$@135", "opt_setraises", "$@136", "$@137", - "opt_context", "$@138", "$@139", "at_least_one_string_literal", - "string_literals", "$@140", "typeid_dcl", "typeprefix_dcl", "component", - "component_forward_decl", "component_decl", "$@141", "$@142", "$@143", - "component_header", "$@144", "$@145", "component_inheritance_spec", - "$@146", "component_exports", "component_export", "$@147", "$@148", - "$@149", "$@150", "$@151", "$@152", "$@153", "provides_decl", + "annotations_maybe", "annotation_appl", "@61", + "annotation_appl_params_maybe", "annotation_appl_params", + "named_annotation_appl_params", "more_named_annotation_appl_params", + "named_annotation_appl_param", "type_dcl", "$@62", "type_declarator", + "$@63", "type_spec", "simple_type_spec", "base_type_spec", + "template_type_spec", "constructed_type_spec", + "constructed_forward_type_spec", "at_least_one_declarator", + "declarators", "$@64", "declarator", "at_least_one_simple_declarator", + "simple_declarators", "$@65", "simple_declarator", "complex_declarator", + "integer_type", "signed_int", "unsigned_int", "floating_pt_type", + "fixed_type", "char_type", "octet_type", "boolean_type", "any_type", + "object_type", "struct_decl", "$@66", "struct_type", "$@67", "$@68", + "$@69", "at_least_one_member", "members", "member", "@70", "member_i", + "$@71", "$@72", "$@73", "union_decl", "$@74", "union_type", "$@75", + "$@76", "$@77", "$@78", "$@79", "$@80", "switch_type_spec", + "at_least_one_case_branch", "case_branches", "case_branch", "$@81", + "$@82", "$@83", "at_least_one_case_label", "case_labels", "case_label", + "$@84", "$@85", "$@86", "element_spec", "$@87", "struct_forward_type", + "union_forward_type", "enum_type", "$@88", "$@89", "$@90", "$@91", + "at_least_one_enumerator", "enumerators", "$@92", "enumerator", + "sequence_type_spec", "$@93", "$@94", "seq_head", "$@95", "$@96", + "fixed_type_spec", "string_type_spec", "$@97", "$@98", "string_head", + "wstring_type_spec", "$@99", "$@100", "wstring_head", "array_declarator", + "$@101", "at_least_one_array_dim", "array_dims", "array_dim", "$@102", + "$@103", "attribute", "attribute_readonly", "$@104", "$@105", "$@106", + "$@107", "attribute_readwrite", "$@108", "$@109", "$@110", "$@111", + "exception", "$@112", "$@113", "$@114", "$@115", "operation", "$@116", + "$@117", "$@118", "$@119", "opt_op_attribute", "op_type_spec", + "init_decl", "$@120", "$@121", "$@122", "init_parameter_list", "$@123", + "$@124", "at_least_one_in_parameter", "in_parameters", "$@125", + "in_parameter", "$@126", "$@127", "parameter_list", "$@128", "$@129", + "at_least_one_parameter", "parameters", "$@130", "parameter", "$@131", + "$@132", "param_type_spec", "direction", "opt_raises", "$@133", "$@134", + "opt_getraises", "$@135", "$@136", "opt_setraises", "$@137", "$@138", + "opt_context", "$@139", "$@140", "at_least_one_string_literal", + "string_literals", "$@141", "typeid_dcl", "typeprefix_dcl", "component", + "component_forward_decl", "component_decl", "$@142", "$@143", "$@144", + "component_header", "$@145", "$@146", "component_inheritance_spec", + "$@147", "component_exports", "component_export", "$@148", "$@149", + "$@150", "$@151", "$@152", "$@153", "$@154", "provides_decl", "interface_type", "uses_decl", "uses_opt_multiple", "opt_multiple", - "emits_decl", "publishes_decl", "consumes_decl", "home_decl", "$@154", - "home_header", "$@155", "$@156", "$@157", "$@158", "$@159", "$@160", - "home_inheritance_spec", "$@161", "primary_key_spec", "home_body", - "$@162", "$@163", "home_exports", "home_export", "$@164", "$@165", - "factory_decl", "$@166", "$@167", "finder_decl", "$@168", "$@169", + "emits_decl", "publishes_decl", "consumes_decl", "home_decl", "$@155", + "home_header", "$@156", "$@157", "$@158", "$@159", "$@160", "$@161", + "home_inheritance_spec", "$@162", "primary_key_spec", "home_body", + "$@163", "$@164", "home_exports", "home_export", "$@165", "$@166", + "factory_decl", "$@167", "$@168", "finder_decl", "$@169", "$@170", "event", "event_forward_decl", "event_concrete_forward_decl", - "event_abs_forward_decl", "event_abs_decl", "$@170", "$@171", "$@172", + "event_abs_forward_decl", "event_abs_decl", "$@171", "$@172", "$@173", "event_abs_header", "event_custom_header", "event_plain_header", - "event_rest_of_header", "$@173", "event_decl", "$@174", "$@175", "$@176", + "event_rest_of_header", "$@174", "event_decl", "$@175", "$@176", "$@177", "event_header", "formal_parameter_type", "at_least_one_formal_parameter", "formal_parameters", "formal_parameter", "at_least_one_formal_parameter_name", "formal_parameter_names", - "formal_parameter_name", "porttype_decl", "$@177", "$@178", "$@179", - "$@180", "at_least_one_port_export", "port_exports", "port_export", - "$@181", "$@182", "$@183", "extended_port_decl", + "formal_parameter_name", "porttype_decl", "$@178", "$@179", "$@180", + "$@181", "at_least_one_port_export", "port_exports", "port_export", + "$@182", "$@183", "$@184", "extended_port_decl", "at_least_one_actual_parameter", "actual_parameters", "actual_parameter", - "connector_decl", "connector_header", "$@184", "$@185", "connector_body", - "$@186", "$@187", "connector_exports", "connector_export", "$@188", - "$@189", "$@190", "$@191", YY_NULLPTR + "connector_decl", "connector_header", "$@185", "$@186", "connector_body", + "$@187", "$@188", "connector_exports", "connector_export", "$@189", + "$@190", "$@191", "$@192", YY_NULLPTR }; #endif @@ -844,12 +845,12 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -629 +#define YYPACT_NINF -632 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-629))) + (!!((Yystate) == (-632))) -#define YYTABLE_NINF -538 +#define YYTABLE_NINF -539 #define yytable_value_is_error(Yytable_value) \ 0 @@ -858,94 +859,94 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -629, 57, 1243, -629, -629, -629, -629, -629, -629, -629, - -629, -629, -629, -629, 71, 81, 50, 73, -629, 71, - 71, -629, 40, 40, -629, -629, 71, -629, -629, 6, - -629, 223, 25, 72, -629, -629, 12, -629, -629, -629, - -629, -629, -629, 344, -629, -629, -629, -629, -629, 1427, - 42, -629, -629, 75, -629, 144, -629, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, - -629, -629, -629, -629, 80, -629, -629, -629, 80, -629, - -629, 96, 115, 1598, 40, 71, 1536, 71, 71, 71, - 71, -629, -629, -629, 79, 71, 122, -629, 125, 71, - -629, 80, 71, 123, 126, 71, -629, -629, 15, -629, - 27, -629, -629, 128, -629, 132, 135, 570, -629, -629, - -629, 138, 186, -629, 153, 157, 160, 142, -629, 168, - -629, -629, -629, -629, -629, -629, 176, -629, -629, -629, - -629, -629, -629, 192, -629, -629, -629, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, - -629, 144, -629, -629, -629, 97, -629, -629, 184, -629, - 188, 212, 221, -629, 40, 202, 225, 222, -629, 227, - 228, 230, 234, 235, 237, 239, 243, -629, -629, -629, - 244, 245, -629, -629, -629, -629, 192, -629, -629, -629, - -629, -629, -629, -629, -629, -629, 192, -629, -629, -629, - -629, -629, -629, -629, -629, 246, -629, 247, -629, -629, - 251, -629, 332, -629, -629, -629, 41, 44, -629, -629, - -629, 1598, -629, -629, -629, -629, 248, -629, -629, -629, - -629, 335, -629, -629, 120, 253, -629, -629, -629, -629, - -629, -629, -629, -629, 338, -629, 181, 249, 301, -629, - -629, -629, -629, -629, -629, 13, -629, -629, 261, -629, - -629, -629, -629, -629, -629, -629, -629, -629, 301, 282, - 283, -629, -629, -629, 71, 71, 284, 285, -629, -629, - -629, 286, -629, 332, -629, -629, -629, -629, -629, -629, - 373, -629, 289, 290, -629, -629, -629, -629, -629, -629, - -629, -629, -629, -629, 60, 60, 60, 181, 192, -629, - -629, 281, 288, 280, 170, 164, 129, -629, -629, -629, - -629, -629, 40, -629, -629, -629, -629, 292, -629, 40, - -629, 181, 181, 181, 181, -629, -629, -629, -629, -629, - -629, -629, -629, 238, -629, 293, -629, -629, -629, -629, - -629, -629, -629, -629, 40, 301, -629, -629, -629, 302, - 251, 699, 1296, 300, 303, -629, 570, -629, -629, -629, - 291, 181, 181, 181, 181, 181, 181, 181, 181, 181, - 181, 307, 71, -629, 192, 1079, 827, 181, -629, -629, - -629, -629, -629, 308, -629, 296, -629, 312, -629, -629, - -629, -629, 384, 995, -629, -629, -629, -629, 65, 349, - 40, 40, -629, -629, -629, -629, -629, 65, -629, 319, - -629, 315, 304, 318, -629, -629, 1114, 192, -629, 40, - 301, -629, -629, -629, -629, 328, -629, -629, 71, -629, - -629, 333, 334, 419, 337, -629, -629, 288, 280, 170, - 164, 164, 129, 129, -629, -629, -629, -629, -629, 329, - -629, -629, -629, 340, -629, -629, -629, -629, -629, -629, - 1571, -629, -629, -629, -629, -629, 341, -629, -629, -629, - 339, 336, 885, 347, 350, 351, 181, -629, 332, -629, - 356, 357, 1376, 101, 40, 40, 40, -629, 358, -629, - -629, -629, -629, -629, -629, -629, 71, 71, -629, 365, - -629, -629, -629, 1198, 911, 410, 1171, -629, 192, 332, - -629, -629, 83, 88, 368, 369, 371, 332, 372, -629, - -629, -629, -629, -629, -629, 64, -629, -629, 375, 376, - 192, -629, 89, 1536, -629, 434, -629, -629, -629, -629, - 120, -629, 379, -629, 380, 381, 385, 387, 389, -629, - 192, -629, -629, -629, -629, -629, 390, 391, -629, 1517, - 1517, -629, -629, -629, -629, -629, -629, -629, -629, 308, - 312, -629, -629, -629, -629, -629, 464, 192, -629, -629, - -629, -629, -629, -629, 90, 90, 90, 397, -629, 398, - 399, 400, 401, 402, 403, -629, -629, -629, 407, 408, - 409, 411, -629, -629, -629, -629, -629, -629, -629, -629, - -629, -629, 181, 181, 304, 71, -629, 412, 404, 413, - -629, 431, -629, -629, -629, -629, -629, 417, 181, 420, - 1402, -629, 40, -629, -629, -629, -629, -629, -629, -629, - -629, -629, 69, -629, -629, -629, 421, 71, 394, -629, - -629, -629, -629, -629, -629, -629, -629, -629, -629, 405, - 405, -629, -629, -629, -629, 1171, 71, -629, -629, -629, - -629, -629, -629, -629, -629, 423, 426, 428, 427, 89, - -629, -629, -629, 40, -629, -629, -629, -629, 430, 192, - 70, -629, -629, -629, -629, 484, -629, -629, -629, -629, - -629, 415, -629, 40, -629, -629, -629, -629, -629, 192, - 436, 561, -629, -629, 405, 432, 439, 424, 486, 491, - 491, 71, 477, 440, -629, -629, 192, 442, -629, -629, - 435, -629, -629, -629, -629, -629, 429, -629, -629, -629, - -629, -629, -629, -629, -629, 478, 533, 437, -629, 491, - 146, 1171, -629, 450, 441, 491, 445, 483, 71, 40, - -629, -629, 455, -629, 449, 201, 491, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, - -629, -629, -629, 192, -629, 462, -629, -629, -629, -629, - 453, -629, -629, -629, 472, 181, 468, 473, 53, -629, - 242, 71, 486, 40, 40, 459, 71, 533, -629, 475, - 1171, 531, -629, -629, -629, -629, -629, 1491, -629, -629, - -629, 465, 466, -629, -629, -629, -629, -629, -629, -629, - 480, -629, -629, -629, -629, 40, 201, 71, 474, -629, - 71, 489, 479, -629, -629, -629, -629, -629, -629, 503, - -629, 481, 492, -629, -629, 505, -629 + -632, 113, 1298, -632, -632, -632, -632, -632, -632, -632, + -632, -632, -632, -632, 146, 157, 70, -2, -632, 146, + 146, -632, 40, 40, -632, -632, 146, -632, -632, 74, + -632, 626, 32, 73, -632, -632, 29, -632, -632, -632, + -632, -632, -632, 567, -632, -632, -632, -632, -632, 1429, + 86, -632, -632, 95, -632, 165, -632, -632, -632, -632, + -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, + -632, -632, -632, -632, 118, -632, -632, -632, 118, -632, + -632, 124, 133, 354, 40, 146, 1538, 146, 146, 146, + 146, -632, -632, -632, 103, 146, 107, -632, 115, 146, + -632, 118, 146, 164, 181, 146, -632, -632, 37, -632, + 117, -632, -632, 184, -632, 191, 194, 719, -632, -632, + -632, 200, 241, -632, 201, 203, 204, 83, -632, 193, + -632, -632, -632, -632, -632, -632, 205, -632, -632, -632, + -632, -632, -632, 214, -632, -632, -632, -632, -632, -632, + -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, + -632, 165, -632, -632, -632, 5, -632, -632, 206, -632, + 207, 212, 213, -632, 40, 215, 216, 217, -632, 223, + 225, 231, 232, 219, 235, 236, 244, -632, -632, -632, + 245, 246, -632, -632, -632, -632, 214, -632, -632, -632, + -632, -632, -632, -632, -632, -632, 214, -632, -632, -632, + -632, -632, -632, -632, -632, 247, -632, 248, -632, -632, + 243, -632, 300, -632, -632, -632, 49, 50, -632, -632, + -632, 354, -632, -632, -632, -632, 218, -632, -632, -632, + -632, 302, -632, -632, 54, 222, -632, -632, -632, -632, + -632, -632, -632, -632, 316, -632, 154, 251, 292, -632, + -632, -632, -632, -632, -632, 214, -632, -632, 238, -632, + -632, -632, -632, -632, -632, -632, -632, -632, 292, 255, + 258, -632, -632, -632, 146, 146, 260, 261, -632, -632, + -632, 259, -632, 300, -632, -632, -632, -632, -632, -632, + 348, -632, 262, 265, -632, -632, -632, -632, -632, -632, + -632, -632, -632, -632, 187, 187, 187, 154, 214, -632, + -632, 257, 263, 275, -9, 105, 116, -632, -632, -632, + -632, -632, 40, -632, -632, -632, -632, 267, -632, 40, + -632, 154, 154, 154, 250, -632, -632, -632, -632, -632, + -632, -632, 210, -632, 249, -632, -632, -632, -632, -632, + -632, -632, -632, 40, 292, -632, -632, -632, 285, 243, + 608, 1351, 293, 283, -632, 719, -632, -632, -632, 276, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 290, 146, -632, 214, 1080, 828, 154, -632, -632, -632, + -632, -632, 154, -632, -632, -632, -632, -632, 155, 996, + -632, -632, -632, -632, 65, 327, 40, 40, -632, -632, + -632, -632, -632, 65, -632, 296, -632, 294, 289, 303, + -632, -632, 1115, 214, -632, 40, 292, -632, -632, -632, + -632, 310, -632, -632, 146, -632, -632, 314, 317, 401, + 319, -632, -632, 263, 275, -9, 105, 105, 116, 116, + -632, -632, -632, -632, -632, 312, -632, -632, -632, 320, + -632, -632, -632, -632, -632, -632, 1573, -632, -632, -632, + -632, -632, 321, -632, -632, -632, 324, 326, 886, 328, + 329, 344, 343, -632, 335, -632, 315, 352, 353, 696, + 93, 40, 40, 40, -632, 359, -632, -632, -632, -632, + -632, -632, -632, 146, 146, -632, 360, -632, -632, -632, + 1199, 912, 413, 414, -632, 214, 300, -632, -632, 69, + 90, 363, 365, 367, 300, 368, -632, -632, -632, -632, + -632, -632, 57, -632, -632, 370, 372, 214, -632, 80, + 1538, -632, 428, -632, -632, -632, -632, 54, -632, 375, + -632, 376, 377, 380, 382, 384, -632, 214, -632, -632, + -632, -632, -632, 385, 386, -632, 1519, 1519, -632, -632, + -632, -632, -632, -632, -632, 154, -632, 300, -632, -632, + -632, -632, -632, -632, 467, 214, -632, -632, -632, -632, + -632, -632, 97, 97, 97, 388, -632, 394, 395, 396, + 397, 398, 399, -632, -632, -632, 400, 403, 402, 404, + -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, + 154, 154, 289, 146, -632, 406, 408, 407, -632, 423, + -632, -632, -632, -632, -632, 405, 154, 410, 1376, -632, + 40, -632, -632, -632, -632, -632, -632, -632, -632, -632, + 60, -632, -632, -632, 343, 315, 417, 146, 409, -632, + -632, -632, -632, -632, -632, -632, -632, -632, -632, 411, + 411, -632, -632, -632, -632, 414, 146, -632, -632, -632, + -632, -632, -632, -632, -632, 418, 419, 420, 421, 80, + -632, -632, -632, 40, -632, -632, -632, -632, 425, 214, + 64, -632, -632, -632, -632, -632, 479, -632, -632, -632, + -632, -632, 415, -632, 40, -632, -632, -632, -632, -632, + 214, 427, 1244, -632, -632, 411, 431, 432, 424, 489, + 487, 487, 146, 471, 433, -632, -632, 214, 438, -632, + -632, 429, -632, -632, -632, -632, -632, 426, -632, -632, + -632, -632, -632, -632, -632, -632, 474, 534, 434, -632, + 487, 114, 414, -632, 447, 437, 487, 445, 481, 146, + 40, -632, -632, 459, -632, 446, 220, 487, -632, -632, + -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, + -632, -632, -632, -632, 214, -632, 462, -632, -632, -632, + -632, 451, -632, -632, -632, 465, 154, 466, 468, 58, + -632, 197, 146, 489, 40, 40, 455, 146, 534, -632, + 469, 414, 522, -632, -632, -632, -632, -632, 1493, -632, + -632, -632, 456, 458, -632, -632, -632, -632, -632, -632, + -632, 472, -632, -632, -632, -632, 40, 220, 146, 461, + -632, 146, 480, 463, -632, -632, -632, -632, -632, -632, + 492, -632, 488, 477, -632, -632, 498, -632 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -953,139 +954,139 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 4, 0, 0, 3, 1, 38, 144, 40, 70, 220, - 281, 297, 332, 380, 0, 0, 0, 0, 94, 0, - 0, 491, 0, 0, 560, 581, 0, 6, 7, 42, + 4, 0, 0, 3, 1, 38, 144, 40, 70, 221, + 282, 298, 333, 381, 0, 0, 0, 0, 94, 0, + 0, 492, 0, 0, 561, 582, 0, 6, 7, 42, 24, 61, 0, 0, 22, 64, 77, 66, 26, 78, 83, 79, 84, 77, 80, 81, 65, 18, 10, 0, - 0, 12, 226, 283, 222, 331, 223, 249, 250, 224, - 20, 14, 16, 28, 451, 450, 453, 30, 489, 32, - 521, 523, 522, 520, 77, 539, 540, 519, 77, 34, + 0, 12, 227, 284, 223, 332, 224, 250, 251, 225, + 20, 14, 16, 28, 452, 451, 454, 30, 490, 32, + 522, 524, 523, 521, 77, 540, 541, 520, 77, 34, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 140, 261, 225, 77, 0, 77, 88, 77, 0, - 82, 77, 0, 457, 532, 0, 139, 135, 0, 134, + 0, 140, 262, 226, 77, 0, 77, 88, 77, 0, + 82, 77, 0, 458, 533, 0, 139, 135, 0, 134, 0, 210, 210, 0, 46, 0, 0, 0, 210, 8, - 9, 0, 97, 72, 0, 0, 0, 265, 267, 0, - 271, 272, 275, 276, 277, 278, 274, 279, 280, 346, - 354, 359, 92, 233, 102, 229, 231, 232, 230, 234, - 263, 264, 235, 239, 236, 238, 237, 240, 241, 283, - 246, 0, 247, 248, 242, 0, 245, 243, 353, 244, - 358, 0, 0, 5, 0, 208, 0, 0, 299, 0, - 0, 0, 0, 0, 0, 0, 0, 533, 526, 535, - 0, 0, 584, 580, 39, 274, 157, 145, 149, 153, - 154, 150, 151, 152, 155, 156, 41, 71, 221, 227, - 282, 298, 333, 381, 73, 530, 74, 0, 531, 95, - 462, 492, 0, 448, 137, 449, 0, 0, 194, 43, - 25, 0, 546, 542, 543, 548, 545, 549, 547, 544, - 541, 0, 48, 553, 0, 0, 23, 96, 75, 67, - 27, 85, 266, 273, 268, 270, 0, 0, 99, 345, - 342, 350, 355, 19, 11, 213, 13, 284, 0, 21, - 15, 17, 29, 454, 31, 503, 490, 33, 99, 0, - 0, 35, 37, 588, 0, 0, 0, 0, 89, 460, - 458, 500, 136, 0, 561, 209, 582, 197, 4, 550, - 0, 554, 0, 551, 183, 184, 185, 187, 190, 189, - 191, 192, 188, 186, 0, 0, 0, 0, 180, 579, + 9, 0, 97, 72, 0, 0, 0, 266, 268, 0, + 272, 273, 276, 277, 278, 279, 275, 280, 281, 347, + 355, 360, 92, 234, 102, 230, 232, 233, 231, 235, + 264, 265, 236, 240, 237, 239, 238, 241, 242, 284, + 247, 0, 248, 249, 243, 0, 246, 244, 354, 245, + 359, 0, 0, 5, 0, 208, 0, 0, 300, 0, + 0, 0, 0, 0, 0, 0, 0, 534, 527, 536, + 0, 0, 585, 581, 39, 275, 157, 145, 149, 153, + 154, 150, 151, 152, 155, 156, 41, 71, 222, 228, + 283, 299, 334, 382, 73, 531, 74, 0, 532, 95, + 463, 493, 0, 449, 137, 450, 0, 0, 194, 43, + 25, 0, 547, 543, 544, 549, 546, 550, 548, 545, + 542, 0, 48, 554, 0, 0, 23, 96, 75, 67, + 27, 85, 267, 274, 269, 271, 0, 0, 99, 346, + 343, 351, 356, 19, 11, 211, 13, 285, 0, 21, + 15, 17, 29, 455, 31, 504, 491, 33, 99, 0, + 0, 35, 37, 589, 0, 0, 0, 0, 89, 461, + 459, 501, 136, 0, 562, 209, 583, 197, 4, 551, + 0, 555, 0, 552, 183, 184, 185, 187, 190, 189, + 191, 192, 188, 186, 0, 0, 0, 0, 180, 580, 158, 159, 160, 162, 164, 166, 169, 172, 176, 181, - 578, 62, 0, 113, 104, 269, 193, 0, 347, 0, - 93, 0, 0, 0, 0, 211, 290, 300, 464, 507, - 534, 527, 536, 585, 146, 261, 228, 254, 255, 256, - 262, 334, 382, 113, 0, 99, 498, 493, 138, 0, - 462, 0, 0, 3, 0, 49, 0, 177, 178, 179, + 579, 62, 0, 113, 104, 270, 193, 0, 348, 0, + 93, 0, 0, 0, 214, 291, 301, 465, 508, 535, + 528, 537, 586, 146, 262, 229, 255, 256, 257, 263, + 335, 383, 113, 0, 99, 499, 494, 138, 0, 463, + 0, 0, 3, 0, 49, 0, 177, 178, 179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 576, 0, 76, 133, 0, 0, 0, 210, 98, - 343, 351, 356, 134, 214, 0, 215, 218, 285, 289, - 210, 210, 455, 0, 113, 104, 370, 375, 0, 485, - 0, 0, 593, 368, 369, 589, 591, 0, 595, 0, - 587, 0, 0, 251, 210, 289, 0, 461, 459, 0, - 99, 562, 583, 201, 195, 0, 203, 196, 0, 198, - 204, 0, 0, 0, 0, 552, 182, 161, 163, 165, - 167, 168, 170, 171, 173, 174, 175, 210, 63, 130, - 128, 390, 391, 0, 112, 120, 114, 124, 122, 126, - 0, 116, 118, 395, 110, 108, 0, 103, 105, 106, - 0, 0, 0, 0, 0, 0, 0, 212, 0, 216, - 0, 290, 0, 0, 0, 0, 0, 475, 0, 463, - 465, 467, 469, 471, 473, 477, 0, 0, 508, 0, - 506, 509, 511, 0, 0, 0, 0, 481, 480, 0, - 484, 483, 0, 0, 0, 0, 0, 0, 0, 586, - 147, 365, 361, 364, 252, 0, 335, 340, 290, 0, - 499, 494, 0, 0, 199, 207, 200, 45, 555, 50, - 0, 131, 0, 69, 0, 0, 0, 0, 0, 394, - 424, 421, 422, 423, 385, 393, 0, 0, 210, 0, - 0, 87, 107, 349, 348, 344, 352, 357, 219, 0, - 218, 286, 288, 295, 292, 291, 265, 311, 306, 307, - 308, 309, 301, 310, 0, 0, 0, 0, 456, 0, - 0, 0, 0, 0, 0, 513, 516, 505, 0, 0, - 0, 0, 371, 376, 479, 574, 575, 594, 590, 592, - 482, 596, 0, 0, 362, 0, 341, 0, 337, 0, - 91, 0, 572, 568, 570, 563, 567, 0, 0, 0, - 0, 577, 0, 129, 121, 115, 125, 123, 127, 210, - 117, 119, 0, 111, 109, 217, 0, 0, 0, 488, - 486, 487, 476, 466, 468, 470, 472, 474, 478, 0, - 0, 510, 512, 529, 538, 0, 0, 148, 366, 363, - 253, 336, 338, 384, 495, 0, 0, 0, 0, 565, + 577, 0, 76, 133, 0, 0, 0, 210, 98, 344, + 352, 357, 0, 212, 286, 290, 210, 210, 456, 0, + 113, 104, 371, 376, 0, 486, 0, 0, 594, 369, + 370, 590, 592, 0, 596, 0, 588, 0, 0, 252, + 210, 290, 0, 462, 460, 0, 99, 563, 584, 201, + 195, 0, 203, 196, 0, 198, 204, 0, 0, 0, + 0, 553, 182, 161, 163, 165, 167, 168, 170, 171, + 173, 174, 175, 210, 63, 130, 128, 391, 392, 0, + 112, 120, 114, 124, 122, 126, 0, 116, 118, 396, + 110, 108, 0, 103, 105, 106, 0, 0, 0, 0, + 0, 0, 134, 215, 0, 216, 219, 0, 291, 0, + 0, 0, 0, 0, 476, 0, 464, 466, 468, 470, + 472, 474, 478, 0, 0, 509, 0, 507, 510, 512, + 0, 0, 0, 0, 482, 481, 0, 485, 484, 0, + 0, 0, 0, 0, 0, 0, 587, 147, 366, 362, + 365, 253, 0, 336, 341, 291, 0, 500, 495, 0, + 0, 199, 207, 200, 45, 556, 50, 0, 131, 0, + 69, 0, 0, 0, 0, 0, 395, 425, 422, 423, + 424, 386, 394, 0, 0, 210, 0, 0, 87, 107, + 350, 349, 345, 353, 358, 0, 213, 0, 217, 287, + 289, 296, 293, 292, 266, 312, 307, 308, 309, 310, + 302, 311, 0, 0, 0, 0, 457, 0, 0, 0, + 0, 0, 0, 514, 517, 506, 0, 0, 0, 0, + 372, 377, 480, 575, 576, 595, 591, 593, 483, 597, + 0, 0, 363, 0, 342, 0, 338, 0, 91, 0, + 573, 569, 571, 564, 568, 0, 0, 0, 0, 578, + 0, 129, 121, 115, 125, 123, 127, 210, 117, 119, + 0, 111, 109, 220, 0, 219, 0, 0, 0, 489, + 487, 488, 477, 467, 469, 471, 473, 475, 479, 0, + 0, 511, 513, 530, 539, 0, 0, 148, 367, 364, + 254, 337, 339, 385, 496, 0, 0, 0, 0, 566, 202, 206, 205, 0, 56, 42, 51, 55, 0, 132, - 0, 396, 296, 293, 302, 399, 514, 517, 372, 377, - 260, 0, 210, 0, 573, 569, 571, 564, 566, 58, - 0, 0, 57, 386, 0, 0, 0, 0, 0, 431, - 431, 0, 435, 257, 367, 339, 496, 0, 52, 54, - 0, 397, 294, 303, 400, 407, 0, 406, 428, 515, - 518, 373, 432, 378, 258, 502, 0, 412, 387, 431, - 0, 0, 402, 403, 0, 431, 0, 439, 0, 0, - 497, 559, 0, 558, 0, 0, 431, 398, 318, 325, - 323, 304, 314, 315, 322, 408, 404, 429, 374, 433, - 436, 379, 259, 501, 59, 556, 411, 425, 426, 427, - 0, 417, 418, 388, 0, 0, 0, 0, 0, 210, - 320, 0, 0, 0, 0, 0, 0, 0, 413, 414, - 0, 443, 319, 326, 324, 305, 313, 0, 321, 409, - 405, 0, 0, 437, 60, 557, 415, 419, 440, 389, - 0, 328, 316, 430, 434, 0, 0, 0, 0, 327, - 0, 0, 0, 416, 420, 441, 329, 317, 438, 0, - 447, 0, 444, 442, 445, 0, 446 + 0, 397, 218, 297, 294, 303, 400, 515, 518, 373, + 378, 261, 0, 210, 0, 574, 570, 572, 565, 567, + 58, 0, 0, 57, 387, 0, 0, 0, 0, 0, + 432, 432, 0, 436, 258, 368, 340, 497, 0, 52, + 54, 0, 398, 295, 304, 401, 408, 0, 407, 429, + 516, 519, 374, 433, 379, 259, 503, 0, 413, 388, + 432, 0, 0, 403, 404, 0, 432, 0, 440, 0, + 0, 498, 560, 0, 559, 0, 0, 432, 399, 319, + 326, 324, 305, 315, 316, 323, 409, 405, 430, 375, + 434, 437, 380, 260, 502, 59, 557, 412, 426, 427, + 428, 0, 418, 419, 389, 0, 0, 0, 0, 0, + 210, 321, 0, 0, 0, 0, 0, 0, 0, 414, + 415, 0, 444, 320, 327, 325, 306, 314, 0, 322, + 410, 406, 0, 0, 438, 60, 558, 416, 420, 441, + 390, 0, 329, 317, 431, 435, 0, 0, 0, 0, + 328, 0, 0, 0, 417, 421, 442, 330, 318, 439, + 0, 448, 0, 445, 443, 446, 0, 447 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -629, -629, 294, 297, 534, -601, -629, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, - -629, -599, -629, -629, -629, -629, -629, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -142, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -629, -629, 272, -629, - -629, 112, -629, -629, -629, 581, -629, -629, -629, -629, - -629, -629, -629, 583, -629, 275, -629, -629, -238, -629, - -629, 185, -629, -629, -629, -629, -313, -354, -629, -629, - -629, -629, -629, -629, -629, -629, -331, -629, -629, -22, - -629, -629, -186, -10, -629, 16, -629, -629, -629, -629, - -190, -27, -219, -629, 226, 224, 229, -91, -90, -149, - -32, -629, -304, -629, -629, -629, -629, -629, -629, -629, - -629, -629, -84, 558, -629, -629, -629, 26, 117, 17, - -629, 67, -629, -40, 130, -450, -629, -629, -629, -49, - -629, -629, -609, -120, -629, -629, -8, -629, -70, -629, - -629, -51, -48, -69, -63, -52, 255, -629, -38, -629, - -31, -629, -629, -629, -629, 193, 295, -629, -275, -629, - -629, -629, -28, -629, -26, -629, -629, -629, -629, -629, - -629, -629, -629, -629, -191, -629, -629, -629, -629, -629, - -185, -629, -629, -629, -629, -629, -629, -629, -41, -629, - -629, -629, -629, -629, -629, -629, -93, -629, -629, -629, - -629, -629, -629, -629, -76, -629, -629, -629, -72, -629, - -629, -629, -629, -629, -629, -629, 0, -629, -629, -324, - -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, - 20, -629, -629, -629, -629, -629, -629, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -628, -629, -629, -629, - -629, -629, -183, -629, -629, -629, -629, -629, -629, -629, - -629, -220, -629, -629, -493, -629, -553, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, - -629, 21, 22, -629, -629, -629, -629, -629, -629, -629, - -629, -629, 270, -629, -629, -629, -629, -629, -629, -629, - -629, -629, -629, -300, 215, -270, -629, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -629, 565, -629, -629, - -629, -629, -629, -629, -629, -629, -629, 268, -629, -629, - -182, -629, -629, -629, -629, -629, -629, -629, -53, -629, - -629, -629, 236, -629, -629, 92, -629, -629, -629, -629, - -629, -629, -629, -629, -629, -629, -629, -629, -629 + -632, -632, 297, 298, 525, -565, -632, -632, -632, -632, + -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, + -632, -560, -632, -632, -632, -632, -632, -632, -632, -632, + -632, -632, -632, -632, -632, -632, -135, -632, -632, -632, + -632, -632, -632, -632, -632, -632, -632, -632, 221, -632, + -632, 88, -632, -632, -632, 581, -632, -632, -632, -632, + -632, -632, -632, 583, -632, 226, -632, -632, -239, -632, + -632, 189, -632, -632, -632, -632, -312, -365, -632, -632, + -632, -632, -632, -632, -632, -632, -325, -632, -632, -22, + -632, -632, -188, -10, -632, 6, -632, -632, -632, -632, + -189, -29, -227, -632, 224, 227, 228, -134, -109, -142, + -31, -632, -305, -632, -632, -632, -632, -632, -632, -632, + -632, -632, -85, 552, -632, -632, -632, -632, -62, 18, + 16, -632, 56, -632, -40, 119, -441, -632, -632, -632, + -27, -632, -632, -610, -129, -632, -632, -8, -632, -63, + -632, -632, -43, -42, -55, -54, -52, 266, -632, -38, + -632, -32, -632, -632, -632, -632, 196, 284, -632, -290, + -632, -632, -632, -30, -632, -28, -632, -632, -632, -632, + -632, -632, -632, -632, -632, -184, -632, -632, -632, -632, + -632, -182, -632, -632, -632, -632, -632, -632, -632, -41, + -632, -632, -632, -632, -632, -632, -632, -86, -632, -632, + -632, -632, -632, -632, -632, -76, -632, -632, -632, -71, + -632, -632, -632, -632, -632, -632, -632, 9, -632, -632, + -327, -632, -632, -632, -632, -632, -632, -632, -632, -632, + -632, 17, -632, -632, -632, -632, -632, -632, -632, -632, + -632, -632, -632, -632, -632, -632, -632, -631, -632, -632, + -632, -632, -632, -181, -632, -632, -632, -632, -632, -632, + -632, -632, -214, -632, -632, -491, -632, -577, -632, -632, + -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, + -632, -632, 20, 22, -632, -632, -632, -632, -632, -632, + -632, -632, -632, 282, -632, -632, -632, -632, -632, -632, + -632, -632, -632, -632, -282, 229, -238, -632, -632, -632, + -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, + -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, + -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, + -632, -632, -632, -632, -632, -632, -632, -632, 566, -632, + -632, -632, -632, -632, -632, -632, -632, -632, 270, -632, + -632, -172, -632, -632, -632, -632, -632, -632, -632, -37, + -632, -632, -632, 253, -632, -632, 100, -632, -632, -632, + -632, -632, -632, -632, -632, -632, -632, -632, -632, -632 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -1093,44 +1094,44 @@ static const yytype_int16 yydefgoto[] = { -1, 1, 2, 3, 27, 28, 172, 176, 180, 181, 171, 179, 121, 116, 125, 182, 184, 186, 190, 191, - 82, 29, 84, 30, 115, 298, 452, 31, 32, 117, - 302, 454, 650, 730, 706, 731, 707, 708, 747, 826, - 33, 118, 392, 34, 35, 124, 333, 473, 36, 85, - 37, 142, 332, 38, 39, 40, 126, 334, 486, 41, - 217, 363, 549, 42, 258, 43, 102, 248, 340, 44, - 45, 396, 487, 488, 580, 579, 395, 474, 565, 576, - 577, 564, 567, 566, 568, 562, 393, 469, 652, 318, - 222, 293, 109, 355, 46, 475, 83, 284, 431, 632, + 82, 29, 84, 30, 115, 298, 448, 31, 32, 117, + 302, 450, 648, 731, 706, 732, 707, 708, 748, 827, + 33, 118, 391, 34, 35, 124, 333, 469, 36, 85, + 37, 142, 332, 38, 39, 40, 126, 334, 482, 41, + 217, 362, 546, 42, 258, 43, 102, 248, 340, 44, + 45, 395, 483, 484, 577, 576, 394, 470, 562, 573, + 574, 561, 564, 563, 565, 559, 392, 465, 650, 318, + 222, 293, 109, 354, 46, 471, 83, 284, 427, 630, 197, 319, 336, 321, 322, 323, 324, 325, 326, 327, - 328, 329, 337, 48, 297, 371, 447, 553, 448, 449, - 649, 49, 50, 295, 345, 405, 406, 499, 407, 476, - 86, 208, 285, 594, 145, 146, 147, 148, 52, 356, - 433, 635, 357, 719, 743, 778, 358, 359, 149, 150, - 151, 152, 153, 154, 155, 156, 157, 158, 53, 87, - 54, 177, 346, 500, 408, 501, 592, 410, 595, 667, - 735, 666, 55, 88, 56, 268, 411, 668, 736, 770, - 817, 602, 791, 818, 792, 819, 861, 814, 793, 820, - 794, 816, 815, 850, 852, 860, 57, 58, 59, 89, - 286, 434, 637, 546, 638, 722, 547, 164, 341, 493, - 165, 257, 398, 166, 167, 342, 494, 168, 169, 343, - 495, 170, 360, 432, 542, 634, 543, 633, 721, 477, - 423, 525, 685, 741, 775, 424, 526, 686, 742, 777, - 478, 90, 287, 435, 639, 479, 659, 750, 786, 831, - 480, 574, 490, 578, 734, 769, 716, 737, 738, 756, - 773, 822, 757, 771, 821, 768, 784, 785, 810, 829, - 856, 811, 830, 857, 575, 812, 759, 774, 823, 763, - 776, 824, 801, 825, 855, 849, 858, 869, 871, 872, - 875, 481, 482, 63, 64, 65, 183, 348, 508, 66, - 220, 365, 290, 364, 412, 509, 609, 610, 611, 612, - 613, 607, 614, 643, 529, 644, 427, 531, 512, 513, - 514, 67, 185, 68, 105, 291, 440, 641, 723, 765, - 367, 439, 780, 276, 349, 519, 413, 520, 618, 619, - 521, 679, 739, 522, 680, 740, 69, 70, 71, 72, - 73, 279, 414, 620, 74, 75, 76, 188, 278, 77, - 280, 415, 621, 78, 241, 242, 303, 243, 782, 805, - 783, 79, 111, 369, 552, 698, 645, 699, 646, 696, - 697, 695, 428, 245, 391, 330, 80, 81, 112, 370, - 193, 283, 429, 353, 430, 535, 536, 534, 538 + 328, 329, 337, 48, 297, 370, 443, 550, 444, 445, + 647, 49, 50, 295, 344, 403, 494, 495, 588, 496, + 472, 86, 208, 285, 592, 145, 146, 147, 148, 52, + 355, 429, 633, 356, 720, 744, 779, 357, 358, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 53, + 87, 54, 177, 345, 497, 404, 498, 590, 406, 593, + 667, 736, 666, 55, 88, 56, 268, 407, 668, 737, + 771, 818, 600, 792, 819, 793, 820, 862, 815, 794, + 821, 795, 817, 816, 851, 853, 861, 57, 58, 59, + 89, 286, 430, 635, 543, 636, 723, 544, 164, 341, + 489, 165, 257, 397, 166, 167, 342, 490, 168, 169, + 343, 491, 170, 359, 428, 539, 632, 540, 631, 722, + 473, 419, 522, 685, 742, 776, 420, 523, 686, 743, + 778, 474, 90, 287, 431, 637, 475, 657, 751, 787, + 832, 476, 571, 486, 575, 735, 770, 717, 738, 739, + 757, 774, 823, 758, 772, 822, 769, 785, 786, 811, + 830, 857, 812, 831, 858, 572, 813, 760, 775, 824, + 764, 777, 825, 802, 826, 856, 850, 859, 870, 872, + 873, 876, 477, 478, 63, 64, 65, 183, 347, 505, + 66, 220, 364, 290, 363, 408, 506, 607, 608, 609, + 610, 611, 605, 612, 641, 526, 642, 423, 528, 509, + 510, 511, 67, 185, 68, 105, 291, 436, 639, 724, + 766, 366, 435, 781, 276, 348, 516, 409, 517, 616, + 617, 518, 679, 740, 519, 680, 741, 69, 70, 71, + 72, 73, 279, 410, 618, 74, 75, 76, 188, 278, + 77, 280, 411, 619, 78, 241, 242, 303, 243, 783, + 806, 784, 79, 111, 368, 549, 698, 643, 699, 644, + 696, 697, 695, 424, 245, 390, 330, 80, 81, 112, + 369, 193, 283, 425, 352, 426, 532, 533, 531, 535 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1138,346 +1139,342 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 108, 110, 163, 144, 92, 159, 93, 204, 399, 103, - 104, 205, 160, 198, 201, 161, 113, 162, 47, 51, - 202, 143, 60, 61, 62, 320, 690, 226, 227, 422, - 571, 203, 199, 623, 244, 200, 292, 400, 401, 402, - 350, 299, 489, 106, 294, 163, 209, 296, 159, 704, - 436, 705, 717, 425, 788, 160, 8, 4, 161, 518, - 162, 196, 206, 106, 143, 47, 51, 636, 106, 60, - 61, 62, 711, 733, 91, 207, 571, 210, 211, 212, - 213, 789, 790, 426, 527, 215, 625, 8, 507, 218, - 223, 626, 219, 106, 224, 221, 224, 114, 380, 18, - -141, 523, 225, 95, 106, 122, 751, 368, 224, 596, - 128, 129, 510, 119, 132, 133, 134, 135, 344, 416, - 417, 107, 18, 106, 12, 404, 99, 438, 174, 174, - 704, 174, 705, 304, 305, 306, 307, 308, 309, 310, - 311, 107, 511, -312, 312, 313, 107, 788, 123, 418, - 252, 174, 265, 253, 419, 204, 174, 174, 403, 205, - 120, 198, 201, -330, 224, 317, 178, -142, 202, 224, - 489, 224, 122, 122, 789, 790, 254, 255, 491, 203, - 199, 446, 107, 200, 106, 192, 187, 760, 174, 259, - 187, 260, 718, 304, 305, 306, 307, 308, 309, 310, - 311, 107, 551, 194, 312, 313, 214, 174, 216, 196, - -143, -452, 839, -100, -524, 122, 787, 228, 122, 314, - 315, 229, 798, 230, 316, 317, 246, -47, 642, -47, - 388, 389, 390, 813, 247, 571, 807, 808, 809, 464, - 465, 466, 249, -47, -47, 250, -47, -47, 864, 251, - -47, 866, 384, 385, 304, 305, 306, 307, 308, 309, - 310, 311, 107, 386, 387, 312, 313, 256, 416, 417, - 789, 790, -47, 224, 354, 261, -47, 588, 795, 262, - 314, 315, 377, 378, 379, 316, 317, 94, 96, -209, - -47, 98, 101, 460, 461, 204, 462, 463, 418, 205, - 263, 198, 201, 419, 663, 664, 420, 421, 202, 264, - 394, 267, 589, 266, 492, 269, 270, 394, 271, 203, - 199, 571, 272, 200, 273, 274, 502, 503, 275, 688, - 451, 277, 281, 282, -525, 106, 288, 847, 301, 300, - 338, 320, 437, 624, 289, 331, 335, 106, 339, 196, - 545, 630, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 10, 11, 347, 12, 139, 140, - 141, 351, 352, 361, 362, 642, 374, 381, 383, 366, - 571, 375, 468, 560, 376, 382, 397, 445, 47, 51, - -44, 441, 60, 61, 62, 453, 528, 456, 532, 533, - -360, 467, 497, 496, 572, 528, 498, 530, 573, 539, - 540, 541, 544, 320, 416, 417, 554, 550, 669, 670, - 671, 556, 558, 561, 557, 107, 559, 582, 583, 701, - 563, 581, -101, 598, 599, 504, 505, 122, 555, 585, - 600, 622, 586, 587, 418, 506, 591, -287, 608, 419, - 572, 601, 420, 421, 573, 617, 627, 628, 570, 629, - 631, 163, 603, 648, 159, -383, 640, 653, 654, 655, - 143, 160, 252, 656, 161, 657, 162, 658, 660, 661, - 143, 597, 604, 605, 606, 672, 673, 674, 675, 676, - 677, 678, 841, 842, 662, 681, 682, 694, 692, 683, - 714, 684, 691, 693, 570, 700, 615, 616, 702, 712, - 715, 724, 163, 209, 725, 159, 726, 727, 732, -401, - 752, 755, 160, 744, 862, 161, 748, 162, 753, 758, - 754, 143, 762, 766, 764, 772, 781, 779, 163, 163, - 767, 159, 159, -410, 796, 800, 797, 804, 160, 160, - 799, 161, 161, 162, 162, 806, 827, 143, 143, 828, - 832, 834, 5, 835, 843, 6, 7, 8, 9, 846, - 848, 853, 854, 859, 231, 710, 232, 867, 870, 865, - 876, 10, 11, 173, 12, 868, 874, 873, 13, 749, - 233, 234, 372, 235, 236, 373, 833, 237, 100, 97, - 524, 14, 15, 16, 17, 687, 458, 457, 175, 572, - 18, 19, 459, 573, 20, 590, 665, 21, 713, 238, - 647, 761, 584, 239, 22, 23, 450, 836, 548, 745, - 709, 24, 25, 703, 689, 838, 863, 240, 545, 840, - 442, 409, 537, 189, 455, 845, 728, 26, 515, 0, - 0, -53, 651, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 570, 0, 0, 47, 51, 0, 0, - 60, 61, 62, 0, 0, 0, 92, 0, 720, 0, - 0, 729, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 572, 0, 0, 0, 573, - 0, 746, 106, 6, 0, 0, 443, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 195, 137, 0, 0, - 0, 0, 12, 0, 140, 141, 0, 0, 0, 0, - 0, 92, 0, 720, 0, 837, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 47, 51, 570, - 0, 60, 61, 62, 572, 0, 0, 803, 573, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 92, 0, - 802, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 107, 0, 0, 0, 0, 0, 0, 0, 0, 444, - 0, 0, 0, 0, 0, 0, 163, 851, 0, 159, - 0, 394, 394, 0, 0, 0, 160, 0, 570, 161, - 0, 162, 0, 0, 0, 143, 844, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 470, 0, - -392, 6, 0, 394, 9, -392, -392, -392, -392, -392, - -392, -392, -392, -392, -392, -392, -392, 10, 11, 0, - 12, 0, -392, -392, 13, 0, 0, 416, 417, 471, - 472, -392, 0, 0, 0, 0, 0, 14, 0, 0, - 0, 483, 484, 485, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 106, 0, - 22, 23, 0, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 137, 138, 0, 0, 0, -392, 139, - 140, 141, 470, 0, -392, 6, 0, -86, 9, -392, - -392, -392, -392, -392, -392, -392, -392, -392, -392, -392, - -392, 10, 11, 0, 12, 0, -392, -392, 13, 0, - 0, 416, 417, 471, 472, -392, 0, 0, 0, 0, - 0, 14, 0, 0, 0, 483, 484, 485, 0, 0, - 0, 0, 0, 0, 0, 0, 107, 0, 0, 0, - 0, 0, 174, 0, 22, 23, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -392, 0, 0, 0, 470, 0, -392, 6, - 0, -537, 9, -392, -392, -392, -392, -392, -392, -392, - -392, -392, -392, -392, -392, 10, 11, 0, 12, 0, - -392, -392, 13, 0, 0, 416, 417, 471, 472, -392, - 0, 0, 0, 0, 0, 14, 0, 0, 0, 516, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 517, - 0, 0, 0, 0, 0, 0, 0, 0, 22, 23, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -392, 0, 0, 0, - 470, 0, -392, 6, 0, -504, 9, -392, -392, -392, - -392, -392, -392, -392, -392, -392, -392, -392, -392, 10, - 11, 0, 12, 0, -392, -392, 13, 0, 0, 416, - 417, 471, 472, -392, 0, 470, 0, -392, 6, 14, - 0, 9, -392, -392, -392, -392, -392, -392, -392, -392, - -392, -392, -392, -392, 10, 11, 0, 12, 0, -392, - -392, 13, 22, 23, 416, 417, 471, 472, -392, 0, - 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, - -392, 0, 0, 0, 0, 0, 0, 0, 0, -68, - 0, 0, 0, 0, 106, 0, 0, 22, 23, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 195, 137, - 138, 0, 0, 0, 0, -392, 140, 141, 0, 470, - 0, -392, 6, 0, -90, 9, -392, -392, -392, -392, - -392, -392, -392, -392, -392, -392, -392, -392, 10, 11, - 0, 12, 0, -392, -392, 13, 0, 0, 416, 417, - 471, 472, -392, 0, 0, 0, 0, 0, 14, 0, - 0, 0, 0, -2, 5, 0, 0, 6, 7, 8, - 9, 0, 107, 0, 0, 0, 0, 0, 0, 0, - 0, 22, 23, 10, 11, 0, 12, 0, 0, 0, - 13, 0, 0, 0, 0, 0, 0, 0, 0, -392, - 0, 0, 0, 14, 15, 16, 17, 0, -528, 0, - 0, 0, 18, 19, 0, 0, 20, 5, 0, 21, - 6, 7, 8, 9, 0, 0, 22, 23, 0, 0, - 0, 0, 0, 24, 25, 0, 10, 11, 0, 12, - 0, 0, 0, 13, 0, 0, 0, 0, 0, 26, - -210, 0, 0, 0, 0, 0, 14, 15, 16, 17, - 0, 0, 0, 0, 0, 18, 19, 0, 0, 20, - 0, 0, 21, 0, 0, 0, 0, 0, 0, 22, - 23, 0, 0, 0, 0, 0, 24, 25, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 593, 0, 106, - 0, 0, 26, -210, 127, 128, 129, 130, 131, 132, + 108, 110, 163, 144, 92, 159, 93, 204, 47, 103, + 104, 160, 205, 161, 398, 162, 113, 320, 51, 60, + 198, 143, 61, 690, 62, 418, 226, 227, 201, 202, + 485, 203, 621, 244, 292, 568, 399, 400, 401, 349, + 199, 200, 299, 106, 515, 163, 209, 18, 159, 718, + 432, 99, 294, 296, 160, 47, 161, 106, 162, 789, + 634, 196, 206, 711, 143, 51, 60, 734, 106, 61, + 421, 62, 623, 383, 384, 207, 8, 210, 211, 212, + 213, 504, 568, 704, 524, 215, 790, 791, 705, 218, + 379, 252, 219, 624, 253, 221, 106, 259, 520, 260, + 106, 594, 128, 129, 752, 367, 132, 133, 134, 135, + 412, 413, 223, 4, 422, 789, 12, -141, 224, 18, + 119, 107, 122, 95, 123, 434, 507, 304, 305, 306, + 307, 308, 309, 310, 311, 107, 174, 174, 312, 313, + 414, 174, 790, 791, 174, 415, 107, 174, -313, 91, + 224, 174, 265, 314, 315, 204, 485, 106, 316, 317, + 205, 120, 187, 8, 761, 114, 187, 704, 198, 487, + 508, 224, 705, 174, 107, 493, 201, 202, 224, 203, + 174, 442, 214, -331, 216, 412, 413, 178, 199, 200, + 106, -142, 225, 788, 719, -143, 122, 548, 224, 799, + 122, 254, 255, -100, 385, 386, 501, 502, 122, 196, + 814, 122, 840, 192, 492, 414, 503, 387, 388, 389, + 415, 194, 640, 416, 417, 790, 791, 304, 305, 306, + 307, 308, 309, 310, 311, 107, 94, 96, 312, 313, + 412, 413, 98, 101, 568, 460, 461, 462, 865, 456, + 457, 867, -453, 314, 315, 808, 809, 810, 316, 317, + 304, 305, 306, 307, 308, 309, 310, 311, 107, -525, + 414, 312, 313, 228, 353, 415, 458, 459, 416, 417, + 229, 796, 230, 376, 377, 378, 661, 662, 246, 247, + 249, 250, 317, 251, 204, 224, 256, 261, 262, 205, + 263, 264, -209, 106, 266, 301, 267, 198, 273, 300, + 393, 269, 488, 270, 331, 201, 202, 393, 203, 271, + 272, 499, 500, 274, 335, 275, 688, 199, 200, 447, + 320, 568, 277, 281, 282, -526, 289, 288, 622, 339, + 848, 433, 338, 346, 350, 542, 628, 351, 196, 360, + 361, 373, 365, 380, 374, 402, -361, 106, 663, 375, + 381, 396, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 195, 640, 382, 437, 449, 441, 47, 557, 140, + 141, 464, 452, -44, 463, 527, 536, 51, 60, 537, + 568, 61, 525, 62, 529, 530, 538, 541, 551, 664, + 569, 525, 553, 320, 555, 570, 558, 554, 556, 587, + 560, 578, 579, 547, 669, 670, 671, 106, 580, 701, + 582, 583, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 195, 137, 138, 552, 107, 584, 596, 585, 140, + 141, 586, 589, -288, 620, 597, 598, 569, 599, 606, + 615, 625, 570, 626, 567, 627, 629, 646, 163, 601, + -384, 159, 638, 651, 652, 653, 143, 160, 654, 161, + 655, 162, 656, 658, 659, 252, 672, 143, 595, 602, + 603, 604, 673, 674, 675, 676, 677, 678, 681, 694, + 660, 682, 683, 700, 684, 107, 691, 693, 702, 842, + 843, 567, 692, 613, 614, 713, 725, 726, 727, 163, + 209, 728, 159, 733, -402, 715, 716, 749, 160, 753, + 161, 754, 162, 745, 756, 759, 763, 765, 143, 767, + 755, 863, 773, 780, 768, 163, 163, 782, 159, 159, + -411, 797, 798, 801, 160, 160, 161, 161, 162, 162, + 800, 805, 807, 833, 143, 143, 828, 829, 836, 835, + 844, 849, 854, 847, 855, 860, 866, 871, 868, 869, + 106, 875, 710, 877, 173, 127, 128, 129, 130, 131, + 132, 133, 134, 135, 136, 137, 138, 10, 11, 834, + 12, 139, 140, 141, 874, 371, 372, 750, 100, 97, + 521, 687, 175, 712, 453, 665, 645, 581, 454, 569, + 455, 106, 6, 762, 570, 439, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 195, 137, 545, 709, 405, + -47, 12, -47, 140, 141, 837, 446, 746, 542, 839, + 714, 689, 841, 864, 189, 451, -47, -47, 107, -47, + -47, 438, 534, -47, 47, -101, 846, 649, 0, 0, + 122, 512, 729, 567, 51, 60, 0, 0, 61, 0, + 62, 0, 0, 0, 0, -47, 92, 0, 721, -47, + 0, 730, 0, 0, 0, 0, 0, 0, 0, 107, + 0, 0, 0, -47, 0, 0, 569, 591, 440, 106, + 0, 570, 747, 0, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 10, 11, 0, 12, - 139, 140, 141, 5, 0, 0, 6, 7, 8, 9, + 139, 140, 141, 231, 0, 232, 0, 0, 0, 0, + 0, 0, 92, 0, 721, 838, 0, 0, 47, 233, + 234, 0, 235, 236, 0, 0, 237, 0, 51, 60, + 567, 0, 61, 0, 62, 569, 0, 0, 804, 0, + 570, 0, 0, 0, 0, 0, 0, 0, 238, 92, + 0, 803, 239, 0, 0, 0, 0, 107, 0, 0, + 0, 0, 0, 174, 0, 0, 240, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 163, 852, 0, + 159, 0, 393, 393, 0, 0, 160, 0, 161, 567, + 162, 0, 0, 0, 0, 0, 143, 845, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 466, + 0, -393, 6, 0, 393, 9, -393, -393, -393, -393, + -393, -393, -393, -393, -393, -393, -393, -393, 10, 11, + 0, 12, 0, -393, -393, 13, 0, 0, 412, 413, + 467, 468, -393, 0, 0, 0, 0, 0, 14, 0, + 0, 0, 479, 480, 481, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 106, + 0, 22, 23, 0, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 0, 0, 0, -393, + 139, 140, 141, 466, 0, -393, 6, 0, -86, 9, + -393, -393, -393, -393, -393, -393, -393, -393, -393, -393, + -393, -393, 10, 11, 0, 12, 0, -393, -393, 13, + 0, 0, 412, 413, 467, 468, -393, 0, 0, 0, + 0, 0, 14, 0, 0, 0, 479, 480, 481, 0, + 0, 0, 0, 0, 0, 0, 0, 107, 0, 0, + 0, 0, 0, 174, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 10, 11, 0, 12, 0, 0, 5, 13, - 0, 6, 7, 8, 9, 0, 0, 0, 0, 0, - 0, 0, 14, 15, 16, 17, 0, 10, 11, 0, - 12, 18, 19, 0, 13, 20, 0, 107, 21, 0, - 0, 0, 0, 174, 0, 22, 23, 14, 15, 16, - 17, 0, 24, 25, 703, 0, 18, 19, 0, 0, - 20, 0, 0, 21, 0, 0, 0, 0, 26, 0, - 22, 23, 0, 0, 106, 0, 0, 24, 25, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 10, 11, 26, 12, 139, 140, 141, 593, 0, - 106, 0, 0, 0, 0, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 10, 11, 106, - 12, 139, 140, 141, 127, 128, 129, 130, 131, 132, - 133, 134, 135, 136, 137, 138, 10, 11, 0, 12, - 139, 140, 141, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 107, 0, 106, 0, 0, 0, 174, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 195, 137, - 138, 0, 0, 0, 0, 0, 140, 141, 107, 0, - 0, 106, 0, 0, 0, 569, 127, 128, 129, 130, - 131, 132, 133, 134, 135, 195, 0, 107, 0, 0, - 0, 0, 0, 140, 141, 0, 0, 0, 0, 0, + 0, 0, 0, -393, 0, 0, 0, 466, 0, -393, + 6, 0, -538, 9, -393, -393, -393, -393, -393, -393, + -393, -393, -393, -393, -393, -393, 10, 11, 0, 12, + 0, -393, -393, 13, 0, 0, 412, 413, 467, 468, + -393, 0, 0, 0, 0, 0, 14, 0, 0, 0, + 513, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 514, 0, 0, 0, 0, 0, 0, 0, 0, 22, + 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -393, 0, 0, + 0, 466, 0, -393, 6, 0, -505, 9, -393, -393, + -393, -393, -393, -393, -393, -393, -393, -393, -393, -393, + 10, 11, 0, 12, 0, -393, -393, 13, 0, 0, + 412, 413, 467, 468, -393, 0, 466, 0, -393, 6, + 14, 0, 9, -393, -393, -393, -393, -393, -393, -393, + -393, -393, -393, -393, -393, 10, 11, 0, 12, 0, + -393, -393, 13, 22, 23, 412, 413, 467, 468, -393, + 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, + 0, -393, 0, 0, 0, 0, 0, 0, 0, 0, + -68, 0, 0, 0, 0, 0, 0, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -393, 0, 0, 0, + 466, 0, -393, 6, 0, -90, 9, -393, -393, -393, + -393, -393, -393, -393, -393, -393, -393, -393, -393, 10, + 11, 0, 12, 0, -393, -393, 13, 0, 0, 412, + 413, 467, 468, -393, 0, 0, 0, 0, 0, 14, + 0, 0, 0, 0, 0, 5, 0, 0, 6, 7, + 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 22, 23, 10, 11, 0, 12, 0, 0, + 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, + -393, 0, 0, 0, 14, 15, 16, 17, 0, -529, + 0, 0, 0, 18, 19, 0, 0, 20, -2, 5, + 21, 0, 6, 7, 8, 9, 0, 22, 23, 0, + 0, 0, 0, 0, 24, 25, 703, 0, 10, 11, + 0, 12, 0, 0, 0, 13, 0, 0, 0, 0, + 26, 0, 0, 0, -53, 0, 0, 0, 14, 15, + 16, 17, 0, 0, 0, 0, 0, 18, 19, 0, + 0, 20, 5, 0, 21, 6, 7, 8, 9, 0, + 0, 22, 23, 0, 0, 0, 0, 0, 24, 25, + 0, 10, 11, 0, 12, 0, 0, 5, 13, 0, + 6, 7, 8, 9, 26, -210, 0, 0, 0, 0, + 0, 14, 15, 16, 17, 0, 10, 11, 0, 12, + 18, 19, 0, 13, 20, 0, 0, 21, 0, 0, + 0, 0, 0, 0, 22, 23, 14, 15, 16, 17, + 0, 24, 25, 0, 0, 18, 19, 0, 0, 20, + 5, 0, 21, 6, 7, 8, 9, 26, -210, 22, + 23, 0, 0, 0, 0, 0, 24, 25, 703, 10, + 11, 0, 12, 0, 0, 0, 13, 0, 0, 0, + 0, 0, 26, 0, 0, 0, 0, 0, 0, 14, + 15, 16, 17, 0, 0, 0, 0, 0, 18, 19, + 0, 0, 20, 0, 0, 21, 0, 0, 0, 0, + 0, 0, 22, 23, 0, 0, 106, 0, 0, 24, + 25, 127, 128, 129, 130, 131, 132, 133, 134, 135, + 136, 137, 138, 10, 11, 26, 12, 139, 140, 141, + 591, 0, 106, 0, 0, 0, 0, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 10, + 11, 106, 12, 139, 140, 141, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 10, 11, + 0, 12, 139, 140, 141, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 107, 0, 106, 0, 0, 0, + 174, 127, 128, 129, 130, 131, 132, 133, 134, 135, + 195, 137, 138, 0, 0, 0, 0, 0, 140, 141, + 107, 0, 0, 0, 0, 0, 0, 566, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 107 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 107 }; static const yytype_int16 yycheck[] = { - 22, 23, 43, 43, 14, 43, 14, 83, 339, 19, - 20, 83, 43, 83, 83, 43, 26, 43, 2, 2, - 83, 43, 2, 2, 2, 244, 635, 111, 112, 353, - 480, 83, 83, 526, 118, 83, 222, 341, 342, 343, - 278, 231, 396, 3, 3, 86, 86, 3, 86, 650, - 363, 650, 680, 353, 1, 86, 6, 0, 86, 413, - 86, 83, 84, 3, 86, 49, 49, 3, 3, 49, - 49, 49, 3, 3, 3, 85, 526, 87, 88, 89, - 90, 28, 29, 353, 19, 95, 3, 6, 412, 99, - 75, 3, 102, 3, 81, 105, 81, 91, 317, 49, - 88, 414, 75, 53, 3, 93, 734, 293, 81, 8, - 9, 10, 412, 88, 13, 14, 15, 16, 105, 30, - 31, 81, 49, 3, 23, 344, 53, 365, 87, 87, - 731, 87, 731, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 412, 90, 84, 85, 81, 1, 36, 60, - 8, 87, 174, 11, 65, 231, 87, 87, 344, 231, - 88, 231, 231, 88, 81, 105, 22, 88, 231, 81, - 524, 81, 93, 93, 28, 29, 8, 9, 397, 231, - 231, 371, 81, 231, 3, 89, 74, 740, 87, 92, - 78, 94, 685, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 440, 88, 84, 85, 94, 87, 96, 231, - 88, 88, 821, 88, 88, 93, 769, 89, 93, 99, - 100, 89, 775, 88, 104, 105, 88, 4, 552, 6, - 101, 102, 103, 786, 48, 685, 35, 36, 37, 388, - 389, 390, 89, 20, 21, 88, 23, 24, 857, 89, - 27, 860, 82, 83, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 99, 100, 84, 85, 91, 30, 31, - 28, 29, 49, 81, 284, 91, 53, 496, 771, 91, - 99, 100, 314, 315, 316, 104, 105, 15, 16, 87, - 67, 16, 17, 384, 385, 371, 386, 387, 60, 371, - 88, 371, 371, 65, 579, 580, 68, 69, 371, 88, - 332, 89, 498, 88, 398, 88, 88, 339, 88, 371, - 371, 771, 88, 371, 89, 88, 410, 411, 89, 633, - 371, 88, 88, 88, 88, 3, 89, 830, 3, 91, - 91, 560, 364, 529, 93, 92, 8, 3, 47, 371, - 434, 537, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 105, 23, 24, 25, - 26, 89, 89, 89, 89, 699, 3, 96, 98, 93, - 830, 92, 392, 467, 94, 97, 94, 371, 372, 372, - 90, 89, 372, 372, 372, 92, 418, 106, 420, 421, - 107, 94, 106, 95, 480, 427, 94, 58, 480, 90, - 95, 107, 94, 632, 30, 31, 88, 439, 604, 605, - 606, 88, 3, 94, 90, 81, 89, 88, 92, 648, - 90, 90, 88, 503, 503, 51, 52, 93, 448, 92, - 503, 31, 92, 92, 60, 61, 90, 90, 90, 65, - 526, 503, 68, 69, 526, 90, 88, 88, 480, 88, - 88, 502, 503, 29, 502, 90, 90, 88, 88, 88, - 492, 502, 8, 88, 502, 88, 502, 88, 88, 88, - 502, 503, 504, 505, 506, 88, 88, 88, 88, 88, - 88, 88, 823, 824, 578, 88, 88, 66, 94, 90, - 106, 90, 90, 90, 526, 88, 516, 517, 88, 88, - 105, 88, 553, 553, 88, 553, 88, 90, 88, 35, - 88, 35, 553, 108, 855, 553, 90, 553, 89, 38, - 106, 553, 55, 91, 94, 106, 3, 59, 579, 580, - 105, 579, 580, 106, 94, 62, 105, 92, 579, 580, - 105, 579, 580, 579, 580, 106, 94, 579, 580, 106, - 88, 93, 1, 90, 105, 4, 5, 6, 7, 94, - 39, 106, 106, 93, 4, 659, 6, 88, 75, 105, - 75, 20, 21, 49, 23, 106, 94, 106, 27, 731, - 20, 21, 298, 23, 24, 298, 815, 27, 17, 16, - 415, 40, 41, 42, 43, 632, 382, 381, 50, 685, - 49, 50, 383, 685, 53, 498, 590, 56, 667, 49, - 553, 741, 492, 53, 63, 64, 371, 818, 435, 722, - 652, 70, 71, 72, 634, 820, 856, 67, 722, 822, - 370, 346, 427, 78, 376, 827, 699, 86, 412, -1, - -1, 90, 560, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 685, -1, -1, 650, 650, -1, -1, - 650, 650, 650, -1, -1, -1, 686, -1, 686, -1, - -1, 703, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 771, -1, -1, -1, 771, - -1, 723, 3, 4, -1, -1, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, -1, -1, - -1, -1, 23, -1, 25, 26, -1, -1, -1, -1, - -1, 741, -1, 741, -1, 819, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 731, 731, 771, - -1, 731, 731, 731, 830, -1, -1, 779, 830, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 778, -1, - 778, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 81, -1, -1, -1, -1, -1, -1, -1, -1, 90, - -1, -1, -1, -1, -1, -1, 837, 837, -1, 837, - -1, 823, 824, -1, -1, -1, 837, -1, 830, 837, - -1, 837, -1, -1, -1, 837, 826, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, - 3, 4, -1, 855, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, - 23, -1, 25, 26, 27, -1, -1, 30, 31, 32, - 33, 34, -1, -1, -1, -1, -1, 40, -1, -1, - -1, 44, 45, 46, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 3, -1, - 63, 64, -1, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, -1, -1, -1, 81, 24, - 25, 26, 1, -1, 3, 4, -1, 90, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, -1, 23, -1, 25, 26, 27, -1, - -1, 30, 31, 32, 33, 34, -1, -1, -1, -1, - -1, 40, -1, -1, -1, 44, 45, 46, -1, -1, - -1, -1, -1, -1, -1, -1, 81, -1, -1, -1, - -1, -1, 87, -1, 63, 64, -1, -1, -1, -1, + 22, 23, 43, 43, 14, 43, 14, 83, 2, 19, + 20, 43, 83, 43, 339, 43, 26, 244, 2, 2, + 83, 43, 2, 633, 2, 352, 111, 112, 83, 83, + 395, 83, 523, 118, 222, 476, 341, 342, 343, 278, + 83, 83, 231, 3, 409, 86, 86, 49, 86, 680, + 362, 53, 3, 3, 86, 49, 86, 3, 86, 1, + 3, 83, 84, 3, 86, 49, 49, 3, 3, 49, + 352, 49, 3, 82, 83, 85, 6, 87, 88, 89, + 90, 408, 523, 648, 19, 95, 28, 29, 648, 99, + 317, 8, 102, 3, 11, 105, 3, 92, 410, 94, + 3, 8, 9, 10, 735, 293, 13, 14, 15, 16, + 30, 31, 75, 0, 352, 1, 23, 88, 81, 49, + 88, 81, 93, 53, 36, 364, 408, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 87, 87, 84, 85, + 60, 87, 28, 29, 87, 65, 81, 87, 90, 3, + 81, 87, 174, 99, 100, 231, 521, 3, 104, 105, + 231, 88, 74, 6, 741, 91, 78, 732, 231, 396, + 408, 81, 732, 87, 81, 402, 231, 231, 81, 231, + 87, 370, 94, 88, 96, 30, 31, 22, 231, 231, + 3, 88, 75, 770, 685, 88, 93, 436, 81, 776, + 93, 8, 9, 88, 99, 100, 51, 52, 93, 231, + 787, 93, 822, 89, 402, 60, 61, 101, 102, 103, + 65, 88, 549, 68, 69, 28, 29, 73, 74, 75, + 76, 77, 78, 79, 80, 81, 15, 16, 84, 85, + 30, 31, 16, 17, 685, 387, 388, 389, 858, 383, + 384, 861, 88, 99, 100, 35, 36, 37, 104, 105, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 88, + 60, 84, 85, 89, 284, 65, 385, 386, 68, 69, + 89, 772, 88, 314, 315, 316, 576, 577, 88, 48, + 89, 88, 105, 89, 370, 81, 91, 91, 91, 370, + 88, 88, 87, 3, 88, 3, 89, 370, 89, 91, + 332, 88, 397, 88, 92, 370, 370, 339, 370, 88, + 88, 406, 407, 88, 8, 89, 631, 370, 370, 370, + 557, 772, 88, 88, 88, 88, 93, 89, 526, 47, + 831, 363, 91, 105, 89, 430, 534, 89, 370, 89, + 89, 3, 93, 96, 92, 105, 107, 3, 585, 94, + 97, 94, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 699, 98, 89, 92, 370, 371, 463, 25, + 26, 391, 106, 90, 94, 58, 90, 371, 371, 95, + 831, 371, 414, 371, 416, 417, 107, 94, 88, 587, + 476, 423, 88, 630, 3, 476, 94, 90, 89, 94, + 90, 90, 88, 435, 602, 603, 604, 3, 92, 646, + 92, 92, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 444, 81, 92, 500, 95, 25, + 26, 106, 90, 90, 31, 500, 500, 523, 500, 90, + 90, 88, 523, 88, 476, 88, 88, 29, 499, 500, + 90, 499, 90, 88, 88, 88, 488, 499, 88, 499, + 88, 499, 88, 88, 88, 8, 88, 499, 500, 501, + 502, 503, 88, 88, 88, 88, 88, 88, 88, 66, + 575, 88, 90, 88, 90, 81, 90, 90, 88, 824, + 825, 523, 94, 513, 514, 88, 88, 88, 88, 550, + 550, 90, 550, 88, 35, 106, 105, 90, 550, 88, + 550, 89, 550, 108, 35, 38, 55, 94, 550, 91, + 106, 856, 106, 59, 105, 576, 577, 3, 576, 577, + 106, 94, 105, 62, 576, 577, 576, 577, 576, 577, + 105, 92, 106, 88, 576, 577, 94, 106, 90, 93, + 105, 39, 106, 94, 106, 93, 105, 75, 88, 106, + 3, 94, 657, 75, 49, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 816, + 23, 24, 25, 26, 106, 298, 298, 732, 17, 16, + 411, 630, 50, 665, 380, 587, 550, 488, 381, 685, + 382, 3, 4, 742, 685, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 431, 650, 345, + 4, 23, 6, 25, 26, 819, 370, 723, 723, 821, + 667, 632, 823, 857, 78, 375, 20, 21, 81, 23, + 24, 369, 423, 27, 648, 88, 828, 557, -1, -1, + 93, 408, 699, 685, 648, 648, -1, -1, 648, -1, + 648, -1, -1, -1, -1, 49, 686, -1, 686, 53, + -1, 703, -1, -1, -1, -1, -1, -1, -1, 81, + -1, -1, -1, 67, -1, -1, 772, 1, 90, 3, + -1, 772, 724, -1, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, + 24, 25, 26, 4, -1, 6, -1, -1, -1, -1, + -1, -1, 742, -1, 742, 820, -1, -1, 732, 20, + 21, -1, 23, 24, -1, -1, 27, -1, 732, 732, + 772, -1, 732, -1, 732, 831, -1, -1, 780, -1, + 831, -1, -1, -1, -1, -1, -1, -1, 49, 779, + -1, 779, 53, -1, -1, -1, -1, 81, -1, -1, + -1, -1, -1, 87, -1, -1, 67, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 838, 838, -1, + 838, -1, 824, 825, -1, -1, 838, -1, 838, 831, + 838, -1, -1, -1, -1, -1, 838, 827, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, + -1, 3, 4, -1, 856, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + -1, 23, -1, 25, 26, 27, -1, -1, 30, 31, + 32, 33, 34, -1, -1, -1, -1, -1, 40, -1, + -1, -1, 44, 45, 46, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, + -1, 63, 64, -1, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, -1, -1, -1, 81, + 24, 25, 26, 1, -1, 3, 4, -1, 90, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, -1, 23, -1, 25, 26, 27, + -1, -1, 30, 31, 32, 33, 34, -1, -1, -1, + -1, -1, 40, -1, -1, -1, 44, 45, 46, -1, + -1, -1, -1, -1, -1, -1, -1, 81, -1, -1, + -1, -1, -1, 87, -1, 63, 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 81, -1, -1, -1, 1, -1, 3, 4, - -1, 90, 7, 8, 9, 10, 11, 12, 13, 14, + -1, -1, -1, 81, -1, -1, -1, 1, -1, 3, + 4, -1, 90, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, + -1, 25, 26, 27, -1, -1, 30, 31, 32, 33, + 34, -1, -1, -1, -1, -1, 40, -1, -1, -1, + 44, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 54, -1, -1, -1, -1, -1, -1, -1, -1, 63, + 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 81, -1, -1, + -1, 1, -1, 3, 4, -1, 90, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, -1, 23, -1, 25, 26, 27, -1, -1, + 30, 31, 32, 33, 34, -1, 1, -1, 3, 4, + 40, -1, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, -1, - 25, 26, 27, -1, -1, 30, 31, 32, 33, 34, - -1, -1, -1, -1, -1, 40, -1, -1, -1, 44, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 54, - -1, -1, -1, -1, -1, -1, -1, -1, 63, 64, + 25, 26, 27, 63, 64, 30, 31, 32, 33, 34, + -1, -1, -1, -1, -1, 40, -1, -1, -1, -1, + -1, 81, -1, -1, -1, -1, -1, -1, -1, -1, + 90, -1, -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, -1, -1, -1, 1, -1, 3, 4, -1, 90, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, -1, 25, 26, 27, -1, -1, 30, - 31, 32, 33, 34, -1, 1, -1, 3, 4, 40, - -1, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, -1, 23, -1, 25, - 26, 27, 63, 64, 30, 31, 32, 33, 34, -1, - -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, - 81, -1, -1, -1, -1, -1, -1, -1, -1, 90, - -1, -1, -1, -1, 3, -1, -1, 63, 64, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, -1, -1, -1, -1, 81, 25, 26, -1, 1, - -1, 3, 4, -1, 90, 7, 8, 9, 10, 11, + 31, 32, 33, 34, -1, -1, -1, -1, -1, 40, + -1, -1, -1, -1, -1, 1, -1, -1, 4, 5, + 6, 7, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 63, 64, 20, 21, -1, 23, -1, -1, + -1, 27, -1, -1, -1, -1, -1, -1, -1, -1, + 81, -1, -1, -1, 40, 41, 42, 43, -1, 90, + -1, -1, -1, 49, 50, -1, -1, 53, 0, 1, + 56, -1, 4, 5, 6, 7, -1, 63, 64, -1, + -1, -1, -1, -1, 70, 71, 72, -1, 20, 21, + -1, 23, -1, -1, -1, 27, -1, -1, -1, -1, + 86, -1, -1, -1, 90, -1, -1, -1, 40, 41, + 42, 43, -1, -1, -1, -1, -1, 49, 50, -1, + -1, 53, 1, -1, 56, 4, 5, 6, 7, -1, + -1, 63, 64, -1, -1, -1, -1, -1, 70, 71, + -1, 20, 21, -1, 23, -1, -1, 1, 27, -1, + 4, 5, 6, 7, 86, 87, -1, -1, -1, -1, + -1, 40, 41, 42, 43, -1, 20, 21, -1, 23, + 49, 50, -1, 27, 53, -1, -1, 56, -1, -1, + -1, -1, -1, -1, 63, 64, 40, 41, 42, 43, + -1, 70, 71, -1, -1, 49, 50, -1, -1, 53, + 1, -1, 56, 4, 5, 6, 7, 86, 87, 63, + 64, -1, -1, -1, -1, -1, 70, 71, 72, 20, + 21, -1, 23, -1, -1, -1, 27, -1, -1, -1, + -1, -1, 86, -1, -1, -1, -1, -1, -1, 40, + 41, 42, 43, -1, -1, -1, -1, -1, 49, 50, + -1, -1, 53, -1, -1, 56, -1, -1, -1, -1, + -1, -1, 63, 64, -1, -1, 3, -1, -1, 70, + 71, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 86, 23, 24, 25, 26, + 1, -1, 3, -1, -1, -1, -1, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 3, 23, 24, 25, 26, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - -1, 23, -1, 25, 26, 27, -1, -1, 30, 31, - 32, 33, 34, -1, -1, -1, -1, -1, 40, -1, - -1, -1, -1, 0, 1, -1, -1, 4, 5, 6, - 7, -1, 81, -1, -1, -1, -1, -1, -1, -1, - -1, 63, 64, 20, 21, -1, 23, -1, -1, -1, - 27, -1, -1, -1, -1, -1, -1, -1, -1, 81, - -1, -1, -1, 40, 41, 42, 43, -1, 90, -1, - -1, -1, 49, 50, -1, -1, 53, 1, -1, 56, - 4, 5, 6, 7, -1, -1, 63, 64, -1, -1, - -1, -1, -1, 70, 71, -1, 20, 21, -1, 23, - -1, -1, -1, 27, -1, -1, -1, -1, -1, 86, - 87, -1, -1, -1, -1, -1, 40, 41, 42, 43, - -1, -1, -1, -1, -1, 49, 50, -1, -1, 53, - -1, -1, 56, -1, -1, -1, -1, -1, -1, 63, - 64, -1, -1, -1, -1, -1, 70, 71, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 1, -1, 3, - -1, -1, 86, 87, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, - 24, 25, 26, 1, -1, -1, 4, 5, 6, 7, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 20, 21, -1, 23, -1, -1, 1, 27, - -1, 4, 5, 6, 7, -1, -1, -1, -1, -1, - -1, -1, 40, 41, 42, 43, -1, 20, 21, -1, - 23, 49, 50, -1, 27, 53, -1, 81, 56, -1, - -1, -1, -1, 87, -1, 63, 64, 40, 41, 42, - 43, -1, 70, 71, 72, -1, 49, 50, -1, -1, - 53, -1, -1, 56, -1, -1, -1, -1, 86, -1, - 63, 64, -1, -1, 3, -1, -1, 70, 71, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 86, 23, 24, 25, 26, 1, -1, - 3, -1, -1, -1, -1, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 3, - 23, 24, 25, 26, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, - 24, 25, 26, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 81, -1, 3, -1, -1, -1, 87, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, -1, -1, -1, -1, -1, 25, 26, 81, -1, - -1, 3, -1, -1, -1, 34, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, -1, 81, -1, -1, - -1, -1, -1, 25, 26, -1, -1, -1, -1, -1, + -1, 23, 24, 25, 26, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 81, -1, 3, -1, -1, -1, + 87, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, -1, -1, -1, -1, -1, 25, 26, + 81, -1, -1, -1, -1, -1, -1, 34, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 81, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 81 + -1, -1, -1, -1, 81 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1489,89 +1486,89 @@ static const yytype_uint16 yystos[] = 53, 56, 63, 64, 70, 71, 86, 113, 114, 130, 132, 136, 137, 149, 152, 153, 157, 159, 162, 163, 164, 168, 172, 174, 178, 179, 203, 204, 222, 230, - 231, 238, 247, 267, 269, 281, 283, 305, 306, 307, - 349, 400, 401, 402, 403, 404, 408, 430, 432, 455, - 456, 457, 458, 459, 463, 464, 465, 468, 472, 480, - 495, 496, 129, 205, 131, 158, 239, 268, 282, 308, - 350, 3, 202, 255, 157, 53, 157, 172, 174, 53, - 164, 174, 175, 202, 202, 433, 3, 81, 198, 201, - 198, 481, 497, 202, 91, 133, 122, 138, 150, 88, + 231, 239, 248, 268, 270, 282, 284, 306, 307, 308, + 350, 401, 402, 403, 404, 405, 409, 431, 433, 456, + 457, 458, 459, 460, 464, 465, 466, 469, 473, 481, + 496, 497, 129, 205, 131, 158, 240, 269, 283, 309, + 351, 3, 202, 256, 157, 53, 157, 172, 174, 53, + 164, 174, 175, 202, 202, 434, 3, 81, 198, 201, + 198, 482, 498, 202, 91, 133, 122, 138, 150, 88, 88, 121, 93, 160, 154, 123, 165, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 24, - 25, 26, 160, 198, 242, 243, 244, 245, 246, 257, - 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, - 269, 281, 283, 307, 316, 319, 322, 323, 326, 327, - 330, 119, 115, 113, 87, 232, 116, 270, 22, 120, - 117, 118, 124, 405, 125, 431, 126, 160, 466, 466, - 127, 128, 89, 499, 88, 17, 198, 209, 257, 260, - 261, 262, 263, 264, 323, 327, 198, 202, 240, 242, + 25, 26, 160, 198, 243, 244, 245, 246, 247, 258, + 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, + 270, 282, 284, 308, 317, 320, 323, 324, 327, 328, + 331, 119, 115, 113, 87, 232, 116, 271, 22, 120, + 117, 118, 124, 406, 125, 432, 126, 160, 467, 467, + 127, 128, 89, 500, 88, 17, 198, 209, 258, 261, + 262, 263, 264, 265, 324, 328, 198, 202, 241, 243, 202, 202, 202, 202, 160, 202, 160, 169, 202, 202, - 409, 202, 199, 75, 81, 75, 231, 231, 89, 89, + 410, 202, 199, 75, 81, 75, 231, 231, 89, 89, 88, 4, 6, 20, 21, 23, 24, 27, 49, 53, - 67, 473, 474, 476, 231, 492, 88, 48, 176, 89, - 88, 89, 8, 11, 8, 9, 91, 320, 173, 92, - 94, 91, 91, 88, 88, 198, 88, 89, 284, 88, - 88, 88, 88, 89, 88, 89, 442, 88, 467, 460, - 469, 88, 88, 500, 206, 241, 309, 351, 89, 93, - 411, 434, 201, 200, 3, 232, 3, 223, 134, 209, - 91, 3, 139, 475, 73, 74, 75, 76, 77, 78, + 67, 474, 475, 477, 231, 493, 88, 48, 176, 89, + 88, 89, 8, 11, 8, 9, 91, 321, 173, 92, + 94, 91, 91, 88, 88, 198, 88, 89, 285, 88, + 88, 88, 88, 89, 88, 89, 443, 88, 468, 461, + 470, 88, 88, 501, 206, 242, 310, 352, 89, 93, + 412, 435, 201, 200, 3, 232, 3, 223, 134, 209, + 91, 3, 139, 476, 73, 74, 75, 76, 77, 78, 79, 80, 84, 85, 99, 100, 104, 105, 198, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, - 494, 92, 161, 155, 166, 8, 211, 221, 91, 47, - 177, 317, 324, 328, 105, 233, 271, 105, 406, 443, - 177, 89, 89, 502, 202, 202, 248, 251, 255, 256, - 331, 89, 89, 170, 412, 410, 93, 439, 201, 482, - 498, 224, 111, 112, 3, 92, 94, 219, 219, 219, - 211, 96, 97, 98, 82, 83, 99, 100, 101, 102, - 103, 493, 151, 195, 198, 185, 180, 94, 321, 195, - 221, 221, 221, 201, 211, 234, 235, 237, 273, 275, - 276, 285, 413, 445, 461, 470, 30, 31, 60, 65, - 68, 69, 338, 339, 344, 422, 424, 425, 491, 501, - 503, 207, 332, 249, 310, 352, 185, 198, 177, 440, - 435, 89, 411, 7, 90, 204, 209, 225, 227, 228, - 265, 307, 135, 92, 140, 476, 106, 213, 214, 215, - 216, 216, 217, 217, 218, 218, 218, 94, 202, 196, - 1, 32, 33, 156, 186, 204, 238, 338, 349, 354, - 359, 400, 401, 44, 45, 46, 167, 181, 182, 186, - 361, 211, 231, 318, 325, 329, 95, 106, 94, 236, - 272, 274, 231, 231, 51, 52, 61, 338, 407, 414, - 422, 424, 427, 428, 429, 491, 44, 54, 186, 444, - 446, 449, 452, 185, 180, 340, 345, 19, 198, 423, - 58, 426, 198, 198, 506, 504, 505, 423, 507, 90, - 95, 107, 333, 335, 94, 231, 312, 315, 274, 171, - 198, 177, 483, 226, 88, 202, 88, 90, 3, 89, - 231, 94, 194, 90, 190, 187, 192, 191, 193, 34, - 198, 244, 323, 327, 360, 383, 188, 189, 362, 184, - 183, 90, 88, 92, 243, 92, 92, 92, 211, 201, - 237, 90, 275, 1, 242, 277, 8, 198, 257, 262, - 263, 264, 290, 307, 198, 198, 198, 420, 90, 415, - 416, 417, 418, 419, 421, 202, 202, 90, 447, 448, - 462, 471, 31, 383, 201, 3, 3, 88, 88, 88, - 201, 88, 208, 336, 334, 250, 3, 311, 313, 353, - 90, 436, 338, 422, 424, 485, 487, 240, 29, 229, - 141, 494, 197, 88, 88, 88, 88, 88, 88, 355, - 88, 88, 231, 277, 277, 236, 280, 278, 286, 201, - 201, 201, 88, 88, 88, 88, 88, 88, 88, 450, - 453, 88, 88, 90, 90, 341, 346, 210, 221, 335, - 251, 90, 94, 90, 66, 490, 488, 489, 484, 486, + 495, 92, 161, 155, 166, 8, 211, 221, 91, 47, + 177, 318, 325, 329, 233, 272, 105, 407, 444, 177, + 89, 89, 503, 202, 202, 249, 252, 256, 257, 332, + 89, 89, 170, 413, 411, 93, 440, 201, 483, 499, + 224, 111, 112, 3, 92, 94, 219, 219, 219, 211, + 96, 97, 98, 82, 83, 99, 100, 101, 102, 103, + 494, 151, 195, 198, 185, 180, 94, 322, 195, 221, + 221, 221, 105, 234, 274, 276, 277, 286, 414, 446, + 462, 471, 30, 31, 60, 65, 68, 69, 339, 340, + 345, 423, 425, 426, 492, 502, 504, 207, 333, 250, + 311, 353, 185, 198, 177, 441, 436, 89, 412, 7, + 90, 204, 209, 225, 227, 228, 266, 308, 135, 92, + 140, 477, 106, 213, 214, 215, 216, 216, 217, 217, + 218, 218, 218, 94, 202, 196, 1, 32, 33, 156, + 186, 204, 239, 339, 350, 355, 360, 401, 402, 44, + 45, 46, 167, 181, 182, 186, 362, 211, 231, 319, + 326, 330, 201, 211, 235, 236, 238, 273, 275, 231, + 231, 51, 52, 61, 339, 408, 415, 423, 425, 428, + 429, 430, 492, 44, 54, 186, 445, 447, 450, 453, + 185, 180, 341, 346, 19, 198, 424, 58, 427, 198, + 198, 507, 505, 506, 424, 508, 90, 95, 107, 334, + 336, 94, 231, 313, 316, 275, 171, 198, 177, 484, + 226, 88, 202, 88, 90, 3, 89, 231, 94, 194, + 90, 190, 187, 192, 191, 193, 34, 198, 245, 324, + 328, 361, 384, 188, 189, 363, 184, 183, 90, 88, + 92, 244, 92, 92, 92, 95, 106, 94, 237, 90, + 276, 1, 243, 278, 8, 198, 258, 263, 264, 265, + 291, 308, 198, 198, 198, 421, 90, 416, 417, 418, + 419, 420, 422, 202, 202, 90, 448, 449, 463, 472, + 31, 384, 201, 3, 3, 88, 88, 88, 201, 88, + 208, 337, 335, 251, 3, 312, 314, 354, 90, 437, + 339, 423, 425, 486, 488, 241, 29, 229, 141, 495, + 197, 88, 88, 88, 88, 88, 88, 356, 88, 88, + 231, 278, 278, 211, 201, 238, 281, 279, 287, 201, + 201, 201, 88, 88, 88, 88, 88, 88, 88, 451, + 454, 88, 88, 90, 90, 342, 347, 210, 221, 336, + 252, 90, 94, 90, 66, 491, 489, 490, 485, 487, 88, 211, 88, 72, 114, 130, 143, 145, 146, 198, - 231, 3, 88, 248, 106, 105, 365, 365, 383, 252, - 255, 337, 314, 437, 88, 88, 88, 90, 487, 198, - 142, 144, 88, 3, 363, 279, 287, 366, 367, 451, - 454, 342, 347, 253, 108, 315, 198, 147, 90, 145, - 356, 365, 88, 89, 106, 35, 368, 371, 38, 385, - 385, 252, 55, 388, 94, 438, 91, 105, 374, 364, - 288, 372, 106, 369, 386, 343, 389, 348, 254, 59, - 441, 3, 477, 479, 375, 376, 357, 385, 1, 28, - 29, 291, 293, 297, 299, 383, 94, 105, 385, 105, - 62, 391, 255, 198, 92, 478, 106, 35, 36, 37, - 377, 380, 384, 385, 296, 301, 300, 289, 292, 294, - 298, 373, 370, 387, 390, 392, 148, 94, 106, 378, - 381, 358, 88, 211, 93, 90, 293, 231, 299, 251, - 371, 195, 195, 105, 202, 479, 94, 383, 39, 394, - 302, 242, 303, 106, 106, 393, 379, 382, 395, 93, - 304, 295, 195, 380, 251, 105, 251, 88, 106, 396, - 75, 397, 398, 106, 94, 399, 75 + 231, 3, 237, 88, 249, 106, 105, 366, 366, 384, + 253, 256, 338, 315, 438, 88, 88, 88, 90, 488, + 198, 142, 144, 88, 3, 364, 280, 288, 367, 368, + 452, 455, 343, 348, 254, 108, 316, 198, 147, 90, + 145, 357, 366, 88, 89, 106, 35, 369, 372, 38, + 386, 386, 253, 55, 389, 94, 439, 91, 105, 375, + 365, 289, 373, 106, 370, 387, 344, 390, 349, 255, + 59, 442, 3, 478, 480, 376, 377, 358, 386, 1, + 28, 29, 292, 294, 298, 300, 384, 94, 105, 386, + 105, 62, 392, 256, 198, 92, 479, 106, 35, 36, + 37, 378, 381, 385, 386, 297, 302, 301, 290, 293, + 295, 299, 374, 371, 388, 391, 393, 148, 94, 106, + 379, 382, 359, 88, 211, 93, 90, 294, 231, 300, + 252, 372, 195, 195, 105, 202, 480, 94, 384, 39, + 395, 303, 243, 304, 106, 106, 394, 380, 383, 396, + 93, 305, 296, 195, 381, 252, 105, 252, 88, 106, + 397, 75, 398, 399, 106, 94, 400, 75 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ @@ -1598,45 +1595,45 @@ static const yytype_uint16 yyr1[] = 219, 219, 219, 220, 220, 220, 220, 220, 220, 220, 220, 220, 220, 221, 223, 222, 224, 224, 225, 225, 225, 226, 225, 227, 227, 228, 229, 229, 230, 231, - 231, 232, 233, 233, 234, 234, 235, 236, 236, 237, - 239, 238, 238, 238, 238, 238, 238, 241, 240, 242, - 242, 243, 243, 243, 244, 244, 244, 244, 244, 244, - 244, 244, 245, 245, 245, 245, 246, 246, 246, 247, - 247, 248, 250, 249, 249, 251, 251, 252, 254, 253, - 253, 255, 256, 257, 257, 258, 258, 258, 259, 259, - 259, 260, 260, 260, 261, 262, 262, 263, 264, 265, - 266, 268, 267, 270, 271, 272, 269, 273, 274, 274, - 276, 275, 278, 279, 277, 280, 277, 282, 281, 284, - 285, 286, 287, 288, 289, 283, 290, 290, 290, 290, - 290, 290, 291, 292, 292, 294, 295, 293, 296, 293, - 297, 298, 298, 300, 299, 301, 302, 299, 304, 303, - 305, 306, 308, 309, 310, 311, 307, 312, 314, 313, - 313, 315, 317, 318, 316, 316, 320, 321, 319, 322, - 324, 325, 323, 323, 326, 328, 329, 327, 327, 330, - 332, 331, 333, 334, 334, 336, 337, 335, 338, 338, - 340, 341, 342, 343, 339, 345, 346, 347, 348, 344, - 350, 351, 352, 353, 349, 355, 356, 357, 358, 354, - 359, 359, 359, 360, 360, 362, 363, 364, 361, 366, - 365, 367, 365, 368, 370, 369, 369, 372, 373, 371, - 375, 374, 376, 374, 377, 379, 378, 378, 381, 382, - 380, 383, 383, 383, 383, 384, 384, 384, 386, 387, - 385, 385, 389, 390, 388, 388, 392, 393, 391, 391, - 395, 396, 394, 394, 397, 399, 398, 398, 400, 401, - 402, 402, 403, 405, 406, 407, 404, 409, 410, 408, - 412, 411, 411, 413, 413, 415, 414, 416, 414, 417, - 414, 418, 414, 419, 414, 420, 414, 421, 414, 422, - 423, 423, 424, 425, 426, 426, 427, 428, 429, 431, - 430, 433, 434, 435, 436, 437, 438, 432, 440, 439, - 439, 441, 441, 443, 444, 442, 445, 445, 446, 447, - 446, 448, 446, 450, 451, 449, 453, 454, 452, 455, - 455, 455, 456, 456, 457, 458, 460, 461, 462, 459, - 463, 464, 465, 467, 466, 469, 470, 471, 468, 472, - 472, 473, 473, 473, 473, 473, 473, 473, 473, 473, - 473, 474, 475, 475, 476, 476, 477, 478, 478, 479, - 481, 482, 483, 484, 480, 485, 486, 486, 488, 487, - 489, 487, 490, 487, 491, 491, 492, 493, 493, 494, - 495, 497, 498, 496, 500, 501, 499, 502, 502, 504, - 503, 505, 503, 506, 503, 507, 503 + 231, 233, 232, 234, 234, 235, 235, 236, 237, 237, + 238, 240, 239, 239, 239, 239, 239, 239, 242, 241, + 243, 243, 244, 244, 244, 245, 245, 245, 245, 245, + 245, 245, 245, 246, 246, 246, 246, 247, 247, 247, + 248, 248, 249, 251, 250, 250, 252, 252, 253, 255, + 254, 254, 256, 257, 258, 258, 259, 259, 259, 260, + 260, 260, 261, 261, 261, 262, 263, 263, 264, 265, + 266, 267, 269, 268, 271, 272, 273, 270, 274, 275, + 275, 277, 276, 279, 280, 278, 281, 278, 283, 282, + 285, 286, 287, 288, 289, 290, 284, 291, 291, 291, + 291, 291, 291, 292, 293, 293, 295, 296, 294, 297, + 294, 298, 299, 299, 301, 300, 302, 303, 300, 305, + 304, 306, 307, 309, 310, 311, 312, 308, 313, 315, + 314, 314, 316, 318, 319, 317, 317, 321, 322, 320, + 323, 325, 326, 324, 324, 327, 329, 330, 328, 328, + 331, 333, 332, 334, 335, 335, 337, 338, 336, 339, + 339, 341, 342, 343, 344, 340, 346, 347, 348, 349, + 345, 351, 352, 353, 354, 350, 356, 357, 358, 359, + 355, 360, 360, 360, 361, 361, 363, 364, 365, 362, + 367, 366, 368, 366, 369, 371, 370, 370, 373, 374, + 372, 376, 375, 377, 375, 378, 380, 379, 379, 382, + 383, 381, 384, 384, 384, 384, 385, 385, 385, 387, + 388, 386, 386, 390, 391, 389, 389, 393, 394, 392, + 392, 396, 397, 395, 395, 398, 400, 399, 399, 401, + 402, 403, 403, 404, 406, 407, 408, 405, 410, 411, + 409, 413, 412, 412, 414, 414, 416, 415, 417, 415, + 418, 415, 419, 415, 420, 415, 421, 415, 422, 415, + 423, 424, 424, 425, 426, 427, 427, 428, 429, 430, + 432, 431, 434, 435, 436, 437, 438, 439, 433, 441, + 440, 440, 442, 442, 444, 445, 443, 446, 446, 447, + 448, 447, 449, 447, 451, 452, 450, 454, 455, 453, + 456, 456, 456, 457, 457, 458, 459, 461, 462, 463, + 460, 464, 465, 466, 468, 467, 470, 471, 472, 469, + 473, 473, 474, 474, 474, 474, 474, 474, 474, 474, + 474, 474, 475, 476, 476, 477, 477, 478, 479, 479, + 480, 482, 483, 484, 485, 481, 486, 487, 487, 489, + 488, 490, 488, 491, 488, 492, 492, 493, 494, 494, + 495, 496, 498, 499, 497, 501, 502, 500, 503, 503, + 505, 504, 506, 504, 507, 504, 508, 504 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1663,45 +1660,45 @@ static const yytype_uint8 yyr2[] = 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 6, 2, 0, 1, 2, 2, 0, 4, 1, 1, 4, 2, 0, 2, 2, - 0, 3, 3, 0, 1, 1, 2, 3, 0, 3, - 0, 3, 1, 1, 1, 2, 1, 0, 3, 1, + 0, 0, 4, 3, 0, 1, 1, 2, 3, 0, + 3, 0, 3, 1, 1, 1, 2, 1, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 0, 4, 0, 1, 1, 2, 0, 4, - 0, 1, 1, 1, 1, 1, 2, 1, 2, 3, - 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, - 1, 0, 3, 0, 0, 0, 7, 2, 2, 0, - 0, 3, 0, 0, 5, 0, 3, 0, 3, 0, - 0, 0, 0, 0, 0, 15, 1, 1, 1, 1, - 1, 1, 2, 2, 0, 0, 0, 6, 0, 3, - 2, 2, 0, 0, 3, 0, 0, 5, 0, 3, - 1, 1, 0, 0, 0, 0, 9, 2, 0, 4, - 0, 2, 0, 0, 6, 2, 0, 0, 6, 6, - 0, 0, 6, 1, 1, 0, 0, 6, 1, 1, - 0, 3, 2, 2, 0, 0, 0, 5, 1, 1, - 0, 0, 0, 0, 9, 0, 0, 0, 0, 9, - 0, 0, 0, 0, 9, 0, 0, 0, 0, 11, - 1, 1, 0, 1, 1, 0, 0, 0, 8, 0, - 3, 0, 4, 2, 0, 4, 0, 0, 0, 5, + 1, 1, 2, 0, 4, 0, 1, 1, 2, 0, + 4, 0, 1, 1, 1, 1, 1, 2, 1, 2, + 3, 2, 1, 1, 2, 1, 1, 1, 1, 1, + 1, 1, 0, 3, 0, 0, 0, 7, 2, 2, + 0, 0, 3, 0, 0, 5, 0, 3, 0, 3, + 0, 0, 0, 0, 0, 0, 15, 1, 1, 1, + 1, 1, 1, 2, 2, 0, 0, 0, 6, 0, + 3, 2, 2, 0, 0, 3, 0, 0, 5, 0, + 3, 1, 1, 0, 0, 0, 0, 9, 2, 0, + 4, 0, 2, 0, 0, 6, 2, 0, 0, 6, + 6, 0, 0, 6, 1, 1, 0, 0, 6, 1, + 1, 0, 3, 2, 2, 0, 0, 0, 5, 1, + 1, 0, 0, 0, 0, 9, 0, 0, 0, 0, + 9, 0, 0, 0, 0, 9, 0, 0, 0, 0, + 11, 1, 1, 0, 1, 1, 0, 0, 0, 8, 0, 3, 0, 4, 2, 0, 4, 0, 0, 0, - 5, 1, 1, 1, 1, 1, 1, 1, 0, 0, - 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, - 0, 0, 6, 0, 2, 0, 4, 0, 3, 3, - 1, 1, 2, 0, 0, 0, 7, 0, 0, 6, - 0, 3, 0, 2, 0, 0, 3, 0, 3, 0, - 3, 0, 3, 0, 3, 0, 3, 0, 3, 3, - 1, 1, 3, 2, 1, 0, 3, 3, 3, 0, - 3, 0, 0, 0, 0, 0, 0, 13, 0, 3, - 0, 2, 0, 0, 0, 5, 2, 0, 1, 0, - 3, 0, 3, 0, 0, 6, 0, 0, 6, 1, - 1, 1, 1, 1, 2, 3, 0, 0, 0, 8, - 3, 3, 2, 0, 3, 0, 0, 0, 8, 1, + 5, 0, 3, 0, 4, 2, 0, 4, 0, 0, + 0, 5, 1, 1, 1, 1, 1, 1, 1, 0, + 0, 6, 0, 0, 0, 6, 0, 0, 0, 6, + 0, 0, 0, 6, 0, 2, 0, 4, 0, 3, + 3, 1, 1, 2, 0, 0, 0, 7, 0, 0, + 6, 0, 3, 0, 2, 0, 0, 3, 0, 3, + 0, 3, 0, 3, 0, 3, 0, 3, 0, 3, + 3, 1, 1, 3, 2, 1, 0, 3, 3, 3, + 0, 3, 0, 0, 0, 0, 0, 0, 13, 0, + 3, 0, 2, 0, 0, 0, 5, 2, 0, 1, + 0, 3, 0, 3, 0, 0, 6, 0, 0, 6, + 1, 1, 1, 1, 1, 2, 3, 0, 0, 0, + 8, 3, 3, 2, 0, 3, 0, 0, 0, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 2, 3, 0, 2, 5, 2, 3, 0, 1, - 0, 0, 0, 0, 10, 2, 2, 0, 0, 3, - 0, 3, 0, 3, 3, 3, 3, 4, 0, 1, - 2, 0, 0, 6, 0, 0, 5, 2, 0, 0, - 3, 0, 3, 0, 3, 0, 3 + 1, 2, 2, 3, 0, 2, 5, 2, 3, 0, + 1, 0, 0, 0, 0, 10, 2, 2, 0, 0, + 3, 0, 3, 0, 3, 3, 3, 3, 4, 0, + 1, 2, 0, 0, 6, 0, 0, 5, 2, 0, + 0, 3, 0, 3, 0, 3, 0, 3 }; @@ -2379,7 +2376,7 @@ yyreduce: switch (yyn) { case 5: -#line 398 "fe/idl.ypp" /* yacc.c:1651 */ +#line 399 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Decl *d = (yyvsp[0].dcval); if (d) @@ -2392,314 +2389,314 @@ yyreduce: "Annotating this type of definition is not supported"); } } -#line 2396 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2393 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 6: -#line 411 "fe/idl.ypp" /* yacc.c:1651 */ +#line 412 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 2403 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2400 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 7: -#line 417 "fe/idl.ypp" /* yacc.c:1651 */ +#line 418 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 2411 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2408 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 8: -#line 421 "fe/idl.ypp" /* yacc.c:1651 */ +#line 422 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = 0; } -#line 2419 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2416 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 9: -#line 425 "fe/idl.ypp" /* yacc.c:1651 */ +#line 426 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = 0; } -#line 2427 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2424 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 10: -#line 432 "fe/idl.ypp" /* yacc.c:1651 */ +#line 433 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AnnotationDeclSeen); } -#line 2435 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2432 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 11: -#line 436 "fe/idl.ypp" /* yacc.c:1651 */ +#line 437 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2444 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2441 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 12: -#line 441 "fe/idl.ypp" /* yacc.c:1651 */ +#line 442 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 2452 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2449 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 13: -#line 445 "fe/idl.ypp" /* yacc.c:1651 */ +#line 446 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 2461 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2458 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 14: -#line 450 "fe/idl.ypp" /* yacc.c:1651 */ +#line 451 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 2469 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2466 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 15: -#line 454 "fe/idl.ypp" /* yacc.c:1651 */ +#line 455 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2478 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2475 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 16: -#line 459 "fe/idl.ypp" /* yacc.c:1651 */ +#line 460 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 2486 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2483 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 17: -#line 463 "fe/idl.ypp" /* yacc.c:1651 */ +#line 464 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2495 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2492 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 18: -#line 468 "fe/idl.ypp" /* yacc.c:1651 */ +#line 469 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 2503 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2500 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 19: -#line 472 "fe/idl.ypp" /* yacc.c:1651 */ +#line 473 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 2512 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2509 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 20: -#line 477 "fe/idl.ypp" /* yacc.c:1651 */ +#line 478 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 2520 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2517 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 21: -#line 481 "fe/idl.ypp" /* yacc.c:1651 */ +#line 482 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2529 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2526 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 22: -#line 486 "fe/idl.ypp" /* yacc.c:1651 */ +#line 487 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen); } -#line 2537 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2534 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 23: -#line 490 "fe/idl.ypp" /* yacc.c:1651 */ +#line 491 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2546 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2543 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 24: -#line 495 "fe/idl.ypp" /* yacc.c:1651 */ +#line 496 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen); } -#line 2554 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2551 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 25: -#line 499 "fe/idl.ypp" /* yacc.c:1651 */ +#line 500 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 2563 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2560 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 26: -#line 504 "fe/idl.ypp" /* yacc.c:1651 */ +#line 505 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeDeclSeen); } -#line 2571 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2568 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 27: -#line 508 "fe/idl.ypp" /* yacc.c:1651 */ +#line 509 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2580 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2577 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 28: -#line 513 "fe/idl.ypp" /* yacc.c:1651 */ +#line 514 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentDeclSeen); } -#line 2588 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2585 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 29: -#line 517 "fe/idl.ypp" /* yacc.c:1651 */ +#line 518 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2597 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2594 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 30: -#line 522 "fe/idl.ypp" /* yacc.c:1651 */ +#line 523 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeDeclSeen); } -#line 2605 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2602 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 31: -#line 526 "fe/idl.ypp" /* yacc.c:1651 */ +#line 527 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2614 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2611 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 32: -#line 531 "fe/idl.ypp" /* yacc.c:1651 */ +#line 532 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventDeclSeen); } -#line 2622 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2619 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 33: -#line 535 "fe/idl.ypp" /* yacc.c:1651 */ +#line 536 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2631 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2628 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 34: -#line 540 "fe/idl.ypp" /* yacc.c:1651 */ +#line 541 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeDeclSeen); } -#line 2639 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2636 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 35: -#line 544 "fe/idl.ypp" /* yacc.c:1651 */ +#line 545 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2648 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2645 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 36: -#line 549 "fe/idl.ypp" /* yacc.c:1651 */ +#line 550 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorDeclSeen); } -#line 2656 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2653 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 37: -#line 553 "fe/idl.ypp" /* yacc.c:1651 */ +#line 554 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2665 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2662 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 38: -#line 558 "fe/idl.ypp" /* yacc.c:1651 */ +#line 559 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 2673 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2670 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 39: -#line 562 "fe/idl.ypp" /* yacc.c:1651 */ +#line 563 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; (yyval.dcval) = 0; } -#line 2683 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2680 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 40: -#line 571 "fe/idl.ypp" /* yacc.c:1651 */ +#line 572 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSeen); } -#line 2691 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2688 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 41: -#line 575 "fe/idl.ypp" /* yacc.c:1651 */ +#line 576 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 2699 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2696 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 42: -#line 582 "fe/idl.ypp" /* yacc.c:1651 */ +#line 583 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleIDSeen); @@ -2738,27 +2735,27 @@ yyreduce: (yyval.dcval) = m; } -#line 2742 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2739 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 43: -#line 621 "fe/idl.ypp" /* yacc.c:1651 */ +#line 622 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSqSeen); } -#line 2750 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2747 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 44: -#line 625 "fe/idl.ypp" /* yacc.c:1651 */ +#line 626 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen); } -#line 2758 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2755 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 45: -#line 629 "fe/idl.ypp" /* yacc.c:1651 */ +#line 630 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleQsSeen); /* @@ -2768,19 +2765,19 @@ yyreduce: idl_global->scopes ().pop (); (yyval.dcval) = (yyvsp[-5].dcval); } -#line 2772 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2769 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 46: -#line 642 "fe/idl.ypp" /* yacc.c:1651 */ +#line 643 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleIDSeen); } -#line 2780 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2777 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 47: -#line 649 "fe/idl.ypp" /* yacc.c:1651 */ +#line 650 "fe/idl.ypp" /* yacc.c:1651 */ { // The module_header rule is common to template module, fixed // module and instantiated template module. In the last @@ -2794,11 +2791,11 @@ yyreduce: IDL_GlobalData::PS_ModuleIDSeen); } } -#line 2798 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2795 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 48: -#line 663 "fe/idl.ypp" /* yacc.c:1651 */ +#line 664 "fe/idl.ypp" /* yacc.c:1651 */ { if (FE_Utils::duplicate_param_id ((yyvsp[0].plval))) { @@ -2808,11 +2805,11 @@ yyreduce: return 1; } } -#line 2812 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2809 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 49: -#line 673 "fe/idl.ypp" /* yacc.c:1651 */ +#line 674 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleParamsSeen); @@ -2842,27 +2839,27 @@ yyreduce: // of the template module. idl_global->current_params ((yyvsp[-2].plval)); } -#line 2846 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2843 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 50: -#line 703 "fe/idl.ypp" /* yacc.c:1651 */ +#line 704 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleSqSeen); } -#line 2854 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2851 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 51: -#line 707 "fe/idl.ypp" /* yacc.c:1651 */ +#line 708 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleBodySeen); } -#line 2862 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2859 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 52: -#line 711 "fe/idl.ypp" /* yacc.c:1651 */ +#line 712 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleQsSeen); @@ -2879,29 +2876,29 @@ yyreduce: // that we are no longer in a template module scope. idl_global->current_params (0); } -#line 2883 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2880 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 58: -#line 745 "fe/idl.ypp" /* yacc.c:1651 */ +#line 746 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefSeen); } -#line 2892 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2889 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 59: -#line 750 "fe/idl.ypp" /* yacc.c:1651 */ +#line 751 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefParamsSeen); } -#line 2901 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2898 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 60: -#line 755 "fe/idl.ypp" /* yacc.c:1651 */ +#line 756 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefIDSeen); @@ -2979,29 +2976,29 @@ yyreduce: idl_global->in_tmpl_mod_no_alias (itmna_flag); idl_global->in_tmpl_mod_alias (false); } -#line 2983 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2980 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 61: -#line 836 "fe/idl.ypp" /* yacc.c:1651 */ +#line 837 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleSeen); } -#line 2992 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2989 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 62: -#line 841 "fe/idl.ypp" /* yacc.c:1651 */ +#line 842 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleArgsSeen); } -#line 3001 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2998 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 63: -#line 846 "fe/idl.ypp" /* yacc.c:1651 */ +#line 847 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleIDSeen); @@ -3063,11 +3060,11 @@ yyreduce: idl_global->set_err_count (idl_global->err_count () + 1); } } -#line 3067 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3064 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 66: -#line 916 "fe/idl.ypp" /* yacc.c:1651 */ +#line 917 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Interface *i = 0; @@ -3105,27 +3102,27 @@ yyreduce: */ idl_global->scopes ().push (i); } -#line 3109 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3106 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 67: -#line 954 "fe/idl.ypp" /* yacc.c:1651 */ +#line 955 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSqSeen); } -#line 3117 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3114 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 68: -#line 958 "fe/idl.ypp" /* yacc.c:1651 */ +#line 959 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen); } -#line 3125 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3122 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 69: -#line 962 "fe/idl.ypp" /* yacc.c:1651 */ +#line 963 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceQsSeen); @@ -3134,28 +3131,28 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3138 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3135 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 70: -#line 974 "fe/idl.ypp" /* yacc.c:1651 */ +#line 975 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSeen); } -#line 3146 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3143 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 71: -#line 978 "fe/idl.ypp" /* yacc.c:1651 */ +#line 979 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3155 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3152 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 72: -#line 986 "fe/idl.ypp" /* yacc.c:1651 */ +#line 987 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3191,11 +3188,11 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3195 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3192 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 73: -#line 1023 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1024 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3224,11 +3221,11 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3228 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3225 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 74: -#line 1053 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1054 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3257,44 +3254,44 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3261 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3258 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 75: -#line 1085 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1086 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 3269 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3266 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 76: -#line 1089 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1090 "fe/idl.ypp" /* yacc.c:1651 */ { (yyvsp[0].nlval)->truncatable ((yyvsp[-2].bval)); (yyval.nlval) = (yyvsp[0].nlval); } -#line 3278 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3275 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 77: -#line 1094 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1095 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 3286 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3283 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 82: -#line 1108 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1109 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->err ()->unsupported_error ("custom is not supported"); } -#line 3294 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3291 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 84: -#line 1116 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1117 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_ValueType *v = 0; @@ -3337,27 +3334,27 @@ yyreduce: */ idl_global->scopes ().push (v); } -#line 3341 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3338 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 85: -#line 1159 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1160 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3349 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3346 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 86: -#line 1163 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1164 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3357 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3354 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 87: -#line 1167 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1168 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen); @@ -3376,11 +3373,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3380 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3377 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 88: -#line 1190 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1191 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_ValueType *v = 0; @@ -3423,27 +3420,27 @@ yyreduce: */ idl_global->scopes ().push (v); } -#line 3427 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3424 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 89: -#line 1233 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1234 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3435 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3432 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 90: -#line 1237 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1238 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3443 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3440 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 91: -#line 1241 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1242 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen); @@ -3452,19 +3449,19 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3456 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3453 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 92: -#line 1254 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1255 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 3464 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3461 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 93: -#line 1258 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1259 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -3495,61 +3492,61 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 3499 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3496 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 94: -#line 1292 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1293 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSeen); } -#line 3507 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3504 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 95: -#line 1296 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1297 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3516 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3513 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 96: -#line 1304 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1305 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.bval) = true; } -#line 3524 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3521 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 97: -#line 1308 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1309 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.bval) = false; } -#line 3532 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3529 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 98: -#line 1316 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1317 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = (yyvsp[0].nlval); } -#line 3540 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3537 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 99: -#line 1320 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1321 "fe/idl.ypp" /* yacc.c:1651 */ { /* | EMPTY */ (yyval.nlval) = 0; } -#line 3549 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3546 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 100: -#line 1329 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1330 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -3572,11 +3569,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3576 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3573 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 101: -#line 1353 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1354 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -3599,11 +3596,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3603 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3600 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 102: -#line 1379 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1380 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen); @@ -3664,191 +3661,191 @@ yyreduce: delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 3668 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3665 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 108: -#line 1455 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1456 "fe/idl.ypp" /* yacc.c:1651 */ { /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_PUBLIC; } -#line 3677 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3674 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 109: -#line 1460 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1461 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 3684 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3681 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 110: -#line 1463 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1464 "fe/idl.ypp" /* yacc.c:1651 */ { /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_PRIVATE; } -#line 3693 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3690 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 111: -#line 1468 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1469 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 3700 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3697 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 114: -#line 1479 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1480 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 3708 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3705 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 115: -#line 1483 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1484 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3716 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3713 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 116: -#line 1487 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1488 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 3724 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3721 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 117: -#line 1491 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1492 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3732 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3729 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 118: -#line 1495 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1496 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 3740 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3737 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 119: -#line 1499 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1500 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3748 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3745 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 120: -#line 1503 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1504 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 3756 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3753 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 121: -#line 1507 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1508 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } -#line 3764 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3761 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 122: -#line 1511 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1512 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 3772 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3769 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 123: -#line 1515 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1516 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3780 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3777 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 124: -#line 1519 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1520 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 3788 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3785 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 125: -#line 1523 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1524 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3796 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3793 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 126: -#line 1527 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1528 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen); } -#line 3804 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3801 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 127: -#line 1531 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1532 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3812 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3809 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 128: -#line 1535 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1536 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 3820 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3817 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 129: -#line 1539 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1540 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 3829 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3826 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 130: -#line 1547 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1548 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.nlval), UTL_NameList ((yyvsp[-1].idlist), (yyvsp[0].nlval)), 1); } -#line 3840 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3837 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 131: -#line 1558 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1559 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SNListCommaSeen); } -#line 3848 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3845 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 132: -#line 1562 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1563 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ScopedNameSeen); @@ -3868,19 +3865,19 @@ yyreduce: (yyval.nlval) = (yyvsp[-3].nlval); } } -#line 3872 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3869 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 133: -#line 1582 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1583 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 3880 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3877 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 134: -#line 1589 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1590 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -3889,19 +3886,19 @@ yyreduce: 0), 1); } -#line 3893 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3890 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 135: -#line 1598 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1599 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); } -#line 3901 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3898 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 136: -#line 1602 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1603 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -3921,11 +3918,11 @@ yyreduce: sn), 1); } -#line 3925 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3922 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 137: -#line 1623 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1624 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); @@ -3935,11 +3932,11 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3939 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3936 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 138: -#line 1633 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1634 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -3951,11 +3948,11 @@ yyreduce: (yyvsp[-3].idlist)->nconc (sn); (yyval.idlist) = (yyvsp[-3].idlist); } -#line 3955 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3952 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 139: -#line 1647 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1648 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.idval), Identifier ((yyvsp[0].strval)), @@ -3963,11 +3960,11 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3967 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3964 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 140: -#line 1657 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1658 "fe/idl.ypp" /* yacc.c:1651 */ { /* defining_id is a defining identifier whereas id is usually a reference to a defining identifier */ @@ -3975,11 +3972,11 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3979 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3976 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 141: -#line 1668 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1669 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -4022,11 +4019,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4026 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4023 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 142: -#line 1712 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1713 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -4052,11 +4049,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4056 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4053 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 143: -#line 1739 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1740 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -4082,43 +4079,43 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4086 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4083 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 144: -#line 1768 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1769 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConstSeen); } -#line 4094 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4091 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 145: -#line 1772 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1773 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConstTypeSeen); } -#line 4102 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4099 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 146: -#line 1776 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1777 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConstIDSeen); } -#line 4110 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4107 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 147: -#line 1780 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1781 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConstAssignSeen); } -#line 4118 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4115 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 148: -#line 1784 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1785 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = 0; UTL_ScopedName n ((yyvsp[-4].idval), 0); @@ -4174,27 +4171,27 @@ yyreduce: delete (yyvsp[-4].idval); (yyvsp[-4].idval) = 0; } -#line 4178 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4175 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 155: -#line 1849 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1850 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_string; } -#line 4186 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4183 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 156: -#line 1853 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1854 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_wstring; } -#line 4194 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4191 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 157: -#line 1857 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1858 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_PredefinedType *c = 0; @@ -4260,11 +4257,11 @@ yyreduce: sn = 0; (yyvsp[0].idlist) = 0; } -#line 4264 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4261 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 161: -#line 1930 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1931 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4273,11 +4270,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4277 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4274 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 163: -#line 1943 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1944 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4286,11 +4283,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4290 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4287 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 165: -#line 1956 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1957 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4299,11 +4296,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4303 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4300 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 167: -#line 1969 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1970 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4312,11 +4309,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4316 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4313 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 168: -#line 1978 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1979 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4325,11 +4322,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4329 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4326 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 170: -#line 1991 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1992 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4338,11 +4335,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4342 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4339 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 171: -#line 2000 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2001 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4351,11 +4348,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4355 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4352 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 173: -#line 2013 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2014 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4364,11 +4361,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4368 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4365 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 174: -#line 2022 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2023 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4377,11 +4374,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4381 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4378 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 175: -#line 2031 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2032 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4390,11 +4387,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4394 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4391 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 177: -#line 2044 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2045 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4403,11 +4400,11 @@ yyreduce: 0 ); } -#line 4407 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4404 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 178: -#line 2053 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2054 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen()->create_expr ( @@ -4416,11 +4413,11 @@ yyreduce: 0 ); } -#line 4420 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4417 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 179: -#line 2062 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2063 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen()->create_expr ( @@ -4429,25 +4426,29 @@ yyreduce: 0 ); } -#line 4433 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4430 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 180: -#line 2074 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2075 "fe/idl.ypp" /* yacc.c:1651 */ { /* * An expression which is a scoped name is not resolved now, * but only when it is evaluated (such as when it is assigned * as a constant value). */ + AST_Expression *expr = 0; UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name ((yyvsp[0].idlist)); if (d == 0) { - idl_global->err ()->lookup_error ((yyvsp[0].idlist)); - return 1; + if (!idl_global->ignore_lookup_errors_) + { + idl_global->err ()->lookup_error ((yyvsp[0].idlist)); + return 1; + } } else if (d->node_type () == AST_Decl::NT_const) { @@ -4463,8 +4464,7 @@ yyreduce: AST_Constant *c = AST_Constant::narrow_from_decl (d); - (yyval.exval) = - idl_global->gen ()->create_expr ( + expr = idl_global->gen ()->create_expr ( c->constant_value (), c->et ()); } @@ -4474,11 +4474,11 @@ yyreduce: // passed in this constructor, so we copy it // and destroy it below no matter which case // is followed. - (yyval.exval) = - idl_global->gen ()->create_expr ( + expr = idl_global->gen ()->create_expr ( (yyvsp[0].idlist)->copy ()); } + (yyval.exval) = expr; (yyvsp[0].idlist)->destroy (); delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; @@ -4487,7 +4487,7 @@ yyreduce: break; case 182: -#line 2125 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2129 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = (yyvsp[-1].exval); } @@ -4495,7 +4495,7 @@ yyreduce: break; case 183: -#line 2132 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2136 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].ival)); } @@ -4503,7 +4503,7 @@ yyreduce: break; case 184: -#line 2136 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2140 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].uival)); @@ -4512,7 +4512,7 @@ yyreduce: break; case 185: -#line 2141 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2145 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].sval)); (yyvsp[0].sval)->destroy (); @@ -4523,7 +4523,7 @@ yyreduce: break; case 186: -#line 2148 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2152 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].wsval)); } @@ -4531,7 +4531,7 @@ yyreduce: break; case 187: -#line 2152 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2156 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].cval)); } @@ -4539,7 +4539,7 @@ yyreduce: break; case 188: -#line 2156 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2160 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_OutputCDR::from_wchar wc ((yyvsp[0].wcval)); (yyval.exval) = idl_global->gen ()->create_expr (wc); @@ -4548,7 +4548,7 @@ yyreduce: break; case 189: -#line 2161 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2165 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].fixval)); } @@ -4556,7 +4556,7 @@ yyreduce: break; case 190: -#line 2165 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2169 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].dval)); } @@ -4564,7 +4564,7 @@ yyreduce: break; case 191: -#line 2169 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2173 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr (true); } @@ -4572,7 +4572,7 @@ yyreduce: break; case 192: -#line 2173 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2177 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr (false); } @@ -4580,7 +4580,7 @@ yyreduce: break; case 193: -#line 2180 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2184 "fe/idl.ypp" /* yacc.c:1651 */ { int good_expression = 1; (yyvsp[0].exval)->evaluate (AST_Expression::EK_positive_int); @@ -4649,7 +4649,7 @@ yyreduce: break; case 194: -#line 2248 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2252 "fe/idl.ypp" /* yacc.c:1651 */ { if (idl_global->idl_version_ < IDL_VERSION_4) { @@ -4670,7 +4670,7 @@ yyreduce: break; case 195: -#line 2265 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2269 "fe/idl.ypp" /* yacc.c:1651 */ { Identifier *id = (yyvsp[-4].idval); idl_global->scopes ().pop (); @@ -4681,7 +4681,7 @@ yyreduce: break; case 201: -#line 2283 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2287 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); @@ -4690,7 +4690,7 @@ yyreduce: break; case 205: -#line 2297 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2301 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *scope = idl_global->scopes ().top_non_null (); UTL_Scope *root = idl_global->scopes ().bottom (); @@ -4742,7 +4742,7 @@ yyreduce: break; case 206: -#line 2348 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2352 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = (yyvsp[0].exval); } @@ -4750,7 +4750,7 @@ yyreduce: break; case 207: -#line 2352 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2356 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = 0; } @@ -4758,7 +4758,7 @@ yyreduce: break; case 208: -#line 2359 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2363 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val); @@ -4772,7 +4772,7 @@ yyreduce: break; case 209: -#line 2372 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2376 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val); @@ -4786,7 +4786,7 @@ yyreduce: break; case 210: -#line 2382 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2386 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotations_val) = new AST_Annotation_Appls (); } @@ -4794,7 +4794,7 @@ yyreduce: break; case 211: -#line 2389 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2393 "fe/idl.ypp" /* yacc.c:1651 */ { if (idl_global->idl_version_ < IDL_VERSION_4) { @@ -4802,48 +4802,93 @@ yyreduce: "Annotations are an IDL4 feature"); } - AST_Annotation_Appl *appl = 0; - UTL_ScopedName *name = (yyvsp[-1].idlist); + AST_Annotation_Decl *decl = 0; + UTL_ScopedName *name = (yyvsp[0].idlist); AST_Annotation_Decl::escape_name (name); - AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); - // Check for Annotation Declaration + // Check for Matching Annotation Declaration AST_Decl *d = idl_global->scopes ().top_non_null ()-> lookup_by_name (name); - if (!d /*&& !idl_global->ignore_missing_annotations_*/) + if (d) { - idl_global->err ()->lookup_error (name); + decl = AST_Annotation_Decl::narrow_from_decl (d); + if (decl) + { + idl_global->scopes ().push (decl); + } } else { - AST_Annotation_Decl *decl = AST_Annotation_Decl::narrow_from_decl (d); + Identifier &id = *name->last_component (); + switch (idl_global->unknown_annotations_) + { + default: + case IDL_GlobalData::UNKNOWN_ANNOTATIONS_WARN_ONCE: + if (idl_global->unknown_annotations_seen_.insert (id) == 1) + { + break; + } + idl_global->err ()->lookup_warning (name); + break; + case IDL_GlobalData::UNKNOWN_ANNOTATIONS_WARN_ALL: + idl_global->err ()->lookup_warning (name); + break; + case IDL_GlobalData::UNKNOWN_ANNOTATIONS_ERROR: + idl_global->err ()->lookup_error (name); + break; + case IDL_GlobalData::UNKNOWN_ANNOTATIONS_IGNORE: + break; + } + + // Ignore lookup errors for parameter values that might depend + // on constants or enums from the annotation declaration. + idl_global->ignore_lookup_errors_ = true; + } + + (yyval.annotation_decl_val) = decl; + } +#line 4851 "fe/idl.tab.cpp" /* yacc.c:1651 */ + break; + + case 212: +#line 2446 "fe/idl.ypp" /* yacc.c:1651 */ + { + idl_global->ignore_lookup_errors_ = false; + AST_Annotation_Appl *appl = 0; + UTL_ScopedName *name = (yyvsp[-2].idlist); + AST_Annotation_Decl *decl = (yyvsp[-1].annotation_decl_val); + AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); + + if (decl) + { appl = idl_global->gen ()->create_annotation_appl (name, params); appl->apply_from (decl); + idl_global->scopes ().pop (); } (yyval.annotation_val) = appl; } -#line 4827 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4872 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 212: -#line 2421 "fe/idl.ypp" /* yacc.c:1651 */ + case 213: +#line 2466 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotation_params_val) = (yyvsp[-1].annotation_params_val); } -#line 4835 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4880 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 213: -#line 2425 "fe/idl.ypp" /* yacc.c:1651 */ + case 214: +#line 2470 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotation_params_val) = 0; } -#line 4843 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4888 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 214: -#line 2432 "fe/idl.ypp" /* yacc.c:1651 */ + case 215: +#line 2477 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appl::Params *params = new AST_Annotation_Appl::Params; AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param; @@ -4852,99 +4897,99 @@ yyreduce: params->push (param); (yyval.annotation_params_val) = params; } -#line 4856 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4901 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 215: -#line 2441 "fe/idl.ypp" /* yacc.c:1651 */ + case 216: +#line 2486 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotation_params_val) = (yyvsp[0].annotation_params_val); } -#line 4864 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4909 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 216: -#line 2448 "fe/idl.ypp" /* yacc.c:1651 */ + case 217: +#line 2493 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); params->push ((yyvsp[-1].annotation_param_val)); (yyval.annotation_params_val) = params; } -#line 4874 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4919 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 217: -#line 2456 "fe/idl.ypp" /* yacc.c:1651 */ + case 218: +#line 2501 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); params->push ((yyvsp[-1].annotation_param_val)); (yyval.annotation_params_val) = params; } -#line 4884 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4929 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 218: -#line 2462 "fe/idl.ypp" /* yacc.c:1651 */ + case 219: +#line 2507 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotation_params_val) = new AST_Annotation_Appl::Params; } -#line 4892 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4937 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 219: -#line 2469 "fe/idl.ypp" /* yacc.c:1651 */ + case 220: +#line 2514 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param; param->id = (yyvsp[-2].idval); param->expr = (yyvsp[0].exval); (yyval.annotation_param_val) = param; } -#line 4903 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4948 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 220: -#line 2479 "fe/idl.ypp" /* yacc.c:1651 */ + case 221: +#line 2524 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 4912 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4957 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 221: -#line 2484 "fe/idl.ypp" /* yacc.c:1651 */ + case 222: +#line 2529 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4920 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4965 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 222: -#line 2488 "fe/idl.ypp" /* yacc.c:1651 */ + case 223: +#line 2533 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4928 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4973 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 223: -#line 2492 "fe/idl.ypp" /* yacc.c:1651 */ + case 224: +#line 2537 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4936 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4981 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 224: -#line 2496 "fe/idl.ypp" /* yacc.c:1651 */ + case 225: +#line 2541 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4944 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4989 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 225: -#line 2500 "fe/idl.ypp" /* yacc.c:1651 */ + case 226: +#line 2545 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Native *node = 0; @@ -4970,27 +5015,27 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 4974 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5019 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 226: -#line 2526 "fe/idl.ypp" /* yacc.c:1651 */ + case 227: +#line 2571 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = 0; } -#line 4982 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5027 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 227: -#line 2533 "fe/idl.ypp" /* yacc.c:1651 */ + case 228: +#line 2578 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypeSpecSeen); } -#line 4990 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5035 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 228: -#line 2537 "fe/idl.ypp" /* yacc.c:1651 */ + case 229: +#line 2582 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); FE_Declarator *d = 0; @@ -5055,22 +5100,22 @@ yyreduce: (yyval.dcval) = t; } -#line 5059 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5104 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 231: -#line 2610 "fe/idl.ypp" /* yacc.c:1651 */ + case 232: +#line 2655 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 5070 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5115 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 233: -#line 2618 "fe/idl.ypp" /* yacc.c:1651 */ + case 234: +#line 2663 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -5093,30 +5138,30 @@ yyreduce: (yyval.dcval) = d; } -#line 5097 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5142 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 251: -#line 2673 "fe/idl.ypp" /* yacc.c:1651 */ + case 252: +#line 2718 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.dlval), UTL_DeclList ((yyvsp[-1].deval), (yyvsp[0].dlval)), 1); } -#line 5108 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5153 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 252: -#line 2684 "fe/idl.ypp" /* yacc.c:1651 */ + case 253: +#line 2729 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5116 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5161 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 253: -#line 2688 "fe/idl.ypp" /* yacc.c:1651 */ + case 254: +#line 2733 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -5136,38 +5181,38 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5140 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5185 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 254: -#line 2708 "fe/idl.ypp" /* yacc.c:1651 */ + case 255: +#line 2753 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dlval) = 0; } -#line 5148 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5193 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 257: -#line 2720 "fe/idl.ypp" /* yacc.c:1651 */ + case 258: +#line 2765 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.dlval), UTL_DeclList ((yyvsp[-1].deval), (yyvsp[0].dlval)), 1); } -#line 5159 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5204 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 258: -#line 2731 "fe/idl.ypp" /* yacc.c:1651 */ + case 259: +#line 2776 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5167 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5212 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 259: -#line 2735 "fe/idl.ypp" /* yacc.c:1651 */ + case 260: +#line 2780 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -5187,19 +5232,19 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5191 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5236 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 260: -#line 2755 "fe/idl.ypp" /* yacc.c:1651 */ + case 261: +#line 2800 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dlval) = 0; } -#line 5199 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5244 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 261: -#line 2762 "fe/idl.ypp" /* yacc.c:1651 */ + case 262: +#line 2807 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_ScopedName *sn = 0; ACE_NEW_RETURN (sn, @@ -5212,11 +5257,11 @@ yyreduce: 0), 1); } -#line 5216 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5261 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 262: -#line 2778 "fe/idl.ypp" /* yacc.c:1651 */ + case 263: +#line 2823 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_ScopedName *sn = 0; ACE_NEW_RETURN (sn, @@ -5231,156 +5276,156 @@ yyreduce: (yyvsp[0].dcval)), 1); } -#line 5235 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5280 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 265: -#line 2801 "fe/idl.ypp" /* yacc.c:1651 */ + case 266: +#line 2846 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_long; } -#line 5243 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5288 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 266: -#line 2805 "fe/idl.ypp" /* yacc.c:1651 */ + case 267: +#line 2850 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_longlong; } -#line 5251 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5296 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 267: -#line 2809 "fe/idl.ypp" /* yacc.c:1651 */ + case 268: +#line 2854 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_short; } -#line 5259 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5304 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 268: -#line 2816 "fe/idl.ypp" /* yacc.c:1651 */ + case 269: +#line 2861 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_ulong; } -#line 5267 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5312 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 269: -#line 2820 "fe/idl.ypp" /* yacc.c:1651 */ + case 270: +#line 2865 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_ulonglong; } -#line 5275 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5320 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 270: -#line 2824 "fe/idl.ypp" /* yacc.c:1651 */ + case 271: +#line 2869 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_ushort; } -#line 5283 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5328 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 271: -#line 2831 "fe/idl.ypp" /* yacc.c:1651 */ + case 272: +#line 2876 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_double; } -#line 5291 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5336 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 272: -#line 2835 "fe/idl.ypp" /* yacc.c:1651 */ + case 273: +#line 2880 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_float; } -#line 5299 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5344 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 273: -#line 2839 "fe/idl.ypp" /* yacc.c:1651 */ + case 274: +#line 2884 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_longdouble; } -#line 5307 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5352 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 274: -#line 2846 "fe/idl.ypp" /* yacc.c:1651 */ + case 275: +#line 2891 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_fixed; } -#line 5315 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5360 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 275: -#line 2853 "fe/idl.ypp" /* yacc.c:1651 */ + case 276: +#line 2898 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_char; } -#line 5323 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5368 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 276: -#line 2857 "fe/idl.ypp" /* yacc.c:1651 */ + case 277: +#line 2902 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_wchar; } -#line 5331 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5376 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 277: -#line 2864 "fe/idl.ypp" /* yacc.c:1651 */ + case 278: +#line 2909 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_octet; } -#line 5339 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5384 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 278: -#line 2871 "fe/idl.ypp" /* yacc.c:1651 */ + case 279: +#line 2916 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_bool; } -#line 5347 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5392 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 279: -#line 2878 "fe/idl.ypp" /* yacc.c:1651 */ + case 280: +#line 2923 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_any; } -#line 5355 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5400 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 280: -#line 2885 "fe/idl.ypp" /* yacc.c:1651 */ + case 281: +#line 2930 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_object; } -#line 5363 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5408 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 281: -#line 2892 "fe/idl.ypp" /* yacc.c:1651 */ + case 282: +#line 2937 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen); } -#line 5371 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5416 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 282: -#line 2896 "fe/idl.ypp" /* yacc.c:1651 */ + case 283: +#line 2941 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5380 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5425 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 283: -#line 2905 "fe/idl.ypp" /* yacc.c:1651 */ + case 284: +#line 2950 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -5411,27 +5456,27 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5415 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5460 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 284: -#line 2936 "fe/idl.ypp" /* yacc.c:1651 */ + case 285: +#line 2981 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen); } -#line 5423 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5468 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 285: -#line 2940 "fe/idl.ypp" /* yacc.c:1651 */ + case 286: +#line 2985 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); } -#line 5431 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5476 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 286: -#line 2944 "fe/idl.ypp" /* yacc.c:1651 */ + case 287: +#line 2989 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); @@ -5443,20 +5488,20 @@ yyreduce: ); idl_global->scopes ().pop (); } -#line 5447 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5492 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 290: -#line 2965 "fe/idl.ypp" /* yacc.c:1651 */ + case 291: +#line 3010 "fe/idl.ypp" /* yacc.c:1651 */ { /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_NA; } -#line 5456 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5501 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 291: -#line 2970 "fe/idl.ypp" /* yacc.c:1651 */ + case 292: +#line 3015 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[0].decls_val)) { @@ -5467,27 +5512,27 @@ yyreduce: } } } -#line 5471 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5516 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 292: -#line 2984 "fe/idl.ypp" /* yacc.c:1651 */ + case 293: +#line 3029 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_MemberTypeSeen); } -#line 5479 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5524 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 293: -#line 2988 "fe/idl.ypp" /* yacc.c:1651 */ + case 294: +#line 3033 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsSeen); } -#line 5487 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5532 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 294: -#line 2992 "fe/idl.ypp" /* yacc.c:1651 */ + case 295: +#line 3037 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); FE_Declarator *d = 0; @@ -5547,53 +5592,53 @@ yyreduce: (yyval.decls_val) = members; } -#line 5551 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5596 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 295: -#line 3052 "fe/idl.ypp" /* yacc.c:1651 */ + case 296: +#line 3097 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->err()->syntax_error (idl_global->parse_state ()); } -#line 5559 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5604 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 296: -#line 3056 "fe/idl.ypp" /* yacc.c:1651 */ + case 297: +#line 3101 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 5568 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5613 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 297: -#line 3064 "fe/idl.ypp" /* yacc.c:1651 */ + case 298: +#line 3109 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen); } -#line 5576 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5621 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 298: -#line 3068 "fe/idl.ypp" /* yacc.c:1651 */ + case 299: +#line 3113 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5585 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5630 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 299: -#line 3076 "fe/idl.ypp" /* yacc.c:1651 */ + case 300: +#line 3121 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchSeen); } -#line 5593 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5638 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 300: -#line 3080 "fe/idl.ypp" /* yacc.c:1651 */ + case 301: +#line 3125 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[-3].idval), 0); @@ -5626,19 +5671,19 @@ yyreduce: * Don't delete $1 yet; we'll need it a bit later. */ } -#line 5630 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5675 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 301: -#line 3113 "fe/idl.ypp" /* yacc.c:1651 */ + case 302: +#line 3158 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchTypeSeen); } -#line 5638 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5683 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 302: -#line 3117 "fe/idl.ypp" /* yacc.c:1651 */ + case 303: +#line 3162 "fe/idl.ypp" /* yacc.c:1651 */ { /* * The top of the scopes must be an empty union we added after we @@ -5694,27 +5739,27 @@ yyreduce: delete (yyvsp[-8].idval); (yyvsp[-8].idval) = 0; } -#line 5698 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5743 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 303: -#line 3173 "fe/idl.ypp" /* yacc.c:1651 */ + case 304: +#line 3218 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSqSeen); } -#line 5706 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5751 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 304: -#line 3177 "fe/idl.ypp" /* yacc.c:1651 */ + case 305: +#line 3222 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionBodySeen); } -#line 5714 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5759 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 305: -#line 3181 "fe/idl.ypp" /* yacc.c:1651 */ + case 306: +#line 3226 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionQsSeen); @@ -5730,22 +5775,22 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 5734 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5779 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 306: -#line 3200 "fe/idl.ypp" /* yacc.c:1651 */ + case 307: +#line 3245 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 5745 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5790 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 307: -#line 3207 "fe/idl.ypp" /* yacc.c:1651 */ + case 308: +#line 3252 "fe/idl.ypp" /* yacc.c:1651 */ { /* wchars are not allowed. */ if ((yyvsp[0].etval) == AST_Expression::EV_wchar) @@ -5758,11 +5803,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5762 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5807 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 308: -#line 3220 "fe/idl.ypp" /* yacc.c:1651 */ + case 309: +#line 3265 "fe/idl.ypp" /* yacc.c:1651 */ { /* octets are not allowed. */ idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE); @@ -5771,22 +5816,22 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5775 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5820 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 309: -#line 3229 "fe/idl.ypp" /* yacc.c:1651 */ + case 310: +#line 3274 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 5786 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5831 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 311: -#line 3237 "fe/idl.ypp" /* yacc.c:1651 */ + case 312: +#line 3282 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -5883,34 +5928,37 @@ yyreduce: (yyvsp[0].idlist) = 0; /* If we don't return here, we'll crash later.*/ - return 1; + if (!idl_global->ignore_lookup_errors_) + { + return 1; + } } (yyvsp[0].idlist)->destroy (); delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 5894 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5942 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 315: -#line 3351 "fe/idl.ypp" /* yacc.c:1651 */ + case 316: +#line 3399 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen); } -#line 5902 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5950 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 316: -#line 3355 "fe/idl.ypp" /* yacc.c:1651 */ + case 317: +#line 3403 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen); } -#line 5910 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5958 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 317: -#line 3359 "fe/idl.ypp" /* yacc.c:1651 */ + case 318: +#line 3407 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_UnionBranch *b = 0; @@ -5939,39 +5987,39 @@ yyreduce: f = 0; } } -#line 5943 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5991 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 318: -#line 3388 "fe/idl.ypp" /* yacc.c:1651 */ + case 319: +#line 3436 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 5951 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5999 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 319: -#line 3392 "fe/idl.ypp" /* yacc.c:1651 */ + case 320: +#line 3440 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 5960 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6008 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 320: -#line 3400 "fe/idl.ypp" /* yacc.c:1651 */ + case 321: +#line 3448 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.llval), UTL_LabelList ((yyvsp[-1].ulval), (yyvsp[0].llval)), 1); } -#line 5971 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6019 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 321: -#line 3410 "fe/idl.ypp" /* yacc.c:1651 */ + case 322: +#line 3458 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_LabelList *ll = 0; ACE_NEW_RETURN (ll, @@ -5989,27 +6037,27 @@ yyreduce: (yyval.llval) = (yyvsp[-1].llval); } } -#line 5993 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6041 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 322: -#line 3428 "fe/idl.ypp" /* yacc.c:1651 */ + case 323: +#line 3476 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.llval) = 0; } -#line 6001 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6049 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 323: -#line 3435 "fe/idl.ypp" /* yacc.c:1651 */ + case 324: +#line 3483 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DefaultSeen); } -#line 6009 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6057 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 324: -#line 3439 "fe/idl.ypp" /* yacc.c:1651 */ + case 325: +#line 3487 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -6018,27 +6066,27 @@ yyreduce: 0 ); } -#line 6022 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6070 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 325: -#line 3448 "fe/idl.ypp" /* yacc.c:1651 */ + case 326: +#line 3496 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_CaseSeen); } -#line 6030 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6078 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 326: -#line 3452 "fe/idl.ypp" /* yacc.c:1651 */ + case 327: +#line 3500 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen); } -#line 6038 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6086 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 327: -#line 3456 "fe/idl.ypp" /* yacc.c:1651 */ + case 328: +#line 3504 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -6047,19 +6095,19 @@ yyreduce: (yyvsp[-2].exval) ); } -#line 6051 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6099 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 328: -#line 3468 "fe/idl.ypp" /* yacc.c:1651 */ + case 329: +#line 3516 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemTypeSeen); } -#line 6059 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6107 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 329: -#line 3472 "fe/idl.ypp" /* yacc.c:1651 */ + case 330: +#line 3520 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemDeclSeen); @@ -6103,11 +6151,11 @@ yyreduce: (yyvsp[0].deval) = 0; } } -#line 6107 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6155 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 330: -#line 3519 "fe/idl.ypp" /* yacc.c:1651 */ + case 331: +#line 3567 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -6129,11 +6177,11 @@ yyreduce: (yyval.dcval) = d; } -#line 6133 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6181 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 331: -#line 3544 "fe/idl.ypp" /* yacc.c:1651 */ + case 332: +#line 3592 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -6153,19 +6201,19 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6157 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6205 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 332: -#line 3567 "fe/idl.ypp" /* yacc.c:1651 */ + case 333: +#line 3615 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen); } -#line 6165 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6213 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 333: -#line 3571 "fe/idl.ypp" /* yacc.c:1651 */ + case 334: +#line 3619 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -6196,27 +6244,27 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6200 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6248 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 334: -#line 3602 "fe/idl.ypp" /* yacc.c:1651 */ + case 335: +#line 3650 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSqSeen); } -#line 6208 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6256 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 335: -#line 3606 "fe/idl.ypp" /* yacc.c:1651 */ + case 336: +#line 3654 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumBodySeen); } -#line 6216 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6264 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 336: -#line 3610 "fe/idl.ypp" /* yacc.c:1651 */ + case 337: +#line 3658 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumQsSeen); @@ -6235,19 +6283,19 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 6239 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6287 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 338: -#line 3635 "fe/idl.ypp" /* yacc.c:1651 */ + case 339: +#line 3683 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumCommaSeen); } -#line 6247 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6295 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 341: -#line 3644 "fe/idl.ypp" /* yacc.c:1651 */ + case 342: +#line 3692 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); Identifier id ((yyvsp[0].strval)); @@ -6278,27 +6326,27 @@ yyreduce: (void) s->fe_add_enum_val (e); } } -#line 6282 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6330 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 342: -#line 3679 "fe/idl.ypp" /* yacc.c:1651 */ + case 343: +#line 3727 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceCommaSeen); } -#line 6290 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6338 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 343: -#line 3683 "fe/idl.ypp" /* yacc.c:1651 */ + case 344: +#line 3731 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceExprSeen); } -#line 6298 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6346 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 344: -#line 3687 "fe/idl.ypp" /* yacc.c:1651 */ + case 345: +#line 3735 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -6382,11 +6430,11 @@ yyreduce: ev = 0; (yyval.dcval) = seq; } -#line 6386 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6434 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 345: -#line 3772 "fe/idl.ypp" /* yacc.c:1651 */ + case 346: +#line 3820 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -6451,11 +6499,11 @@ yyreduce: (yyval.dcval) = seq; } -#line 6455 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6503 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 346: -#line 3840 "fe/idl.ypp" /* yacc.c:1651 */ + case 347: +#line 3888 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSeen); @@ -6464,19 +6512,19 @@ yyreduce: */ idl_global->scopes ().push (0); } -#line 6468 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6516 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 347: -#line 3849 "fe/idl.ypp" /* yacc.c:1651 */ + case 348: +#line 3897 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSqSeen); } -#line 6476 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6524 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 348: -#line 3853 "fe/idl.ypp" /* yacc.c:1651 */ + case 349: +#line 3901 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceTypeSeen); Decl_Annotations_Pair *seq_head = new Decl_Annotations_Pair; @@ -6484,36 +6532,36 @@ yyreduce: seq_head->annotations = (yyvsp[-1].annotations_val); (yyval.decl_annotations_pair_val) = seq_head; } -#line 6488 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6536 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 349: -#line 3864 "fe/idl.ypp" /* yacc.c:1651 */ + case 350: +#line 3912 "fe/idl.ypp" /* yacc.c:1651 */ { (yyvsp[-1].exval)->evaluate (AST_Expression::EK_positive_int); (yyval.dcval) = idl_global->gen ()->create_fixed ((yyvsp[-3].exval), (yyvsp[-1].exval)); } -#line 6497 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6545 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 350: -#line 3873 "fe/idl.ypp" /* yacc.c:1651 */ + case 351: +#line 3921 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6505 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6553 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 351: -#line 3877 "fe/idl.ypp" /* yacc.c:1651 */ + case 352: +#line 3925 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6513 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6561 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 352: -#line 3881 "fe/idl.ypp" /* yacc.c:1651 */ + case 353: +#line 3929 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -6555,11 +6603,11 @@ yyreduce: delete ev; ev = 0; } -#line 6559 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6607 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 353: -#line 3923 "fe/idl.ypp" /* yacc.c:1651 */ + case 354: +#line 3971 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -6579,36 +6627,38 @@ yyreduce: idl_global->root ()->fe_add_string ( AST_String::narrow_from_decl ( tao_string_decl)); + + (yyval.dcval) = tao_string_decl; } -#line 6584 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6634 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 354: -#line 3947 "fe/idl.ypp" /* yacc.c:1651 */ + case 355: +#line 3997 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6592 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6642 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 355: -#line 3955 "fe/idl.ypp" /* yacc.c:1651 */ + case 356: +#line 4005 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6600 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6650 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 356: -#line 3959 "fe/idl.ypp" /* yacc.c:1651 */ + case 357: +#line 4009 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6608 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6658 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 357: -#line 3963 "fe/idl.ypp" /* yacc.c:1651 */ + case 358: +#line 4013 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -6641,11 +6691,11 @@ yyreduce: (yyval.dcval) = string; } } -#line 6645 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6695 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 358: -#line 3996 "fe/idl.ypp" /* yacc.c:1651 */ + case 359: +#line 4046 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -6665,28 +6715,30 @@ yyreduce: idl_global->root ()->fe_add_string ( AST_String::narrow_from_decl ( string)); + + (yyval.dcval) = string; } -#line 6670 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6722 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 359: -#line 4020 "fe/idl.ypp" /* yacc.c:1651 */ + case 360: +#line 4072 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6678 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6730 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 360: -#line 4027 "fe/idl.ypp" /* yacc.c:1651 */ + case 361: +#line 4079 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen); } -#line 6686 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6738 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 361: -#line 4031 "fe/idl.ypp" /* yacc.c:1651 */ + case 362: +#line 4083 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted); @@ -6719,22 +6771,22 @@ yyreduce: } } } -#line 6723 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6775 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 362: -#line 4067 "fe/idl.ypp" /* yacc.c:1651 */ + case 363: +#line 4119 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.elval), UTL_ExprList ((yyvsp[-1].exval), (yyvsp[0].elval)), 1); } -#line 6734 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6786 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 363: -#line 4077 "fe/idl.ypp" /* yacc.c:1651 */ + case 364: +#line 4129 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_ExprList *el = 0; ACE_NEW_RETURN (el, @@ -6752,35 +6804,35 @@ yyreduce: (yyval.elval) = (yyvsp[-1].elval); } } -#line 6756 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6808 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 364: -#line 4095 "fe/idl.ypp" /* yacc.c:1651 */ + case 365: +#line 4147 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.elval) = 0; } -#line 6764 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6816 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 365: -#line 4102 "fe/idl.ypp" /* yacc.c:1651 */ + case 366: +#line 4154 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen); } -#line 6772 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6824 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 366: -#line 4106 "fe/idl.ypp" /* yacc.c:1651 */ + case 367: +#line 4158 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen); } -#line 6780 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6832 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 367: -#line 4110 "fe/idl.ypp" /* yacc.c:1651 */ + case 368: +#line 4162 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen); @@ -6834,43 +6886,43 @@ yyreduce: delete ev; ev = 0; } -#line 6838 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6890 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 370: -#line 4172 "fe/idl.ypp" /* yacc.c:1651 */ + case 371: +#line 4224 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen); } -#line 6846 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6898 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 371: -#line 4176 "fe/idl.ypp" /* yacc.c:1651 */ + case 372: +#line 4228 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 6854 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6906 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 372: -#line 4180 "fe/idl.ypp" /* yacc.c:1651 */ + case 373: +#line 4232 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 6862 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6914 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 373: -#line 4184 "fe/idl.ypp" /* yacc.c:1651 */ + case 374: +#line 4236 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 6870 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6922 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 374: -#line 4188 "fe/idl.ypp" /* yacc.c:1651 */ + case 375: +#line 4240 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; @@ -6930,43 +6982,43 @@ yyreduce: delete (yyvsp[-2].dlval); (yyvsp[-2].dlval) = 0; } -#line 6934 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6986 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 375: -#line 4251 "fe/idl.ypp" /* yacc.c:1651 */ + case 376: +#line 4303 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 6942 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6994 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 376: -#line 4255 "fe/idl.ypp" /* yacc.c:1651 */ + case 377: +#line 4307 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 6950 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7002 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 377: -#line 4259 "fe/idl.ypp" /* yacc.c:1651 */ + case 378: +#line 4311 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 6958 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7010 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 378: -#line 4263 "fe/idl.ypp" /* yacc.c:1651 */ + case 379: +#line 4315 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted); } -#line 6966 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7018 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 379: -#line 4267 "fe/idl.ypp" /* yacc.c:1651 */ + case 380: +#line 4319 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; @@ -7035,19 +7087,19 @@ yyreduce: delete (yyvsp[-4].dlval); (yyvsp[-4].dlval) = 0; } -#line 7039 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7091 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 380: -#line 4339 "fe/idl.ypp" /* yacc.c:1651 */ + case 381: +#line 4391 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen); } -#line 7047 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7099 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 381: -#line 4343 "fe/idl.ypp" /* yacc.c:1651 */ + case 382: +#line 4395 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -7076,27 +7128,27 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 7080 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7132 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 382: -#line 4372 "fe/idl.ypp" /* yacc.c:1651 */ + case 383: +#line 4424 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen); } -#line 7088 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7140 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 383: -#line 4376 "fe/idl.ypp" /* yacc.c:1651 */ + case 384: +#line 4428 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen); } -#line 7096 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7148 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 384: -#line 4380 "fe/idl.ypp" /* yacc.c:1651 */ + case 385: +#line 4432 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen); /* @@ -7104,19 +7156,19 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 7108 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7160 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 385: -#line 4392 "fe/idl.ypp" /* yacc.c:1651 */ + case 386: +#line 4444 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7116 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7168 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 386: -#line 4396 "fe/idl.ypp" /* yacc.c:1651 */ + case 387: +#line 4448 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); Identifier id ((yyvsp[0].strval)); @@ -7180,27 +7232,27 @@ yyreduce: */ idl_global->scopes ().push (o); } -#line 7184 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7236 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 387: -#line 4460 "fe/idl.ypp" /* yacc.c:1651 */ + case 388: +#line 4512 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7192 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7244 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 388: -#line 4464 "fe/idl.ypp" /* yacc.c:1651 */ + case 389: +#line 4516 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); } -#line 7200 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7252 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 389: -#line 4468 "fe/idl.ypp" /* yacc.c:1651 */ + case 390: +#line 4520 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Operation *o = 0; @@ -7229,57 +7281,57 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 7233 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7285 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 390: -#line 4500 "fe/idl.ypp" /* yacc.c:1651 */ + case 391: +#line 4552 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_oneway; } -#line 7242 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7294 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 391: -#line 4505 "fe/idl.ypp" /* yacc.c:1651 */ + case 392: +#line 4557 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_idempotent; } -#line 7251 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7303 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 392: -#line 4510 "fe/idl.ypp" /* yacc.c:1651 */ + case 393: +#line 4562 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ofval) = AST_Operation::OP_noflags; } -#line 7259 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7311 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 394: -#line 4518 "fe/idl.ypp" /* yacc.c:1651 */ + case 395: +#line 4570 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( AST_Expression::EV_void ); } -#line 7270 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7322 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 395: -#line 4528 "fe/idl.ypp" /* yacc.c:1651 */ + case 396: +#line 4580 "fe/idl.ypp" /* yacc.c:1651 */ { //@@ PS_FactorySeen? idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7279 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7331 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 396: -#line 4533 "fe/idl.ypp" /* yacc.c:1651 */ + case 397: +#line 4585 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7320,19 +7372,19 @@ yyreduce: */ idl_global->scopes ().push (factory); } -#line 7324 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7376 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 397: -#line 4574 "fe/idl.ypp" /* yacc.c:1651 */ + case 398: +#line 4626 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7332 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7384 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 398: -#line 4578 "fe/idl.ypp" /* yacc.c:1651 */ + case 399: +#line 4630 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -7345,67 +7397,67 @@ yyreduce: idl_global->scopes ().pop (); } -#line 7349 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7401 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 399: -#line 4594 "fe/idl.ypp" /* yacc.c:1651 */ + case 400: +#line 4646 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7357 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7409 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 400: -#line 4598 "fe/idl.ypp" /* yacc.c:1651 */ + case 401: +#line 4650 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7365 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7417 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 401: -#line 4602 "fe/idl.ypp" /* yacc.c:1651 */ + case 402: +#line 4654 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7373 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7425 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 402: -#line 4607 "fe/idl.ypp" /* yacc.c:1651 */ + case 403: +#line 4659 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7381 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7433 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 404: -#line 4617 "fe/idl.ypp" /* yacc.c:1651 */ + case 405: +#line 4669 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7389 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7441 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 407: -#line 4626 "fe/idl.ypp" /* yacc.c:1651 */ + case 408: +#line 4678 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7397 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7449 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 408: -#line 4630 "fe/idl.ypp" /* yacc.c:1651 */ + case 409: +#line 4682 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7405 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7457 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 409: -#line 4634 "fe/idl.ypp" /* yacc.c:1651 */ + case 410: +#line 4686 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; @@ -7437,67 +7489,67 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7441 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7493 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 410: -#line 4669 "fe/idl.ypp" /* yacc.c:1651 */ + case 411: +#line 4721 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7449 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7501 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 411: -#line 4673 "fe/idl.ypp" /* yacc.c:1651 */ + case 412: +#line 4725 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7457 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7509 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 412: -#line 4677 "fe/idl.ypp" /* yacc.c:1651 */ + case 413: +#line 4729 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7465 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7517 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 413: -#line 4682 "fe/idl.ypp" /* yacc.c:1651 */ + case 414: +#line 4734 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7473 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7525 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 415: -#line 4692 "fe/idl.ypp" /* yacc.c:1651 */ + case 416: +#line 4744 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7481 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7533 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 418: -#line 4701 "fe/idl.ypp" /* yacc.c:1651 */ + case 419: +#line 4753 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7489 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7541 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 419: -#line 4705 "fe/idl.ypp" /* yacc.c:1651 */ + case 420: +#line 4757 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7497 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7549 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 420: -#line 4709 "fe/idl.ypp" /* yacc.c:1651 */ + case 421: +#line 4761 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; @@ -7536,22 +7588,22 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7540 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7592 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 421: -#line 4751 "fe/idl.ypp" /* yacc.c:1651 */ + case 422: +#line 4803 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 7551 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7603 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 424: -#line 4760 "fe/idl.ypp" /* yacc.c:1651 */ + case 425: +#line 4812 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -7655,186 +7707,186 @@ yyreduce: (yyval.dcval) = d; } -#line 7659 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7711 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 425: -#line 4867 "fe/idl.ypp" /* yacc.c:1651 */ + case 426: +#line 4919 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dival) = AST_Argument::dir_IN; } -#line 7667 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7719 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 426: -#line 4871 "fe/idl.ypp" /* yacc.c:1651 */ + case 427: +#line 4923 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dival) = AST_Argument::dir_OUT; } -#line 7675 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7727 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 427: -#line 4875 "fe/idl.ypp" /* yacc.c:1651 */ + case 428: +#line 4927 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dival) = AST_Argument::dir_INOUT; } -#line 7683 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7735 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 428: -#line 4882 "fe/idl.ypp" /* yacc.c:1651 */ + case 429: +#line 4934 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen); } -#line 7691 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7743 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 429: -#line 4886 "fe/idl.ypp" /* yacc.c:1651 */ + case 430: +#line 4938 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen); } -#line 7699 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7751 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 430: -#line 4891 "fe/idl.ypp" /* yacc.c:1651 */ + case 431: +#line 4943 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7708 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7760 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 431: -#line 4896 "fe/idl.ypp" /* yacc.c:1651 */ + case 432: +#line 4948 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 7716 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7768 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 432: -#line 4903 "fe/idl.ypp" /* yacc.c:1651 */ + case 433: +#line 4955 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen); } -#line 7724 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7776 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 433: -#line 4907 "fe/idl.ypp" /* yacc.c:1651 */ + case 434: +#line 4959 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen); } -#line 7732 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7784 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 434: -#line 4912 "fe/idl.ypp" /* yacc.c:1651 */ + case 435: +#line 4964 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7741 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7793 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 435: -#line 4917 "fe/idl.ypp" /* yacc.c:1651 */ + case 436: +#line 4969 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 7749 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7801 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 436: -#line 4924 "fe/idl.ypp" /* yacc.c:1651 */ + case 437: +#line 4976 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen); } -#line 7757 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7809 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 437: -#line 4928 "fe/idl.ypp" /* yacc.c:1651 */ + case 438: +#line 4980 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen); } -#line 7765 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7817 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 438: -#line 4933 "fe/idl.ypp" /* yacc.c:1651 */ + case 439: +#line 4985 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7774 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7826 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 439: -#line 4938 "fe/idl.ypp" /* yacc.c:1651 */ + case 440: +#line 4990 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 7782 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7834 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 440: -#line 4945 "fe/idl.ypp" /* yacc.c:1651 */ + case 441: +#line 4997 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen); } -#line 7790 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7842 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 441: -#line 4949 "fe/idl.ypp" /* yacc.c:1651 */ + case 442: +#line 5001 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen); } -#line 7798 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7850 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 442: -#line 4954 "fe/idl.ypp" /* yacc.c:1651 */ + case 443: +#line 5006 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen); (yyval.slval) = (yyvsp[-1].slval); } -#line 7807 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7859 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 443: -#line 4959 "fe/idl.ypp" /* yacc.c:1651 */ + case 444: +#line 5011 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.slval) = 0; } -#line 7815 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7867 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 444: -#line 4966 "fe/idl.ypp" /* yacc.c:1651 */ + case 445: +#line 5018 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 7826 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7878 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 445: -#line 4977 "fe/idl.ypp" /* yacc.c:1651 */ + case 446: +#line 5029 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen); } -#line 7834 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7886 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 446: -#line 4981 "fe/idl.ypp" /* yacc.c:1651 */ + case 447: +#line 5033 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, @@ -7852,19 +7904,19 @@ yyreduce: (yyval.slval) = (yyvsp[-3].slval); } } -#line 7856 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7908 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 447: -#line 4999 "fe/idl.ypp" /* yacc.c:1651 */ + case 448: +#line 5051 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.slval) = 0; } -#line 7864 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7916 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 448: -#line 5006 "fe/idl.ypp" /* yacc.c:1651 */ + case 449: +#line 5058 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = @@ -7889,11 +7941,11 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 7893 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7945 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 449: -#line 5034 "fe/idl.ypp" /* yacc.c:1651 */ + case 450: +#line 5086 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = ScopeAsDecl (s); @@ -7927,11 +7979,11 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 7931 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7983 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 452: -#line 5077 "fe/idl.ypp" /* yacc.c:1651 */ + case 453: +#line 5129 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -7955,11 +8007,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 7959 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8011 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 453: -#line 5104 "fe/idl.ypp" /* yacc.c:1651 */ + case 454: +#line 5156 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Component *c = 0; @@ -7998,27 +8050,27 @@ yyreduce: */ idl_global->scopes ().push (c); } -#line 8002 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8054 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 454: -#line 5143 "fe/idl.ypp" /* yacc.c:1651 */ + case 455: +#line 5195 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen); } -#line 8010 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8062 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 455: -#line 5147 "fe/idl.ypp" /* yacc.c:1651 */ + case 456: +#line 5199 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen); } -#line 8018 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8070 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 456: -#line 5151 "fe/idl.ypp" /* yacc.c:1651 */ + case 457: +#line 5203 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen); @@ -8027,27 +8079,27 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 8031 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8083 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 457: -#line 5164 "fe/idl.ypp" /* yacc.c:1651 */ + case 458: +#line 5216 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen); } -#line 8039 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8091 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 458: -#line 5168 "fe/idl.ypp" /* yacc.c:1651 */ + case 459: +#line 5220 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8047 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8099 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 459: -#line 5172 "fe/idl.ypp" /* yacc.c:1651 */ + case 460: +#line 5224 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -8081,147 +8133,147 @@ yyreduce: (yyvsp[-2].idlist) = 0; } } -#line 8085 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8137 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 460: -#line 5209 "fe/idl.ypp" /* yacc.c:1651 */ + case 461: +#line 5261 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8093 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8145 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 461: -#line 5213 "fe/idl.ypp" /* yacc.c:1651 */ + case 462: +#line 5265 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8101 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8153 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 462: -#line 5217 "fe/idl.ypp" /* yacc.c:1651 */ + case 463: +#line 5269 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = 0; } -#line 8109 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8161 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 465: -#line 5229 "fe/idl.ypp" /* yacc.c:1651 */ + case 466: +#line 5281 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 8117 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8169 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 466: -#line 5233 "fe/idl.ypp" /* yacc.c:1651 */ + case 467: +#line 5285 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8125 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8177 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 467: -#line 5237 "fe/idl.ypp" /* yacc.c:1651 */ + case 468: +#line 5289 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 8133 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8185 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 468: -#line 5241 "fe/idl.ypp" /* yacc.c:1651 */ + case 469: +#line 5293 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8141 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8193 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 469: -#line 5245 "fe/idl.ypp" /* yacc.c:1651 */ + case 470: +#line 5297 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen); } -#line 8149 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8201 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 470: -#line 5249 "fe/idl.ypp" /* yacc.c:1651 */ + case 471: +#line 5301 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8157 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8209 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 471: -#line 5253 "fe/idl.ypp" /* yacc.c:1651 */ + case 472: +#line 5305 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen); } -#line 8165 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8217 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 472: -#line 5257 "fe/idl.ypp" /* yacc.c:1651 */ + case 473: +#line 5309 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8173 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8225 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 473: -#line 5261 "fe/idl.ypp" /* yacc.c:1651 */ + case 474: +#line 5313 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen); } -#line 8181 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8233 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 474: -#line 5265 "fe/idl.ypp" /* yacc.c:1651 */ + case 475: +#line 5317 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8189 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8241 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 475: -#line 5269 "fe/idl.ypp" /* yacc.c:1651 */ + case 476: +#line 5321 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 8197 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8249 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 476: -#line 5273 "fe/idl.ypp" /* yacc.c:1651 */ + case 477: +#line 5325 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8205 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8257 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 477: -#line 5277 "fe/idl.ypp" /* yacc.c:1651 */ + case 478: +#line 5329 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 8213 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8265 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 478: -#line 5281 "fe/idl.ypp" /* yacc.c:1651 */ + case 479: +#line 5333 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8221 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8273 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 479: -#line 5287 "fe/idl.ypp" /* yacc.c:1651 */ + case 480: +#line 5339 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8308,21 +8360,21 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8312 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8364 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 480: -#line 5377 "fe/idl.ypp" /* yacc.c:1651 */ + case 481: +#line 5429 "fe/idl.ypp" /* yacc.c:1651 */ { // Lookups and checking are done where the 'interface_type' // token is used, in 'provides_decl' and 'uses_decl'. (yyval.idlist) = (yyvsp[0].idlist); } -#line 8322 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8374 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 481: -#line 5383 "fe/idl.ypp" /* yacc.c:1651 */ + case 482: +#line 5435 "fe/idl.ypp" /* yacc.c:1651 */ { Identifier *corba_id = 0; @@ -8345,11 +8397,11 @@ yyreduce: conc_name), 1); } -#line 8349 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8401 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 482: -#line 5408 "fe/idl.ypp" /* yacc.c:1651 */ + case 483: +#line 5460 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8452,37 +8504,37 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8456 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8508 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 483: -#line 5514 "fe/idl.ypp" /* yacc.c:1651 */ + case 484: +#line 5566 "fe/idl.ypp" /* yacc.c:1651 */ { // We use this extra rule here to use in both uses_decl and // extended_uses_decl, so the LALR(1) parser can avoid conflicts. (yyval.bval) = (yyvsp[0].bval); } -#line 8466 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8518 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 484: -#line 5523 "fe/idl.ypp" /* yacc.c:1651 */ + case 485: +#line 5575 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.bval) = true; } -#line 8474 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8526 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 485: -#line 5527 "fe/idl.ypp" /* yacc.c:1651 */ + case 486: +#line 5579 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.bval) = false; } -#line 8482 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8534 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 486: -#line 5533 "fe/idl.ypp" /* yacc.c:1651 */ + case 487: +#line 5585 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8552,11 +8604,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8556 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8608 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 487: -#line 5605 "fe/idl.ypp" /* yacc.c:1651 */ + case 488: +#line 5657 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8626,11 +8678,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8630 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8682 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 488: -#line 5677 "fe/idl.ypp" /* yacc.c:1651 */ + case 489: +#line 5729 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8700,11 +8752,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8704 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8756 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 489: -#line 5750 "fe/idl.ypp" /* yacc.c:1651 */ + case 490: +#line 5802 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Home *h = 0; @@ -8741,70 +8793,70 @@ yyreduce: */ idl_global->scopes ().push (h); } -#line 8745 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8797 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 490: -#line 5787 "fe/idl.ypp" /* yacc.c:1651 */ + case 491: +#line 5839 "fe/idl.ypp" /* yacc.c:1651 */ { /* * Done with this component - pop it off the scopes stack. */ idl_global->scopes ().pop (); } -#line 8756 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8808 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 491: -#line 5797 "fe/idl.ypp" /* yacc.c:1651 */ + case 492: +#line 5849 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen); } -#line 8764 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8816 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 492: -#line 5801 "fe/idl.ypp" /* yacc.c:1651 */ + case 493: +#line 5853 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen); } -#line 8772 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8824 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 493: -#line 5805 "fe/idl.ypp" /* yacc.c:1651 */ + case 494: +#line 5857 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8780 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8832 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 494: -#line 5809 "fe/idl.ypp" /* yacc.c:1651 */ + case 495: +#line 5861 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); } -#line 8788 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8840 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 495: -#line 5813 "fe/idl.ypp" /* yacc.c:1651 */ + case 496: +#line 5865 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen); } -#line 8796 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8848 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 496: -#line 5817 "fe/idl.ypp" /* yacc.c:1651 */ + case 497: +#line 5869 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen); } -#line 8804 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8856 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 497: -#line 5821 "fe/idl.ypp" /* yacc.c:1651 */ + case 498: +#line 5873 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen); @@ -8850,107 +8902,107 @@ yyreduce: (yyvsp[-6].nlval) = 0; } } -#line 8854 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8906 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 498: -#line 5870 "fe/idl.ypp" /* yacc.c:1651 */ + case 499: +#line 5922 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8862 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8914 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 499: -#line 5874 "fe/idl.ypp" /* yacc.c:1651 */ + case 500: +#line 5926 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8870 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8922 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 500: -#line 5878 "fe/idl.ypp" /* yacc.c:1651 */ + case 501: +#line 5930 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = 0; } -#line 8878 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8930 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 501: -#line 5886 "fe/idl.ypp" /* yacc.c:1651 */ + case 502: +#line 5938 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8886 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8938 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 502: -#line 5890 "fe/idl.ypp" /* yacc.c:1651 */ + case 503: +#line 5942 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = 0; } -#line 8894 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8946 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 503: -#line 5897 "fe/idl.ypp" /* yacc.c:1651 */ + case 504: +#line 5949 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen); } -#line 8902 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8954 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 504: -#line 5901 "fe/idl.ypp" /* yacc.c:1651 */ + case 505: +#line 5953 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen); } -#line 8910 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8962 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 505: -#line 5905 "fe/idl.ypp" /* yacc.c:1651 */ + case 506: +#line 5957 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen); } -#line 8918 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8970 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 509: -#line 5918 "fe/idl.ypp" /* yacc.c:1651 */ + case 510: +#line 5970 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen); } -#line 8926 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8978 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 510: -#line 5922 "fe/idl.ypp" /* yacc.c:1651 */ + case 511: +#line 5974 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8934 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8986 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 511: -#line 5926 "fe/idl.ypp" /* yacc.c:1651 */ + case 512: +#line 5978 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen); } -#line 8942 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8994 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 512: -#line 5930 "fe/idl.ypp" /* yacc.c:1651 */ + case 513: +#line 5982 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8950 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9002 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 513: -#line 5938 "fe/idl.ypp" /* yacc.c:1651 */ + case 514: +#line 5990 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -8973,19 +9025,19 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 8977 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9029 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 514: -#line 5961 "fe/idl.ypp" /* yacc.c:1651 */ + case 515: +#line 6013 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 8985 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9037 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 515: -#line 5965 "fe/idl.ypp" /* yacc.c:1651 */ + case 516: +#line 6017 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -9003,11 +9055,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9007 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9059 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 516: -#line 5987 "fe/idl.ypp" /* yacc.c:1651 */ + case 517: +#line 6039 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9034,19 +9086,19 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 9038 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9090 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 517: -#line 6014 "fe/idl.ypp" /* yacc.c:1651 */ + case 518: +#line 6066 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 9046 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9098 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 518: -#line 6018 "fe/idl.ypp" /* yacc.c:1651 */ + case 519: +#line 6070 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -9064,11 +9116,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9068 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9120 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 524: -#line 6051 "fe/idl.ypp" /* yacc.c:1651 */ + case 525: +#line 6103 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9091,11 +9143,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 9095 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9147 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 525: -#line 6079 "fe/idl.ypp" /* yacc.c:1651 */ + case 526: +#line 6131 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9118,11 +9170,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 9122 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9174 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 526: -#line 6106 "fe/idl.ypp" /* yacc.c:1651 */ + case 527: +#line 6158 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_EventType *e = 0; @@ -9166,27 +9218,27 @@ yyreduce: delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 9170 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9222 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 527: -#line 6150 "fe/idl.ypp" /* yacc.c:1651 */ + case 528: +#line 6202 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9178 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9230 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 528: -#line 6154 "fe/idl.ypp" /* yacc.c:1651 */ + case 529: +#line 6206 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9186 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9238 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 529: -#line 6158 "fe/idl.ypp" /* yacc.c:1651 */ + case 530: +#line 6210 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9195,19 +9247,19 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9199 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9251 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 530: -#line 6172 "fe/idl.ypp" /* yacc.c:1651 */ + case 531: +#line 6224 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idval) = (yyvsp[0].idval); } -#line 9207 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9259 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 531: -#line 6181 "fe/idl.ypp" /* yacc.c:1651 */ + case 532: +#line 6233 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); @@ -9220,29 +9272,29 @@ yyreduce: ACE_TEXT (" custom yet\n"))); (yyval.idval) = 0; } -#line 9224 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9276 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 532: -#line 6198 "fe/idl.ypp" /* yacc.c:1651 */ + case 533: +#line 6250 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 9234 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9286 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 533: -#line 6207 "fe/idl.ypp" /* yacc.c:1651 */ + case 534: +#line 6259 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 9242 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9294 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 534: -#line 6211 "fe/idl.ypp" /* yacc.c:1651 */ + case 535: +#line 6263 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -9271,11 +9323,11 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 9275 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9327 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 535: -#line 6244 "fe/idl.ypp" /* yacc.c:1651 */ + case 536: +#line 6296 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_EventType *e = 0; @@ -9324,27 +9376,27 @@ yyreduce: */ idl_global->scopes ().push (e); } -#line 9328 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9380 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 536: -#line 6293 "fe/idl.ypp" /* yacc.c:1651 */ + case 537: +#line 6345 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9336 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9388 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 537: -#line 6297 "fe/idl.ypp" /* yacc.c:1651 */ + case 538: +#line 6349 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9344 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9396 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 538: -#line 6301 "fe/idl.ypp" /* yacc.c:1651 */ + case 539: +#line 6353 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9353,108 +9405,108 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9357 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9409 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 539: -#line 6313 "fe/idl.ypp" /* yacc.c:1651 */ + case 540: +#line 6365 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idval) = (yyvsp[0].idval); } -#line 9365 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9417 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 540: -#line 6317 "fe/idl.ypp" /* yacc.c:1651 */ + case 541: +#line 6369 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idval) = (yyvsp[0].idval); } -#line 9373 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9425 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 541: -#line 6324 "fe/idl.ypp" /* yacc.c:1651 */ + case 542: +#line 6376 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_type; } -#line 9381 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9433 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 542: -#line 6328 "fe/idl.ypp" /* yacc.c:1651 */ + case 543: +#line 6380 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_struct; } -#line 9389 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9441 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 543: -#line 6332 "fe/idl.ypp" /* yacc.c:1651 */ + case 544: +#line 6384 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_union; } -#line 9397 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9449 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 544: -#line 6336 "fe/idl.ypp" /* yacc.c:1651 */ + case 545: +#line 6388 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_eventtype; } -#line 9405 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9457 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 545: -#line 6340 "fe/idl.ypp" /* yacc.c:1651 */ + case 546: +#line 6392 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_sequence; } -#line 9413 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9465 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 546: -#line 6344 "fe/idl.ypp" /* yacc.c:1651 */ + case 547: +#line 6396 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_interface; } -#line 9421 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9473 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 547: -#line 6348 "fe/idl.ypp" /* yacc.c:1651 */ + case 548: +#line 6400 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_valuetype; } -#line 9429 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9481 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 548: -#line 6352 "fe/idl.ypp" /* yacc.c:1651 */ + case 549: +#line 6404 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_enum; } -#line 9437 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9489 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 549: -#line 6356 "fe/idl.ypp" /* yacc.c:1651 */ + case 550: +#line 6408 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_except; } -#line 9445 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9497 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 550: -#line 6360 "fe/idl.ypp" /* yacc.c:1651 */ + case 551: +#line 6412 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_const; t_param_const_type = (yyvsp[0].etval); } -#line 9454 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9506 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 551: -#line 6368 "fe/idl.ypp" /* yacc.c:1651 */ + case 552: +#line 6420 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[0].plval) == 0) { @@ -9482,11 +9534,11 @@ yyreduce: (yyval.plval) = (yyvsp[0].plval); } -#line 9486 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9538 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 552: -#line 6399 "fe/idl.ypp" /* yacc.c:1651 */ + case 553: +#line 6451 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[-2].plval) == 0) { @@ -9499,19 +9551,19 @@ yyreduce: delete (yyvsp[0].pival); (yyvsp[0].pival) = 0; } -#line 9503 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9555 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 553: -#line 6412 "fe/idl.ypp" /* yacc.c:1651 */ + case 554: +#line 6464 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.plval) = 0; } -#line 9511 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9563 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 554: -#line 6419 "fe/idl.ypp" /* yacc.c:1651 */ + case 555: +#line 6471 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.pival), @@ -9536,11 +9588,11 @@ yyreduce: tao_enum_constant_decl = 0; } } -#line 9540 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9592 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 555: -#line 6444 "fe/idl.ypp" /* yacc.c:1651 */ + case 556: +#line 6496 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.pival), FE_Utils::T_Param_Info, @@ -9555,19 +9607,19 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 9559 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9611 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 556: -#line 6462 "fe/idl.ypp" /* yacc.c:1651 */ + case 557: +#line 6514 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 9567 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9619 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 557: -#line 6469 "fe/idl.ypp" /* yacc.c:1651 */ + case 558: +#line 6521 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), 0), 1); @@ -9582,37 +9634,37 @@ yyreduce: (yyval.slval) = (yyvsp[-2].slval); } } -#line 9586 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9638 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 558: -#line 6484 "fe/idl.ypp" /* yacc.c:1651 */ + case 559: +#line 6536 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.slval) = 0; } -#line 9594 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9646 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 559: -#line 6491 "fe/idl.ypp" /* yacc.c:1651 */ + case 560: +#line 6543 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.sval), UTL_String ((yyvsp[0].strval), true), 1); } -#line 9604 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9656 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 560: -#line 6500 "fe/idl.ypp" /* yacc.c:1651 */ + case 561: +#line 6552 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen); } -#line 9612 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9664 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 561: -#line 6504 "fe/idl.ypp" /* yacc.c:1651 */ + case 562: +#line 6556 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9630,102 +9682,102 @@ yyreduce: // Push it on the scopes stack. idl_global->scopes ().push (p); } -#line 9634 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9686 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 562: -#line 6522 "fe/idl.ypp" /* yacc.c:1651 */ + case 563: +#line 6574 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen); } -#line 9642 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9694 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 563: -#line 6526 "fe/idl.ypp" /* yacc.c:1651 */ + case 564: +#line 6578 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen); } -#line 9650 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9702 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 564: -#line 6530 "fe/idl.ypp" /* yacc.c:1651 */ + case 565: +#line 6582 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeQsSeen); // Done with this port type - pop it off the scopes stack. idl_global->scopes ().pop (); } -#line 9661 "fe/idl.tab.cpp" /* yacc.c:1651 */ - break; - - case 565: -#line 6540 "fe/idl.ypp" /* yacc.c:1651 */ - { - } -#line 9668 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9713 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 566: -#line 6546 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6592 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9675 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9720 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 567: -#line 6549 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6598 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9682 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9727 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 568: -#line 6555 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6601 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9689 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9734 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 569: -#line 6558 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6607 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9696 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9741 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 570: -#line 6561 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6610 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9703 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9748 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 571: -#line 6564 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6613 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9710 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9755 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 572: -#line 6567 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6616 "fe/idl.ypp" /* yacc.c:1651 */ { - idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 9718 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9762 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 573: -#line 6571 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6619 "fe/idl.ypp" /* yacc.c:1651 */ { + idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 9725 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9770 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 574: -#line 6577 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6623 "fe/idl.ypp" /* yacc.c:1651 */ + { + } +#line 9777 "fe/idl.tab.cpp" /* yacc.c:1651 */ + break; + + case 575: +#line 6629 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9794,11 +9846,11 @@ yyreduce: delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; } -#line 9798 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9850 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 575: -#line 6646 "fe/idl.ypp" /* yacc.c:1651 */ + case 576: +#line 6698 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9845,11 +9897,11 @@ yyreduce: delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; } -#line 9849 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9901 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 576: -#line 6696 "fe/idl.ypp" /* yacc.c:1651 */ + case 577: +#line 6748 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[0].alval) == 0) { @@ -9861,11 +9913,11 @@ yyreduce: (yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval)); (yyval.alval) = (yyvsp[0].alval); } -#line 9865 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9917 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 577: -#line 6711 "fe/idl.ypp" /* yacc.c:1651 */ + case 578: +#line 6763 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[-3].alval) == 0) { @@ -9877,19 +9929,19 @@ yyreduce: (yyvsp[-3].alval)->enqueue_tail ((yyvsp[0].dcval)); (yyval.alval) = (yyvsp[-3].alval); } -#line 9881 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9933 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 578: -#line 6723 "fe/idl.ypp" /* yacc.c:1651 */ + case 579: +#line 6775 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.alval) = 0; } -#line 9889 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9941 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 579: -#line 6730 "fe/idl.ypp" /* yacc.c:1651 */ + case 580: +#line 6782 "fe/idl.ypp" /* yacc.c:1651 */ { // To avoid grammar conflicts with this LALR(1) parser, // we take advantage of the fact that an expression can @@ -9945,27 +9997,27 @@ yyreduce: 0); } } -#line 9949 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10001 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 581: -#line 6793 "fe/idl.ypp" /* yacc.c:1651 */ + case 582: +#line 6845 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen); } -#line 9957 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10009 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 582: -#line 6797 "fe/idl.ypp" /* yacc.c:1651 */ + case 583: +#line 6849 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen); } -#line 9965 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10017 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 583: -#line 6801 "fe/idl.ypp" /* yacc.c:1651 */ + case 584: +#line 6853 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Connector *parent = 0; @@ -10017,102 +10069,102 @@ yyreduce: idl_global->scopes ().push (c); } } -#line 10021 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10073 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 584: -#line 6856 "fe/idl.ypp" /* yacc.c:1651 */ + case 585: +#line 6908 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen); } -#line 10029 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10081 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 585: -#line 6860 "fe/idl.ypp" /* yacc.c:1651 */ + case 586: +#line 6912 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen); } -#line 10037 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10089 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 586: -#line 6864 "fe/idl.ypp" /* yacc.c:1651 */ + case 587: +#line 6916 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorQsSeen); // Done with this connector - pop it off the scope stack. idl_global->scopes ().pop (); } -#line 10048 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10100 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 589: -#line 6879 "fe/idl.ypp" /* yacc.c:1651 */ + case 590: +#line 6931 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 10056 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10108 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 590: -#line 6883 "fe/idl.ypp" /* yacc.c:1651 */ + case 591: +#line 6935 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10064 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10116 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 591: -#line 6887 "fe/idl.ypp" /* yacc.c:1651 */ + case 592: +#line 6939 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 10072 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10124 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 592: -#line 6891 "fe/idl.ypp" /* yacc.c:1651 */ + case 593: +#line 6943 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10080 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10132 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 593: -#line 6895 "fe/idl.ypp" /* yacc.c:1651 */ + case 594: +#line 6947 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 10088 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10140 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 594: -#line 6899 "fe/idl.ypp" /* yacc.c:1651 */ + case 595: +#line 6951 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10096 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10148 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 595: -#line 6903 "fe/idl.ypp" /* yacc.c:1651 */ + case 596: +#line 6955 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 10104 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10156 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 596: -#line 6907 "fe/idl.ypp" /* yacc.c:1651 */ + case 597: +#line 6959 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10112 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10164 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; -#line 10116 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10168 "fe/idl.tab.cpp" /* yacc.c:1651 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -10340,7 +10392,7 @@ yyreturn: #endif return yyresult; } -#line 6912 "fe/idl.ypp" /* yacc.c:1910 */ +#line 6964 "fe/idl.ypp" /* yacc.c:1910 */ /* programs */ diff --git a/TAO/TAO_IDL/fe/idl.tab.hpp b/TAO/TAO_IDL/fe/idl.tab.hpp index daedad32a84..7e6713cd4ec 100644 --- a/TAO/TAO_IDL/fe/idl.tab.hpp +++ b/TAO/TAO_IDL/fe/idl.tab.hpp @@ -179,10 +179,11 @@ union YYSTYPE AST_Annotation_Appls *annotations_val; AST_Annotation_Appl::Param *annotation_param_val; AST_Annotation_Appl::Params *annotation_params_val; + AST_Annotation_Decl *annotation_decl_val; AST_Decls *decls_val; Decl_Annotations_Pair *decl_annotations_pair_val; -#line 186 "fe/idl.tab.hpp" /* yacc.c:1913 */ +#line 187 "fe/idl.tab.hpp" /* yacc.c:1913 */ }; typedef union YYSTYPE YYSTYPE; diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp index 4ccd0083ad9..910eae33754 100644 --- a/TAO/TAO_IDL/fe/idl.ypp +++ b/TAO/TAO_IDL/fe/idl.ypp @@ -195,6 +195,7 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none; AST_Annotation_Appls *annotations_val; AST_Annotation_Appl::Param *annotation_param_val; AST_Annotation_Appl::Params *annotation_params_val; + AST_Annotation_Decl *annotation_decl_val; AST_Decls *decls_val; Decl_Annotations_Pair *decl_annotations_pair_val; } @@ -2077,14 +2078,18 @@ primary_expr * but only when it is evaluated (such as when it is assigned * as a constant value). */ + AST_Expression *expr = 0; UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = s->lookup_by_name ($1); if (d == 0) { - idl_global->err ()->lookup_error ($1); - return 1; + if (!idl_global->ignore_lookup_errors_) + { + idl_global->err ()->lookup_error ($1); + return 1; + } } else if (d->node_type () == AST_Decl::NT_const) { @@ -2100,8 +2105,7 @@ primary_expr AST_Constant *c = AST_Constant::narrow_from_decl (d); - $<exval>$ = - idl_global->gen ()->create_expr ( + expr = idl_global->gen ()->create_expr ( c->constant_value (), c->et ()); } @@ -2111,11 +2115,11 @@ primary_expr // passed in this constructor, so we copy it // and destroy it below no matter which case // is followed. - $<exval>$ = - idl_global->gen ()->create_expr ( + expr = idl_global->gen ()->create_expr ( $1->copy ()); } + $<exval>$ = expr; $1->destroy (); delete $1; $1 = 0; @@ -2385,7 +2389,7 @@ annotations_maybe ; annotation_appl - : IDL_ANNOTATION_SYMBOL scoped_name annotation_appl_params_maybe + : IDL_ANNOTATION_SYMBOL scoped_name { if (idl_global->idl_version_ < IDL_VERSION_4) { @@ -2393,23 +2397,64 @@ annotation_appl "Annotations are an IDL4 feature"); } - AST_Annotation_Appl *appl = 0; + AST_Annotation_Decl *decl = 0; UTL_ScopedName *name = $2; AST_Annotation_Decl::escape_name (name); - AST_Annotation_Appl::Params *params = $3; - // Check for Annotation Declaration + // Check for Matching Annotation Declaration AST_Decl *d = idl_global->scopes ().top_non_null ()-> lookup_by_name (name); - if (!d /*&& !idl_global->ignore_missing_annotations_*/) + if (d) { - idl_global->err ()->lookup_error (name); + decl = AST_Annotation_Decl::narrow_from_decl (d); + if (decl) + { + idl_global->scopes ().push (decl); + } } else { - AST_Annotation_Decl *decl = AST_Annotation_Decl::narrow_from_decl (d); + Identifier &id = *name->last_component (); + switch (idl_global->unknown_annotations_) + { + default: + case IDL_GlobalData::UNKNOWN_ANNOTATIONS_WARN_ONCE: + if (idl_global->unknown_annotations_seen_.insert (id) == 1) + { + break; + } + idl_global->err ()->lookup_warning (name); + break; + case IDL_GlobalData::UNKNOWN_ANNOTATIONS_WARN_ALL: + idl_global->err ()->lookup_warning (name); + break; + case IDL_GlobalData::UNKNOWN_ANNOTATIONS_ERROR: + idl_global->err ()->lookup_error (name); + break; + case IDL_GlobalData::UNKNOWN_ANNOTATIONS_IGNORE: + break; + } + + // Ignore lookup errors for parameter values that might depend + // on constants or enums from the annotation declaration. + idl_global->ignore_lookup_errors_ = true; + } + + $<annotation_decl_val>$ = decl; + } + annotation_appl_params_maybe + { + idl_global->ignore_lookup_errors_ = false; + AST_Annotation_Appl *appl = 0; + UTL_ScopedName *name = $2; + AST_Annotation_Decl *decl = $<annotation_decl_val>3; + AST_Annotation_Appl::Params *params = $4; + + if (decl) + { appl = idl_global->gen ()->create_annotation_appl (name, params); appl->apply_from (decl); + idl_global->scopes ().pop (); } $$ = appl; @@ -3330,7 +3375,10 @@ switch_type_spec : $1 = 0; /* If we don't return here, we'll crash later.*/ - return 1; + if (!idl_global->ignore_lookup_errors_) + { + return 1; + } } $1->destroy (); @@ -3939,6 +3987,8 @@ string_type_spec idl_global->root ()->fe_add_string ( AST_String::narrow_from_decl ( tao_string_decl)); + + $$ = tao_string_decl; } ; @@ -4012,6 +4062,8 @@ wstring_type_spec idl_global->root ()->fe_add_string ( AST_String::narrow_from_decl ( string)); + + $$ = string; } ; diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index d6525e8b5ea..89842d5a77e 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -300,6 +300,13 @@ public: , PS_AnnotationDeclSeen }; + enum Unknown_Annotations { + UNKNOWN_ANNOTATIONS_WARN_ONCE, + UNKNOWN_ANNOTATIONS_WARN_ALL, + UNKNOWN_ANNOTATIONS_ERROR, + UNKNOWN_ANNOTATIONS_IGNORE + }; + // flags for types of declarations seen while parsing. bool abstract_iface_seen_; bool abstractbase_seen_; @@ -407,7 +414,7 @@ public: bool in_eval_; /** - * Dump contructs defined using eval() if true. + * Dump constructs defined using eval() if true. */ bool dump_builtins_; @@ -422,6 +429,21 @@ public: */ bool ignore_files_; + /** + * If true, silently ignore lookup errors. + */ + bool ignore_lookup_errors_; + + /** + * Reaction to unknown annotations + */ + Unknown_Annotations unknown_annotations_; + + /** + * Set of the local names of unkown annotations already seen + */ + ACE_Unbounded_Set<Identifier> unknown_annotations_seen_; + IDL_GlobalData (void); ~IDL_GlobalData (void); diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h index 40e9e711583..ecd81b7a330 100644 --- a/TAO/TAO_IDL/include/utl_err.h +++ b/TAO/TAO_IDL/include/utl_err.h @@ -218,6 +218,9 @@ public: // Report a failed name lookup attempt. void lookup_error (UTL_ScopedName *n); + /// Report a failed name lookup attempt as a warning. + void lookup_warning (UTL_ScopedName *n); + // Report an illegal #pragma version. void version_number_error (char *n); diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp index 832f70fb8cb..188232d0d67 100644 --- a/TAO/TAO_IDL/util/utl_err.cpp +++ b/TAO/TAO_IDL/util/utl_err.cpp @@ -867,12 +867,24 @@ UTL_Error::coercion_error (AST_Expression *v, void UTL_Error::lookup_error (UTL_ScopedName *n) { + if (idl_global->ignore_lookup_errors_) return; idl_error_header (EIDL_LOOKUP_ERROR); n->dump (*ACE_DEFAULT_LOG_STREAM);; ACE_ERROR ((LM_ERROR, "\n")); } +void +UTL_Error::lookup_warning (UTL_ScopedName *n) +{ + if (idl_global->print_warnings ()) + { + idl_warning_header (EIDL_LOOKUP_ERROR); + n->dump (*ACE_DEFAULT_LOG_STREAM);; + ACE_ERROR ((LM_ERROR, "\n")); + } +} + // Report an illegal version number assignment. void UTL_Error::version_number_error (char *n) diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index 2600da4864c..a0bd51ee67c 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -119,6 +119,8 @@ IDL_GlobalData::IDL_GlobalData (void) dump_builtins_ (false), just_dump_builtins_ (false), ignore_files_ (false), + ignore_lookup_errors_ (false), + unknown_annotations_ (UNKNOWN_ANNOTATIONS_WARN_ONCE), pd_root (0), pd_gen (0), pd_primary_key_base (0), @@ -1936,7 +1938,7 @@ IDL_GlobalData::eval (const char *string) UTL_String *old_filename = filename (); pd_filename = 0; long old_lineno = lineno (); - idl_global->set_lineno (-1); + idl_global->set_lineno (1); UTL_String *old_idl_src_file = idl_src_file (); // Name this pseudo-file "builtin" |