summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2019-01-17 12:36:32 +0100
committerJohnny Willemsen <jwillemsen@remedy.nl>2019-01-17 12:36:32 +0100
commit5c2dfef4413bf4480fded248269ee111a11e020d (patch)
tree4f6d89e2f58145a6db58e380a19fd65a8e77f581
parent3cd2852488a6cdff8ebd19752d1566b08a3b13b4 (diff)
parent48931304d502d07a97338b807e92af66a30a6200 (diff)
downloadATCD-5c2dfef4413bf4480fded248269ee111a11e020d.tar.gz
Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO
Diffstat
-rw-r--r--ACE/NEWS4
-rw-r--r--TAO/MPC/config/taobaseidldefaults.mpb1
-rw-r--r--TAO/NEWS27
-rw-r--r--TAO/TAO_IDL/ast/ast_annotation_appl.cpp4
-rw-r--r--TAO/TAO_IDL/ast/ast_annotation_member.cpp2
-rw-r--r--TAO/TAO_IDL/ast/ast_enum_val.cpp3
-rw-r--r--TAO/TAO_IDL/ast/ast_field.cpp6
-rw-r--r--TAO/TAO_IDL/driver/drv_args.cpp6
-rw-r--r--TAO/TAO_IDL/fe/idl.tab.cpp4480
-rw-r--r--TAO/TAO_IDL/fe/idl.ypp51
-rw-r--r--TAO/TAO_IDL/include/ast_field.h7
-rw-r--r--TAO/TAO_IDL/include/idl_version.h2
-rw-r--r--TAO/TAO_IDL/util/idl_version.cpp15
-rw-r--r--TAO/TAO_IDL/util/utl_global.cpp14
-rw-r--r--TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc1
-rw-r--r--TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc1
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP.mpc1
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP.mpc1
-rw-r--r--TAO/tests/IDLv4/annotations/be_init.cpp35
19 files changed, 2366 insertions, 2295 deletions
diff --git a/ACE/NEWS b/ACE/NEWS
index ac763582db8..50a9fe7dd3e 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,6 +1,10 @@
USER VISIBLE CHANGES BETWEEN ACE-6.5.3 and ACE-6.5.4
====================================================
+. Fix ACE_Vector::end(), which now correctly
+ represents the end of the elements of the vector
+ instead of the end of the base array.
+
USER VISIBLE CHANGES BETWEEN ACE-6.5.2 and ACE-6.5.3
====================================================
diff --git a/TAO/MPC/config/taobaseidldefaults.mpb b/TAO/MPC/config/taobaseidldefaults.mpb
index 073b8a32334..391e6e6644f 100644
--- a/TAO/MPC/config/taobaseidldefaults.mpb
+++ b/TAO/MPC/config/taobaseidldefaults.mpb
@@ -16,6 +16,7 @@ project: build_files {
libpath = $(ACE_ROOT)/lib
inputext = .idl
keyword idlflags = commandflags
+ output_follows_input = 0
optional(header_outputext) {
commandflags(!-Sch || !-Ssh || -GC) = .h, .hpp, .hxx, .hh
diff --git a/TAO/NEWS b/TAO/NEWS
index cdd17edf366..fd4b90ac9b2 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -5,6 +5,33 @@ USER VISIBLE CHANGES BETWEEN TAO-2.5.3 and TAO-2.5.4
of servers which use the ImR heavily and each of
them does a frequent shutdown/start cycle
+. The TAO_IDL frontend library now parses all IDL4
+ annotation-related syntax: using and defining annotations.
+ Use the tao_idl command-line options --idl-version and
+ --unknown-annotations to control annotation parsing.
+ Documentation on this feature is located in
+ TAO/TAO_IDL/docs/annotations.md.
+
+. TAO_IDL now will return an error status code when
+ passing an invalid command line argument.
+ Backends will have to support this behavior
+ explicitly, see TAO/TAO_IDL/include/idl_defines.h
+ for details.
+ TAO_IDL also accepts new options such as -h,
+ --help, --version, and --syntax-only, the latter
+ of which won't generate any files, just check
+ syntax of the IDL file(s).
+ See tao_idl -h for details.
+
+. When using IDL_Files in MPC, generated files will
+ now be placed in the current directory by default,
+ instead of the directory of the IDL file.
+ Use
+ idlflags += -o <IDL_FILE_DIR>
+ gendir = <IDL_FILE_DIR>
+ to output generated files to where the IDL file
+ is.
+
USER VISIBLE CHANGES BETWEEN TAO-2.5.2 and TAO-2.5.3
====================================================
diff --git a/TAO/TAO_IDL/ast/ast_annotation_appl.cpp b/TAO/TAO_IDL/ast/ast_annotation_appl.cpp
index 5dd5469d5db..d5987c7d6a0 100644
--- a/TAO/TAO_IDL/ast/ast_annotation_appl.cpp
+++ b/TAO/TAO_IDL/ast/ast_annotation_appl.cpp
@@ -2,7 +2,9 @@
#include "ast_annotation_member.h"
AST_Annotation_Appl::Param::Param ()
- : used (false)
+ : id (0),
+ expr (0),
+ used (false)
{
}
diff --git a/TAO/TAO_IDL/ast/ast_annotation_member.cpp b/TAO/TAO_IDL/ast/ast_annotation_member.cpp
index 2acba197bfb..40884ef5aae 100644
--- a/TAO/TAO_IDL/ast/ast_annotation_member.cpp
+++ b/TAO/TAO_IDL/ast/ast_annotation_member.cpp
@@ -63,7 +63,7 @@ void
AST_Annotation_Member::dump (ACE_OSTREAM_TYPE &o)
{
AST_Field::dump (o);
- if (value_)
+ if (field_type () && value_)
{
dump_i (o, " default ");
if (field_type ()->node_type () == AST_Decl::NT_enum)
diff --git a/TAO/TAO_IDL/ast/ast_enum_val.cpp b/TAO/TAO_IDL/ast/ast_enum_val.cpp
index c33e22c8040..eef74bb560a 100644
--- a/TAO/TAO_IDL/ast/ast_enum_val.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum_val.cpp
@@ -79,7 +79,8 @@ AST_EnumVal::AST_EnumVal (ACE_CDR::ULong v,
AST_Constant (AST_Expression::EV_ulong,
AST_Decl::NT_enum_val,
new AST_Expression (v),
- n)
+ n),
+ enum_parent_ (0)
{
}
diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp
index 16e6b22c3c0..15f5d97b957 100644
--- a/TAO/TAO_IDL/ast/ast_field.cpp
+++ b/TAO/TAO_IDL/ast/ast_field.cpp
@@ -222,6 +222,12 @@ AST_Field::visibility (void) const
return this->visibility_;
}
+void
+AST_Field::visibility (AST_Field::Visibility val)
+{
+ visibility_ = val;
+}
+
int
AST_Field::contains_wstring (void)
{
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 1f81a9f6c11..f2ef45176fa 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -705,10 +705,6 @@ process_long_option(long ac, char **av, long &i)
}
else
{
- ACE_DEBUG ((LM_ERROR,
- ACE_TEXT ("Unknown long option: %C\n"),
- long_option
- ));
- idl_global->parse_args_exit (1);
+ be_global->parse_args (i, av);
}
}
diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp
index 705278d1047..5493bded1a1 100644
--- a/TAO/TAO_IDL/fe/idl.tab.cpp
+++ b/TAO/TAO_IDL/fe/idl.tab.cpp
@@ -584,16 +584,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 4
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1566
+#define YYLAST 1537
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 109
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 400
+#define YYNNTS 398
/* YYNRULES -- Number of rules. */
-#define YYNRULES 597
+#define YYNRULES 595
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 879
+#define YYNSTATES 876
/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
by yylex, with out-of-bounds checking. */
@@ -648,66 +648,66 @@ static const yytype_uint8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 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, 2132, 2133, 2140, 2144, 2149, 2156, 2160, 2164, 2169,
- 2173, 2177, 2181, 2188, 2257, 2256, 2283, 2284, 2288, 2289,
- 2290, 2292, 2291, 2300, 2301, 2305, 2356, 2360, 2367, 2380,
- 2390, 2398, 2397, 2470, 2474, 2481, 2490, 2497, 2505, 2511,
- 2518, 2529, 2528, 2537, 2541, 2545, 2549, 2575, 2583, 2582,
- 2654, 2655, 2659, 2666, 2667, 2693, 2694, 2695, 2696, 2697,
- 2698, 2699, 2700, 2704, 2705, 2706, 2707, 2711, 2712, 2713,
- 2717, 2718, 2722, 2734, 2732, 2757, 2764, 2765, 2769, 2781,
- 2779, 2804, 2811, 2827, 2845, 2846, 2850, 2854, 2858, 2865,
- 2869, 2873, 2880, 2884, 2888, 2895, 2902, 2906, 2913, 2920,
- 2927, 2934, 2942, 2941, 2955, 2986, 2990, 2954, 3007, 3010,
- 3011, 3015, 3015, 3034, 3038, 3033, 3102, 3101, 3114, 3113,
- 3126, 3130, 3163, 3167, 3223, 3227, 3125, 3249, 3256, 3269,
- 3278, 3285, 3286, 3395, 3398, 3399, 3404, 3408, 3403, 3441,
- 3440, 3452, 3462, 3480, 3488, 3487, 3501, 3505, 3500, 3521,
- 3520, 3571, 3596, 3620, 3624, 3655, 3659, 3619, 3683, 3688,
- 3686, 3692, 3696, 3733, 3737, 3731, 3824, 3894, 3903, 3893,
- 3917, 3927, 3931, 3925, 3976, 4002, 4011, 4015, 4009, 4051,
- 4077, 4085, 4084, 4129, 4139, 4157, 4165, 4169, 4164, 4229,
- 4230, 4235, 4239, 4243, 4247, 4234, 4314, 4318, 4322, 4326,
- 4313, 4402, 4406, 4435, 4439, 4401, 4455, 4459, 4523, 4527,
- 4453, 4562, 4567, 4572, 4579, 4580, 4591, 4596, 4637, 4590,
- 4657, 4656, 4665, 4664, 4675, 4680, 4678, 4684, 4689, 4693,
- 4688, 4732, 4731, 4740, 4739, 4750, 4755, 4753, 4759, 4764,
- 4768, 4763, 4813, 4820, 4821, 4822, 4929, 4933, 4937, 4945,
- 4949, 4944, 4958, 4966, 4970, 4965, 4979, 4987, 4991, 4986,
- 5000, 5008, 5012, 5007, 5021, 5028, 5040, 5038, 5061, 5068,
- 5096, 5133, 5134, 5138, 5167, 5206, 5210, 5166, 5227, 5231,
- 5225, 5272, 5271, 5279, 5286, 5287, 5292, 5291, 5300, 5299,
- 5308, 5307, 5316, 5315, 5324, 5323, 5332, 5331, 5340, 5339,
- 5349, 5439, 5445, 5470, 5576, 5585, 5589, 5595, 5667, 5739,
- 5813, 5812, 5860, 5864, 5868, 5872, 5876, 5880, 5859, 5933,
- 5932, 5940, 5947, 5952, 5960, 5964, 5959, 5974, 5975, 5979,
- 5981, 5980, 5989, 5988, 6001, 6024, 5999, 6050, 6077, 6048,
- 6101, 6102, 6103, 6107, 6108, 6112, 6139, 6169, 6213, 6217,
- 6167, 6232, 6241, 6259, 6270, 6269, 6307, 6356, 6360, 6305,
- 6375, 6379, 6386, 6390, 6394, 6398, 6402, 6406, 6410, 6414,
- 6418, 6422, 6430, 6461, 6474, 6481, 6506, 6524, 6531, 6546,
- 6553, 6563, 6567, 6585, 6589, 6562, 6602, 6608, 6611, 6618,
- 6617, 6624, 6623, 6630, 6629, 6639, 6708, 6758, 6773, 6785,
- 6792, 6851, 6856, 6860, 6855, 6919, 6923, 6918, 6936, 6937,
- 6942, 6941, 6950, 6949, 6958, 6957, 6966, 6965
+ 0, 387, 387, 390, 391, 399, 412, 418, 422, 426,
+ 434, 433, 443, 442, 452, 451, 461, 460, 470, 469,
+ 479, 478, 488, 487, 497, 496, 506, 505, 515, 514,
+ 524, 523, 533, 532, 542, 541, 551, 550, 560, 559,
+ 573, 572, 584, 623, 627, 583, 643, 651, 665, 675,
+ 705, 709, 650, 732, 736, 737, 741, 742, 747, 752,
+ 746, 838, 843, 837, 912, 913, 918, 956, 960, 917,
+ 976, 975, 987, 1024, 1054, 1087, 1086, 1095, 1102, 1103,
+ 1104, 1105, 1109, 1113, 1118, 1161, 1165, 1117, 1192, 1235,
+ 1239, 1190, 1256, 1254, 1294, 1293, 1305, 1309, 1316, 1321,
+ 1329, 1354, 1380, 1444, 1445, 1449, 1450, 1451, 1456, 1460,
+ 1467, 1485, 1486, 1491, 1490, 1499, 1498, 1507, 1506, 1515,
+ 1514, 1523, 1522, 1531, 1530, 1539, 1538, 1547, 1546, 1558,
+ 1570, 1568, 1593, 1600, 1610, 1609, 1635, 1633, 1658, 1668,
+ 1679, 1723, 1750, 1780, 1784, 1788, 1792, 1779, 1854, 1855,
+ 1856, 1857, 1858, 1859, 1860, 1864, 1868, 1936, 1938, 1940,
+ 1941, 1953, 1954, 1966, 1967, 1979, 1980, 1989, 2001, 2002,
+ 2011, 2023, 2024, 2033, 2042, 2054, 2055, 2064, 2073, 2085,
+ 2143, 2144, 2151, 2155, 2160, 2167, 2171, 2175, 2180, 2184,
+ 2188, 2192, 2199, 2268, 2267, 2294, 2295, 2299, 2300, 2301,
+ 2303, 2302, 2311, 2312, 2316, 2367, 2371, 2378, 2391, 2401,
+ 2409, 2408, 2481, 2485, 2492, 2501, 2508, 2516, 2522, 2529,
+ 2540, 2539, 2548, 2552, 2556, 2560, 2586, 2594, 2593, 2665,
+ 2666, 2670, 2677, 2678, 2704, 2705, 2706, 2707, 2708, 2709,
+ 2710, 2711, 2715, 2716, 2717, 2718, 2722, 2723, 2724, 2728,
+ 2729, 2733, 2745, 2743, 2768, 2775, 2776, 2780, 2792, 2790,
+ 2815, 2822, 2838, 2856, 2857, 2861, 2865, 2869, 2876, 2880,
+ 2884, 2891, 2895, 2899, 2906, 2913, 2917, 2924, 2931, 2938,
+ 2945, 2953, 2952, 2966, 2997, 3001, 2965, 3018, 3021, 3022,
+ 3026, 3041, 3045, 3040, 3103, 3102, 3115, 3114, 3127, 3131,
+ 3164, 3168, 3224, 3228, 3126, 3250, 3257, 3270, 3279, 3286,
+ 3287, 3396, 3399, 3400, 3405, 3409, 3404, 3442, 3441, 3453,
+ 3463, 3481, 3489, 3488, 3502, 3506, 3501, 3522, 3521, 3572,
+ 3597, 3621, 3625, 3656, 3660, 3620, 3684, 3689, 3687, 3693,
+ 3697, 3734, 3738, 3732, 3825, 3895, 3904, 3894, 3918, 3928,
+ 3932, 3926, 3977, 4003, 4012, 4016, 4010, 4052, 4078, 4086,
+ 4085, 4130, 4140, 4158, 4166, 4170, 4165, 4230, 4231, 4236,
+ 4240, 4244, 4248, 4235, 4315, 4319, 4323, 4327, 4314, 4403,
+ 4407, 4436, 4440, 4402, 4456, 4460, 4524, 4528, 4454, 4563,
+ 4568, 4573, 4580, 4581, 4592, 4597, 4638, 4591, 4658, 4657,
+ 4666, 4665, 4676, 4681, 4679, 4685, 4690, 4694, 4689, 4733,
+ 4732, 4741, 4740, 4751, 4756, 4754, 4760, 4765, 4769, 4764,
+ 4814, 4821, 4822, 4823, 4930, 4934, 4938, 4946, 4950, 4945,
+ 4959, 4967, 4971, 4966, 4980, 4988, 4992, 4987, 5001, 5009,
+ 5013, 5008, 5022, 5029, 5041, 5039, 5062, 5069, 5097, 5134,
+ 5135, 5139, 5168, 5207, 5211, 5167, 5228, 5232, 5226, 5273,
+ 5272, 5280, 5287, 5288, 5293, 5292, 5301, 5300, 5309, 5308,
+ 5317, 5316, 5325, 5324, 5333, 5332, 5341, 5340, 5350, 5440,
+ 5446, 5471, 5577, 5586, 5590, 5596, 5668, 5740, 5814, 5813,
+ 5861, 5865, 5869, 5873, 5877, 5881, 5860, 5934, 5933, 5941,
+ 5948, 5953, 5961, 5965, 5960, 5975, 5976, 5980, 5982, 5981,
+ 5990, 5989, 6002, 6025, 6000, 6051, 6078, 6049, 6102, 6103,
+ 6104, 6108, 6109, 6113, 6140, 6170, 6214, 6218, 6168, 6233,
+ 6242, 6260, 6271, 6270, 6308, 6357, 6361, 6306, 6376, 6380,
+ 6387, 6391, 6395, 6399, 6403, 6407, 6411, 6415, 6419, 6423,
+ 6431, 6462, 6475, 6482, 6507, 6525, 6532, 6547, 6554, 6564,
+ 6568, 6586, 6590, 6563, 6603, 6609, 6612, 6619, 6618, 6625,
+ 6624, 6631, 6630, 6640, 6709, 6759, 6774, 6786, 6793, 6852,
+ 6857, 6861, 6856, 6920, 6924, 6919, 6937, 6938, 6943, 6942,
+ 6951, 6950, 6959, 6958, 6967, 6966
};
#endif
@@ -752,77 +752,77 @@ static const char *const yytname[] =
"value_concrete_decl", "$@34", "$@35", "$@36", "value_abs_decl", "$@37",
"$@38", "$@39", "value_header", "$@40", "value_decl", "$@41",
"opt_truncatable", "supports_spec", "value_forward_decl",
- "value_box_decl", "value_elements", "value_element", "state_member",
- "@42", "@43", "exports", "export", "$@44", "$@45", "$@46", "$@47",
- "$@48", "$@49", "$@50", "$@51", "at_least_one_scoped_name",
- "scoped_names", "$@52", "scoped_name", "$@53", "$@54", "id",
- "defining_id", "interface_forward", "const_dcl", "$@55", "$@56", "$@57",
- "$@58", "const_type", "expression", "const_expr", "or_expr", "xor_expr",
+ "value_box_decl", "value_elements", "value_element", "visibility",
+ "state_member", "exports", "export", "$@42", "$@43", "$@44", "$@45",
+ "$@46", "$@47", "$@48", "$@49", "at_least_one_scoped_name",
+ "scoped_names", "$@50", "scoped_name", "$@51", "$@52", "id",
+ "defining_id", "interface_forward", "const_dcl", "$@53", "$@54", "$@55",
+ "$@56", "const_type", "expression", "const_expr", "or_expr", "xor_expr",
"and_expr", "shift_expr", "add_expr", "mult_expr", "unary_expr",
- "primary_expr", "literal", "positive_int_expr", "annotation_dcl", "$@59",
- "annotation_body", "annotation_statement", "$@60",
+ "primary_expr", "literal", "positive_int_expr", "annotation_dcl", "$@57",
+ "annotation_body", "annotation_statement", "$@58",
"annotation_member_type", "annotation_member",
"annotation_member_default", "at_least_one_annotation",
- "annotations_maybe", "annotation_appl", "@61",
+ "annotations_maybe", "annotation_appl", "@59",
"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",
+ "named_annotation_appl_param", "type_dcl", "$@60", "type_declarator",
+ "$@61", "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",
+ "declarators", "$@62", "declarator", "at_least_one_simple_declarator",
+ "simple_declarators", "$@63", "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",
+ "object_type", "struct_decl", "$@64", "struct_type", "$@65", "$@66",
+ "$@67", "at_least_one_member", "members", "member", "member_i", "$@68",
+ "$@69", "$@70", "union_decl", "$@71", "union_type", "$@72", "$@73",
+ "$@74", "$@75", "$@76", "$@77", "switch_type_spec",
+ "at_least_one_case_branch", "case_branches", "case_branch", "$@78",
+ "$@79", "$@80", "at_least_one_case_label", "case_labels", "case_label",
+ "$@81", "$@82", "$@83", "element_spec", "$@84", "struct_forward_type",
+ "union_forward_type", "enum_type", "$@85", "$@86", "$@87", "$@88",
+ "at_least_one_enumerator", "enumerators", "$@89", "enumerator",
+ "sequence_type_spec", "$@90", "$@91", "seq_head", "$@92", "$@93",
+ "fixed_type_spec", "string_type_spec", "$@94", "$@95", "string_head",
+ "wstring_type_spec", "$@96", "$@97", "wstring_head", "array_declarator",
+ "$@98", "at_least_one_array_dim", "array_dims", "array_dim", "$@99",
+ "$@100", "attribute", "attribute_readonly", "$@101", "$@102", "$@103",
+ "$@104", "attribute_readwrite", "$@105", "$@106", "$@107", "$@108",
+ "exception", "$@109", "$@110", "$@111", "$@112", "operation", "$@113",
+ "$@114", "$@115", "$@116", "opt_op_attribute", "op_type_spec",
+ "init_decl", "$@117", "$@118", "$@119", "init_parameter_list", "$@120",
+ "$@121", "at_least_one_in_parameter", "in_parameters", "$@122",
+ "in_parameter", "$@123", "$@124", "parameter_list", "$@125", "$@126",
+ "at_least_one_parameter", "parameters", "$@127", "parameter", "$@128",
+ "$@129", "param_type_spec", "direction", "opt_raises", "$@130", "$@131",
+ "opt_getraises", "$@132", "$@133", "opt_setraises", "$@134", "$@135",
+ "opt_context", "$@136", "$@137", "at_least_one_string_literal",
+ "string_literals", "$@138", "typeid_dcl", "typeprefix_dcl", "component",
+ "component_forward_decl", "component_decl", "$@139", "$@140", "$@141",
+ "component_header", "$@142", "$@143", "component_inheritance_spec",
+ "$@144", "component_exports", "component_export", "$@145", "$@146",
+ "$@147", "$@148", "$@149", "$@150", "$@151", "provides_decl",
"interface_type", "uses_decl", "uses_opt_multiple", "opt_multiple",
- "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",
+ "emits_decl", "publishes_decl", "consumes_decl", "home_decl", "$@152",
+ "home_header", "$@153", "$@154", "$@155", "$@156", "$@157", "$@158",
+ "home_inheritance_spec", "$@159", "primary_key_spec", "home_body",
+ "$@160", "$@161", "home_exports", "home_export", "$@162", "$@163",
+ "factory_decl", "$@164", "$@165", "finder_decl", "$@166", "$@167",
"event", "event_forward_decl", "event_concrete_forward_decl",
- "event_abs_forward_decl", "event_abs_decl", "$@171", "$@172", "$@173",
+ "event_abs_forward_decl", "event_abs_decl", "$@168", "$@169", "$@170",
"event_abs_header", "event_custom_header", "event_plain_header",
- "event_rest_of_header", "$@174", "event_decl", "$@175", "$@176", "$@177",
+ "event_rest_of_header", "$@171", "event_decl", "$@172", "$@173", "$@174",
"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", "$@178", "$@179", "$@180",
- "$@181", "at_least_one_port_export", "port_exports", "port_export",
- "$@182", "$@183", "$@184", "extended_port_decl",
+ "formal_parameter_name", "porttype_decl", "$@175", "$@176", "$@177",
+ "$@178", "at_least_one_port_export", "port_exports", "port_export",
+ "$@179", "$@180", "$@181", "extended_port_decl",
"at_least_one_actual_parameter", "actual_parameters", "actual_parameter",
- "connector_decl", "connector_header", "$@185", "$@186", "connector_body",
- "$@187", "$@188", "connector_exports", "connector_export", "$@189",
- "$@190", "$@191", "$@192", YY_NULLPTR
+ "connector_decl", "connector_header", "$@182", "$@183", "connector_body",
+ "$@184", "$@185", "connector_exports", "connector_export", "$@186",
+ "$@187", "$@188", "$@189", YY_NULLPTR
};
#endif
@@ -845,12 +845,12 @@ static const yytype_uint16 yytoknum[] =
};
# endif
-#define YYPACT_NINF -631
+#define YYPACT_NINF -611
#define yypact_value_is_default(Yystate) \
- (!!((Yystate) == (-631)))
+ (!!((Yystate) == (-611)))
-#define YYTABLE_NINF -539
+#define YYTABLE_NINF -537
#define yytable_value_is_error(Yytable_value) \
0
@@ -859,94 +859,94 @@ static const yytype_uint16 yytoknum[] =
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- -631, 53, 704, -631, -631, -631, -631, -631, -631, -631,
- -631, -631, -631, -631, 96, 66, 98, 140, -631, 96,
- 96, -631, 44, 44, -631, -631, 96, -631, -631, 0,
- -631, 239, 23, 54, -631, -631, 97, -631, -631, -631,
- -631, -631, -631, 347, -631, -631, -631, -631, -631, 1376,
- 67, -631, -631, 91, -631, 169, -631, -631, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, -631, -631,
- -631, -631, -631, -631, 125, -631, -631, -631, 125, -631,
- -631, 147, 165, 1173, 44, 96, 1485, 96, 96, 96,
- 96, -631, -631, -631, 99, 96, 145, -631, 151, 96,
- -631, 125, 96, 199, 203, 96, -631, -631, 15, -631,
- 28, -631, -631, 153, -631, 204, 214, 403, -631, -631,
- -631, 215, 257, -631, 218, 220, 222, 170, -631, 154,
- -631, -631, -631, -631, -631, -631, 225, -631, -631, -631,
- -631, -631, -631, 240, -631, -631, -631, -631, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, -631, -631,
- -631, 169, -631, -631, -631, 188, -631, -631, 229, -631,
- 231, 236, 242, -631, 44, 241, 243, 244, -631, 246,
- 247, 248, 250, 256, 251, 258, 261, -631, -631, -631,
- 264, 266, -631, -631, -631, -631, 240, -631, -631, -631,
- -631, -631, -631, -631, -631, -631, 240, -631, -631, -631,
- -631, -631, -631, -631, -631, 281, -631, 285, -631, -631,
- 253, -631, 329, -631, -631, -631, 41, 70, -631, -631,
- -631, 1173, -631, -631, -631, -631, 288, -631, -631, -631,
- -631, 334, -631, -631, 39, 290, -631, -631, -631, -631,
- -631, -631, -631, -631, 372, -631, 150, 293, 339, -631,
- -631, -631, -631, -631, -631, 240, -631, -631, 291, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, 339, 301,
- 304, -631, -631, -631, 96, 96, 308, 310, -631, -631,
- -631, 311, -631, 329, -631, -631, -631, -631, -631, -631,
- 400, -631, 313, 312, -631, -631, -631, -631, -631, -631,
- -631, -631, -631, -631, 56, 56, 56, 150, 240, -631,
- -631, 315, 317, 314, 88, 111, 166, -631, -631, -631,
- -631, -631, 44, -631, -631, -631, -631, 322, -631, 44,
- -631, 150, 150, 150, 303, -631, -631, -631, -631, -631,
- -631, -631, 221, -631, -6, -631, -631, -631, -631, -631,
- -631, -631, -631, 44, 339, -631, -631, -631, 331, 253,
- 633, 1245, 332, 333, -631, 403, -631, -631, -631, 323,
- 150, 150, 150, 150, 150, 150, 150, 150, 150, 150,
- 327, 96, -631, 240, 1081, 829, 150, -631, -631, -631,
- -631, -631, 150, -631, -631, -631, -631, -631, 152, 997,
- -631, -631, -631, -631, 83, 373, 44, 44, -631, -631,
- -631, -631, -631, 83, -631, 342, -631, 338, -631, 343,
- -631, -631, 1116, 240, -631, 44, 339, -631, -631, -631,
- -631, 348, -631, -631, 96, -631, -631, 350, 349, 438,
- 357, -631, -631, 317, 314, 88, 111, 111, 166, 166,
- -631, -631, -631, -631, -631, 354, -631, -631, -631, 359,
- -631, -631, -631, -631, -631, -631, 869, -631, -631, -631,
- -631, -631, 360, -631, -631, -631, 363, 361, 770, 368,
- 370, 371, 369, -631, 362, -631, 378, 365, 375, 1325,
- 192, 44, 44, 44, -631, 383, -631, -631, -631, -631,
- -631, -631, -631, 96, 96, -631, 384, -631, -631, -631,
- 1200, 913, 444, 953, -631, 240, 329, -631, -631, 65,
- 68, 388, 394, 395, 329, 396, -631, -631, 1, -631,
- 71, -631, -631, 397, 398, 240, -631, 210, 1485, -631,
- 457, -631, -631, -631, -631, 39, -631, 401, -631, 402,
- 404, 405, 406, 407, -631, 240, -631, -631, -631, -631,
- -631, 408, 409, -631, 1466, 1466, -631, -631, -631, -631,
- -631, -631, -631, 150, -631, 329, -631, -631, -631, -631,
- -631, -631, 483, 240, -631, -631, -631, -631, -631, -631,
- 79, 79, 79, 412, -631, 414, 417, 418, 423, 429,
- 431, -631, -631, -631, 433, 434, 435, 437, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, 150, -631,
- -631, -631, 96, -631, 442, 430, 448, -631, 473, -631,
- -631, -631, -631, -631, 452, 150, 453, 1351, -631, 44,
- -631, -631, -631, -631, -631, -631, -631, -631, -631, 80,
- -631, -631, -631, 369, 378, 466, 96, 449, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, 451, 451,
- -631, -631, -631, -631, 953, 96, -631, 150, 416, -631,
- -631, -631, -631, -631, 471, 472, 474, 475, 210, -631,
- -631, -631, 44, -631, -631, -631, -631, 478, 240, 81,
- -631, -631, -631, -631, -631, 528, -631, -631, -631, -631,
- -631, -631, -631, -631, 44, -631, -631, -631, -631, -631,
- 240, 477, 508, -631, -631, 451, 481, 484, 464, 539,
- 537, 537, 96, 521, 487, 469, -631, 240, 491, -631,
- -631, 479, -631, -631, -631, -631, -631, 480, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, 524, 582, 482,
- -631, 537, 93, 953, -631, 495, 485, 537, 486, 530,
- 96, 44, -631, -631, 501, -631, 489, 211, 537, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, -631, -631,
- -631, -631, -631, -631, -631, 240, -631, 502, -631, -631,
- -631, -631, 493, -631, -631, -631, 509, 150, 507, 511,
- 69, -631, 228, 96, 539, 44, 44, 497, 96, 582,
- -631, 510, 953, 564, -631, -631, -631, -631, -631, 1440,
- -631, -631, -631, 499, 500, -631, -631, -631, -631, -631,
- -631, -631, 514, -631, -631, -631, -631, 44, 211, 96,
- 504, -631, 96, 522, 505, -631, -631, -631, -631, -631,
- -631, 538, -631, 506, 520, -631, -631, 540, -631
+ -611, 63, 739, -611, -611, -611, -611, -611, -611, -611,
+ -611, -611, -611, -611, 41, 66, 98, 107, -611, 41,
+ 41, -611, 38, 38, -611, -611, 41, -611, -611, 7,
+ -611, 674, 29, 56, -611, -611, 70, -611, -611, -611,
+ -611, -611, -611, 270, -611, -611, -611, -611, -611, 1312,
+ 93, -611, -611, 69, -611, 128, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
+ -611, -611, -611, -611, 110, -611, -611, -611, 110, -611,
+ -611, 124, 132, 586, 38, 41, 1421, 41, 41, 41,
+ 41, -611, -611, -611, 71, 41, 112, -611, 118, 41,
+ -611, 110, 41, 135, 146, 41, -611, -611, 16, -611,
+ 21, -611, -611, 149, -611, 151, 168, 705, -611, -611,
+ -611, 181, 228, -611, 188, 204, 217, 166, -611, 159,
+ -611, -611, -611, -611, -611, -611, 216, -611, -611, -611,
+ -611, -611, -611, 227, -611, -611, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
+ -611, 128, -611, -611, -611, 15, -611, -611, 218, -611,
+ 220, 225, 226, -611, 38, 229, 231, 233, -611, 235,
+ 236, 237, 239, 241, 240, 246, 243, -611, -611, -611,
+ 248, 249, -611, -611, -611, -611, 227, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, 227, -611, -611, -611,
+ -611, -611, -611, -611, -611, 250, -611, 251, -611, -611,
+ 253, -611, 340, -611, -611, -611, 34, 44, -611, -611,
+ -611, 586, -611, -611, -611, -611, 254, -611, -611, -611,
+ -611, 341, -611, -611, 49, 255, -611, -611, -611, -611,
+ -611, -611, -611, -611, 344, -611, 117, 258, 306, -611,
+ -611, -611, -611, -611, -611, 227, -611, -611, 257, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611, 306, 265,
+ 266, -611, -611, -611, 41, 41, 267, 268, -611, -611,
+ -611, 272, -611, 340, -611, -611, -611, -611, -611, -611,
+ 357, -611, 276, 275, -611, -611, -611, -611, -611, -611,
+ -611, -611, -611, -611, 152, 152, 152, 117, 227, -611,
+ -611, 274, 277, 279, 104, 145, 140, -611, -611, -611,
+ -611, -611, 38, -611, -611, -611, -611, 281, -611, 38,
+ -611, 117, 117, 117, 273, -611, -611, -611, -611, -611,
+ -611, -611, 139, -611, 1, -611, -611, -611, -611, -611,
+ -611, -611, -611, 38, 306, -611, -611, -611, 290, 253,
+ 1158, 1181, 294, 288, -611, 705, -611, -611, -611, 280,
+ 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 295, 41, -611, 227, 910, 523, 117, -611, -611, -611,
+ -611, -611, 117, -611, 1261, -611, -611, -611, 428, 622,
+ -611, -611, -611, -611, 62, 332, 38, 38, -611, -611,
+ -611, -611, -611, 62, -611, 309, -611, 307, -611, 310,
+ -611, -611, 945, 227, -611, 38, 306, -611, -611, -611,
+ -611, 315, -611, -611, 41, -611, -611, 318, 319, 405,
+ 323, -611, -611, 277, 279, 104, 145, 145, 140, 140,
+ -611, -611, -611, -611, -611, 324, -611, -611, -611, 327,
+ -611, -611, -611, -611, -611, -611, 866, -611, -611, -611,
+ -611, -611, 329, -611, 1402, -611, -611, 333, 328, 1003,
+ 331, 334, 335, 330, -611, 325, -611, 338, -611, -611,
+ -611, 339, 345, 252, 38, 38, 38, -611, 346, -611,
+ -611, -611, -611, -611, -611, -611, 41, 41, -611, 347,
+ -611, -611, -611, 1029, 826, 393, 1456, -611, 227, 340,
+ -611, -611, 57, 64, 350, 351, 352, 340, 353, -611,
+ -611, 3, -611, 48, -611, -611, 359, 360, 227, -611,
+ 154, 1421, -611, 413, -611, -611, -611, -611, 49, -611,
+ 355, -611, 367, 369, 376, 378, 380, -611, 227, -611,
+ -611, -611, -611, -611, 381, 382, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, 117, -611, 340, -611, 383,
+ 41, -611, -611, 464, 227, -611, -611, -611, -611, -611,
+ -611, 65, 65, 65, 385, -611, 386, 387, 388, 389,
+ 390, 397, -611, -611, -611, 398, 399, 400, 404, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611, -611, 117,
+ -611, -611, -611, 41, -611, 408, 401, 409, -611, 434,
+ -611, -611, -611, -611, -611, 414, 117, 415, 1287, -611,
+ 38, -611, -611, -611, -611, -611, -611, -611, -611, -611,
+ 50, -611, 330, 338, -611, -611, 395, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, -611, 403, 403, -611,
+ -611, -611, -611, 1456, 41, -611, 117, 402, -611, -611,
+ -611, -611, -611, 417, 422, 424, 425, 154, -611, -611,
+ -611, 38, -611, -611, -611, -611, 429, 227, 54, -611,
+ -611, 430, -611, 481, -611, -611, -611, -611, -611, -611,
+ -611, -611, 38, -611, -611, -611, -611, -611, 227, 431,
+ 1074, -611, -611, 403, -611, 433, 419, 493, 507, 507,
+ 41, 492, 457, 444, -611, 227, 467, -611, -611, 454,
+ -611, -611, -611, -611, 455, -611, -611, -611, -611, -611,
+ -611, -611, -611, -611, 501, 559, 458, -611, 507, 85,
+ 1456, -611, 471, 461, 507, 465, 509, 41, 38, -611,
+ -611, 480, -611, 468, 215, 507, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
+ -611, -611, 227, -611, 479, -611, -611, -611, -611, 469,
+ -611, -611, -611, 489, 117, 485, 490, 72, -611, 219,
+ 41, 493, 38, 38, 474, 41, 559, -611, 487, 1456,
+ 543, -611, -611, -611, -611, -611, 1376, -611, -611, -611,
+ 477, 478, -611, -611, -611, -611, -611, -611, -611, 495,
+ -611, -611, -611, -611, 38, 215, 41, 486, -611, 41,
+ 497, 499, -611, -611, -611, -611, -611, -611, 517, -611,
+ 500, 513, -611, -611, 518, -611
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -954,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, 221,
- 282, 298, 333, 381, 0, 0, 0, 0, 94, 0,
- 0, 492, 0, 0, 561, 582, 0, 6, 7, 42,
+ 4, 0, 0, 3, 1, 38, 143, 40, 70, 220,
+ 281, 296, 331, 379, 0, 0, 0, 0, 94, 0,
+ 0, 490, 0, 0, 559, 580, 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, 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,
+ 0, 12, 226, 283, 222, 330, 223, 249, 250, 224,
+ 20, 14, 16, 28, 450, 449, 452, 30, 488, 32,
+ 520, 522, 521, 519, 77, 538, 539, 518, 77, 34,
36, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 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, 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,
- 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, 139, 261, 225, 77, 0, 77, 88, 77, 0,
+ 82, 77, 0, 456, 531, 0, 138, 134, 0, 133,
+ 0, 209, 209, 0, 46, 0, 0, 0, 209, 8,
+ 9, 0, 97, 72, 0, 0, 0, 265, 267, 0,
+ 271, 272, 275, 276, 277, 278, 274, 279, 280, 345,
+ 353, 358, 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, 352, 244,
+ 357, 0, 0, 5, 0, 207, 0, 0, 298, 0,
+ 0, 0, 0, 0, 0, 0, 0, 532, 525, 534,
+ 0, 0, 583, 579, 39, 274, 156, 144, 148, 152,
+ 153, 149, 150, 151, 154, 155, 41, 71, 221, 227,
+ 282, 297, 332, 380, 73, 529, 74, 0, 530, 95,
+ 461, 491, 0, 447, 136, 448, 0, 0, 193, 43,
+ 25, 0, 545, 541, 542, 547, 544, 548, 546, 543,
+ 540, 0, 48, 552, 0, 0, 23, 96, 75, 67,
+ 27, 85, 266, 273, 268, 270, 0, 0, 99, 344,
+ 341, 349, 354, 19, 11, 210, 13, 284, 0, 21,
+ 15, 17, 29, 453, 31, 502, 489, 33, 99, 0,
+ 0, 35, 37, 587, 0, 0, 0, 0, 89, 459,
+ 457, 499, 135, 0, 560, 208, 581, 196, 4, 549,
+ 0, 553, 0, 550, 182, 183, 184, 186, 189, 188,
+ 190, 191, 187, 185, 0, 0, 0, 0, 179, 578,
+ 157, 158, 159, 161, 163, 165, 168, 171, 175, 180,
+ 577, 62, 0, 112, 104, 269, 192, 0, 346, 0,
+ 93, 0, 0, 0, 213, 209, 299, 463, 506, 533,
+ 526, 535, 584, 145, 261, 228, 254, 255, 256, 262,
+ 333, 381, 112, 0, 99, 497, 492, 137, 0, 461,
+ 0, 0, 3, 0, 49, 0, 176, 177, 178, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 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, 210, 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, 0, 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, 366,
- 362, 365, 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, 0, 363, 254,
- 337, 339, 385, 496, 0, 0, 0, 0, 566, 202,
- 206, 205, 0, 56, 42, 51, 55, 0, 132, 0,
- 397, 218, 297, 294, 303, 400, 515, 518, 373, 378,
- 261, 367, 364, 210, 0, 574, 570, 572, 565, 567,
- 58, 0, 0, 57, 387, 0, 0, 0, 0, 0,
- 432, 432, 0, 436, 258, 0, 340, 497, 0, 52,
- 54, 0, 398, 295, 304, 401, 408, 0, 407, 429,
- 516, 519, 374, 433, 379, 259, 368, 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
+ 575, 0, 76, 132, 0, 0, 0, 209, 98, 342,
+ 350, 355, 0, 211, 0, 285, 289, 209, 454, 0,
+ 112, 104, 369, 374, 0, 484, 0, 0, 592, 367,
+ 368, 588, 590, 0, 594, 0, 586, 0, 209, 251,
+ 209, 289, 0, 460, 458, 0, 99, 561, 582, 200,
+ 194, 0, 202, 195, 0, 197, 203, 0, 0, 0,
+ 0, 551, 181, 160, 162, 164, 166, 167, 169, 170,
+ 172, 173, 174, 209, 63, 129, 127, 389, 390, 0,
+ 111, 119, 113, 123, 121, 125, 0, 115, 117, 394,
+ 109, 108, 0, 103, 0, 105, 106, 0, 0, 0,
+ 0, 0, 0, 133, 214, 0, 215, 218, 294, 291,
+ 290, 0, 209, 0, 0, 0, 0, 474, 0, 462,
+ 464, 466, 468, 470, 472, 476, 0, 0, 507, 0,
+ 505, 508, 510, 0, 0, 0, 0, 480, 479, 0,
+ 483, 482, 0, 0, 0, 0, 0, 0, 0, 585,
+ 146, 0, 252, 0, 334, 339, 209, 0, 498, 493,
+ 0, 0, 198, 206, 199, 45, 554, 50, 0, 130,
+ 0, 69, 0, 0, 0, 0, 0, 393, 423, 420,
+ 421, 422, 384, 392, 0, 0, 209, 87, 110, 107,
+ 348, 347, 343, 351, 356, 0, 212, 0, 216, 0,
+ 0, 286, 288, 265, 310, 305, 306, 307, 308, 300,
+ 309, 0, 0, 0, 0, 455, 0, 0, 0, 0,
+ 0, 0, 512, 515, 504, 0, 0, 0, 0, 370,
+ 375, 478, 573, 574, 593, 589, 591, 481, 595, 0,
+ 364, 360, 363, 0, 340, 0, 336, 0, 91, 0,
+ 571, 567, 569, 562, 566, 0, 0, 0, 0, 576,
+ 0, 128, 120, 114, 124, 122, 126, 209, 116, 118,
+ 0, 219, 0, 218, 295, 292, 0, 487, 485, 486,
+ 475, 465, 467, 469, 471, 473, 477, 0, 0, 509,
+ 511, 528, 537, 0, 0, 147, 0, 361, 253, 335,
+ 337, 383, 494, 0, 0, 0, 0, 564, 201, 205,
+ 204, 0, 56, 42, 51, 55, 0, 131, 0, 395,
+ 217, 0, 301, 398, 513, 516, 371, 376, 260, 365,
+ 362, 209, 0, 572, 568, 570, 563, 565, 58, 0,
+ 0, 57, 385, 0, 293, 0, 0, 0, 430, 430,
+ 0, 434, 257, 0, 338, 495, 0, 52, 54, 0,
+ 396, 302, 399, 406, 0, 405, 427, 514, 517, 372,
+ 431, 377, 258, 366, 501, 0, 411, 386, 430, 0,
+ 0, 401, 402, 0, 430, 0, 438, 0, 0, 496,
+ 558, 0, 557, 0, 0, 430, 397, 317, 324, 322,
+ 303, 313, 314, 321, 407, 403, 428, 373, 432, 435,
+ 378, 259, 500, 59, 555, 410, 424, 425, 426, 0,
+ 416, 417, 387, 0, 0, 0, 0, 0, 209, 319,
+ 0, 0, 0, 0, 0, 0, 0, 412, 413, 0,
+ 442, 318, 325, 323, 304, 312, 0, 320, 408, 404,
+ 0, 0, 436, 60, 556, 414, 418, 439, 388, 0,
+ 327, 315, 429, 433, 0, 0, 0, 0, 326, 0,
+ 0, 0, 415, 419, 440, 328, 316, 437, 0, 446,
+ 0, 443, 441, 444, 0, 445
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -631, -631, 318, 319, 570, -587, -631, -631, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, -631, -631,
- -631, -584, -631, -631, -631, -631, -631, -631, -631, -631,
- -631, -631, -631, -631, -631, -631, -112, -631, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, 249, -631,
- -631, 120, -631, -631, -631, 604, -631, -631, -631, -631,
- -631, -631, -631, 606, -631, 255, -631, -631, -237, -631,
- -631, 212, -631, -631, -631, -631, -310, -352, -631, -631,
- -631, -631, -631, -631, -631, -631, -327, -631, -631, -22,
- -631, -631, -183, -10, -631, 6, -631, -631, -631, -631,
- -193, -4, -230, -631, 245, 252, 270, -100, -87, -111,
- -19, -631, -309, -631, -631, -631, -631, -631, -631, -631,
- -631, -631, -88, 576, -631, -631, -631, -631, -36, 45,
- 16, -631, 84, -631, -40, 141, -447, -631, -631, -631,
- -35, -631, -631, -601, -108, -631, -631, -8, -631, -58,
- -631, -631, -47, -43, -57, -56, -55, 268, -631, -38,
- -631, -32, -631, -631, -631, -631, 208, 309, -631, -274,
- -631, -631, -631, -30, -631, -28, -631, -631, -631, -631,
- -631, -631, -631, -631, -631, -165, -631, -631, -631, -631,
- -631, -162, -631, -631, -631, -631, -631, -631, -631, -41,
- -631, -631, -631, -631, -631, -631, -631, -62, -631, -631,
- -631, -631, -631, -631, -631, -76, -631, -631, -631, -66,
- -631, -631, -631, -631, -631, -631, -631, -31, -631, -631,
- -315, -631, -631, -631, -631, -631, -631, -631, -631, -631,
- -631, 17, -631, -631, -631, -631, -631, -631, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -630, -631, -631,
- -631, -631, -631, -158, -631, -631, -631, -631, -631, -631,
- -631, -631, -190, -631, -631, -488, -631, -591, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, -631, -631,
- -631, -631, 18, 20, -631, -631, -631, -631, -631, -631,
- -631, -631, -631, 300, -631, -631, -631, -631, -631, -631,
- -631, -631, -631, -631, -302, 259, -301, -631, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, 592, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, 296, -631,
- -631, -157, -631, -631, -631, -631, -631, -631, -631, -25,
- -631, -631, -631, 271, -631, -631, 119, -631, -631, -631,
- -631, -631, -631, -631, -631, -631, -631, -631, -631, -631
+ -611, -611, 311, 312, 565, -598, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
+ -611, -590, -611, -611, -611, -611, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, -122, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611, 238, -611,
+ -611, 9, -611, -611, -611, 598, -611, -611, -611, -611,
+ -611, -611, -611, 600, -611, 242, -611, -611, -248, -611,
+ -611, 208, -611, -611, -611, -268, -353, -611, -611, -611,
+ -611, -611, -611, -611, -611, -331, -611, -611, -22, -611,
+ -611, -187, -10, -611, 17, -611, -611, -611, -611, -195,
+ -9, -224, -611, 244, 263, 245, -120, -114, -90, -13,
+ -611, -303, -611, -611, -611, -611, -611, -611, -611, -611,
+ -611, 0, 571, -611, -611, -611, -611, -41, 59, 20,
+ -611, 99, -611, -28, 162, -444, -611, -611, -611, 68,
+ -611, -611, -610, -81, -611, -611, -7, -611, -70, -611,
+ -611, -50, -49, -58, -55, -52, 293, -611, -40, -611,
+ -37, -611, -611, -611, -611, 256, 326, 176, -611, -611,
+ -611, -32, -611, -31, -611, -611, -611, -611, -611, -611,
+ -611, -611, -611, -153, -611, -611, -611, -611, -611, -150,
+ -611, -611, -611, -611, -611, -611, -611, -38, -611, -611,
+ -611, -611, -611, -611, -611, -39, -611, -611, -611, -611,
+ -611, -611, -611, -66, -611, -611, -611, -65, -611, -611,
+ -611, -611, -611, -611, -611, -15, -611, -611, -338, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611, -611, 22,
+ -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, -594, -611, -611, -611, -611,
+ -611, -140, -611, -611, -611, -611, -611, -611, -611, -611,
+ -172, -611, -611, -500, -611, -550, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
+ 25, 27, -611, -611, -611, -611, -611, -611, -611, -611,
+ -611, 320, -611, -611, -611, -611, -611, -611, -611, -611,
+ -611, -611, -309, 261, -293, -611, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, 610, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, 316, -611, -611, -136,
+ -611, -611, -611, -611, -611, -611, -611, -5, -611, -611,
+ -611, 285, -611, -611, 138, -611, -611, -611, -611, -611,
+ -611, -611, -611, -611, -611, -611, -611, -611
};
/* YYDEFGOTO[NTERM-NUM]. */
@@ -1095,43 +1095,43 @@ 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, 448, 31, 32, 117,
- 302, 450, 647, 731, 705, 732, 706, 707, 748, 828,
+ 302, 450, 648, 729, 704, 730, 705, 706, 746, 825,
33, 118, 391, 34, 35, 124, 333, 469, 36, 85,
37, 142, 332, 38, 39, 40, 126, 334, 482, 41,
- 217, 362, 544, 42, 258, 43, 102, 248, 340, 44,
- 45, 395, 483, 484, 575, 574, 394, 470, 560, 571,
- 572, 559, 562, 561, 563, 557, 392, 465, 649, 318,
- 222, 293, 109, 354, 46, 471, 83, 284, 427, 628,
- 197, 319, 336, 321, 322, 323, 324, 325, 326, 327,
- 328, 329, 337, 48, 297, 370, 443, 548, 444, 445,
- 646, 49, 50, 295, 344, 403, 494, 495, 586, 496,
- 472, 86, 208, 285, 590, 145, 146, 147, 148, 52,
- 355, 429, 632, 356, 719, 744, 780, 357, 358, 149,
- 150, 151, 152, 153, 154, 155, 156, 157, 158, 53,
- 87, 54, 177, 345, 497, 404, 498, 588, 406, 591,
- 666, 736, 665, 55, 88, 56, 268, 407, 667, 737,
- 772, 819, 598, 793, 820, 794, 821, 863, 816, 795,
- 822, 796, 818, 817, 852, 854, 862, 57, 58, 59,
- 89, 286, 430, 634, 541, 635, 723, 542, 164, 341,
- 489, 165, 257, 397, 166, 167, 342, 490, 168, 169,
- 343, 491, 170, 359, 428, 630, 688, 631, 687, 745,
- 473, 419, 522, 684, 742, 777, 420, 523, 685, 743,
- 779, 474, 90, 287, 431, 636, 475, 656, 751, 788,
- 833, 476, 569, 486, 573, 735, 771, 716, 738, 739,
- 757, 775, 824, 758, 773, 823, 770, 786, 787, 812,
- 831, 858, 813, 832, 859, 570, 814, 760, 776, 825,
- 764, 778, 826, 803, 827, 857, 851, 860, 871, 873,
- 874, 877, 477, 478, 63, 64, 65, 183, 347, 505,
- 66, 220, 364, 290, 363, 408, 506, 605, 606, 607,
- 608, 609, 603, 610, 640, 526, 641, 423, 528, 509,
- 510, 511, 67, 185, 68, 105, 291, 436, 638, 724,
- 767, 366, 435, 782, 276, 348, 516, 409, 517, 614,
- 615, 518, 678, 740, 519, 679, 741, 69, 70, 71,
- 72, 73, 279, 410, 616, 74, 75, 76, 188, 278,
- 77, 280, 411, 617, 78, 241, 242, 303, 243, 784,
- 807, 785, 79, 111, 368, 547, 697, 642, 698, 643,
- 695, 696, 694, 424, 245, 390, 330, 80, 81, 112,
- 369, 193, 283, 425, 352, 426, 532, 533, 531, 535
+ 217, 362, 547, 42, 258, 43, 102, 248, 340, 44,
+ 45, 395, 483, 484, 485, 394, 470, 563, 574, 575,
+ 562, 565, 564, 566, 560, 392, 465, 650, 318, 222,
+ 293, 109, 354, 46, 471, 83, 284, 427, 629, 197,
+ 319, 336, 321, 322, 323, 324, 325, 326, 327, 328,
+ 329, 337, 48, 297, 370, 443, 551, 444, 445, 647,
+ 49, 404, 295, 344, 403, 495, 496, 588, 497, 472,
+ 86, 208, 285, 209, 145, 146, 147, 148, 52, 355,
+ 429, 633, 356, 717, 742, 777, 357, 358, 149, 150,
+ 151, 152, 153, 154, 155, 156, 157, 158, 53, 87,
+ 54, 177, 345, 501, 405, 502, 592, 500, 590, 711,
+ 589, 55, 88, 56, 268, 407, 666, 735, 769, 816,
+ 599, 790, 817, 791, 818, 860, 813, 792, 819, 793,
+ 815, 814, 849, 851, 859, 57, 58, 59, 89, 286,
+ 430, 635, 544, 636, 721, 545, 164, 341, 490, 165,
+ 257, 397, 166, 167, 342, 491, 168, 169, 343, 492,
+ 170, 359, 428, 631, 687, 632, 686, 743, 473, 419,
+ 525, 683, 740, 774, 420, 526, 684, 741, 776, 474,
+ 90, 287, 431, 637, 475, 657, 749, 785, 830, 476,
+ 572, 487, 576, 733, 768, 714, 736, 737, 754, 772,
+ 821, 755, 770, 820, 767, 783, 784, 809, 828, 855,
+ 810, 829, 856, 573, 811, 757, 773, 822, 761, 775,
+ 823, 800, 824, 854, 848, 857, 868, 870, 871, 874,
+ 477, 478, 63, 64, 65, 183, 347, 508, 66, 220,
+ 364, 290, 363, 408, 509, 606, 607, 608, 609, 610,
+ 604, 611, 641, 529, 642, 423, 531, 512, 513, 514,
+ 67, 185, 68, 105, 291, 436, 639, 722, 764, 366,
+ 435, 779, 276, 348, 519, 409, 520, 615, 616, 521,
+ 677, 738, 522, 678, 739, 69, 70, 71, 72, 73,
+ 279, 410, 617, 74, 75, 76, 188, 278, 77, 280,
+ 411, 618, 78, 241, 242, 303, 243, 781, 804, 782,
+ 79, 111, 368, 550, 696, 643, 697, 644, 694, 695,
+ 693, 424, 245, 390, 330, 80, 81, 112, 369, 193,
+ 283, 425, 352, 426, 535, 536, 534, 538
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -1139,324 +1139,318 @@ 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, 47, 103,
- 104, 160, 398, 161, 320, 162, 113, 205, 51, 60,
- 61, 143, 62, 226, 227, 198, 201, 202, 203, 566,
- 244, 689, 399, 400, 401, 619, 199, 418, 299, 292,
- 200, 349, 106, 485, 294, 163, 209, 106, 159, 717,
- 421, 422, 432, 4, 160, 47, 161, 515, 162, 106,
- 703, 196, 206, 704, 143, 51, 60, 61, 621, 62,
- 790, 622, 8, 296, 633, 207, 566, 210, 211, 212,
- 213, -361, 106, 710, 734, 215, 106, 379, 174, 218,
- 223, 114, 219, 504, 790, 221, 224, 791, 792, 91,
- 520, -361, 524, 225, 8, 752, 507, 508, 629, 224,
- 367, 119, 304, 305, 306, 307, 308, 309, 310, 311,
- 107, 791, 792, 312, 313, 107, 174, 434, 174, 304,
- 305, 306, 307, 308, 309, 310, 311, 107, 314, 315,
- 312, 313, 120, 316, 317, 703, 224, 18, 704, 224,
- 761, 95, 265, 106, 174, 204, 123, 174, 174, -313,
- 224, 317, 254, 255, 107, 205, 487, 174, 174, 485,
- 383, 384, 493, 198, 201, 202, 203, 442, 252, -331,
- 789, 253, 412, 413, 199, -141, 800, -142, 200, 18,
- 122, 178, 122, 99, 187, 106, 718, 815, 187, 546,
- 592, 128, 129, 501, 502, 132, 133, 134, 135, 196,
- 385, 386, 414, 503, 214, 12, 216, 415, 122, 492,
- 416, 417, 841, 304, 305, 306, 307, 308, 309, 310,
- 311, 107, 639, -143, 312, 313, 192, 566, 122, -100,
- 412, 413, 228, -47, 122, -47, 809, 810, 811, 314,
- 315, 412, 413, 194, 316, 317, 791, 792, 866, -47,
- -47, 868, -47, -47, 94, 96, -47, 387, 388, 389,
- 414, 98, 101, 107, 353, 415, 460, 461, 462, 174,
- 259, 414, 260, 456, 457, 797, 415, -453, -47, 416,
- 417, -525, -47, 229, 204, 376, 377, 378, 458, 459,
- 660, 661, 230, 246, 205, 247, -47, 249, 250, 488,
- 393, 251, 198, 201, 202, 203, 256, 393, 499, 500,
- 261, 224, 262, 199, 263, 320, 566, 200, -209, 447,
- 264, 266, 106, 267, 269, 270, 271, 301, 272, 274,
- 538, 433, 540, 620, 849, 273, 289, 275, 196, 277,
- 106, 626, 281, 662, 282, 127, 128, 129, 130, 131,
- 132, 133, 134, 135, 136, 137, 138, 10, 11, -526,
- 12, 139, 140, 141, 288, 555, 441, 47, 721, 300,
- 335, 464, 331, 639, 338, 566, 339, 51, 60, 61,
- 350, 62, 525, 351, 529, 530, 346, 360, 320, 361,
- 567, 525, 663, 373, 365, 374, 375, 231, 402, 232,
- 568, 380, 382, 545, 381, 700, 396, 668, 669, 670,
- 437, 463, -44, 233, 234, 449, 235, 236, 107, 452,
- 237, 527, 536, 537, 550, -101, 549, 539, 551, 552,
- 122, 553, 594, 595, 596, 597, 554, 567, 556, 558,
- 576, 577, 238, 578, 565, 587, 239, 568, 163, 599,
- 580, 159, 581, 582, 583, -288, 143, 160, 584, 161,
- 240, 162, 585, 604, 613, 618, 623, 143, 593, 600,
- 601, 602, 624, 625, 627, 659, 645, -384, 637, 650,
- 651, 252, 652, 653, 654, 655, 657, 658, 843, 844,
- 671, 565, 672, 611, 612, 673, 674, 163, 209, 5,
- 159, 675, 6, 7, 8, 9, 160, 676, 161, 677,
- 162, 680, 681, 629, 691, 682, 143, 683, 10, 11,
- 864, 12, 690, 163, 163, 13, 159, 159, 692, 693,
- 699, 701, 160, 160, 161, 161, 162, 162, 14, 15,
- 16, 17, 143, 143, 712, 714, 715, 18, 19, 725,
- 726, 20, 727, -402, 21, 728, 733, 749, 709, 753,
- 755, 22, 23, 754, 756, 759, 763, 766, 24, 25,
- 702, 765, 768, 781, 769, 783, 774, 835, -411, 798,
- 799, 801, 802, 806, 26, 808, 829, 834, -53, 830,
- 836, 837, 845, 850, 848, 855, 856, 861, 567, 867,
- 869, 870, 875, 872, 876, 878, 371, 372, 568, 173,
- 750, 100, 97, 521, 686, 453, 175, 708, 711, 579,
- 664, 713, 644, 454, 762, 540, 106, 6, 446, 543,
- 439, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 195, 137, 455, 47, 405, 838, 12, 722, 140, 141,
- 840, 746, 565, 51, 60, 61, 842, 62, 865, 438,
- 189, 451, 847, 729, 648, 92, 0, 720, 0, 512,
- 730, 0, 534, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 567, 0, 0,
- 0, 0, 747, 0, -2, 5, 0, 568, 6, 7,
- 8, 9, 0, 0, 107, 0, 0, 0, 0, 0,
- 0, 0, 0, 440, 10, 11, 0, 12, 0, 0,
- 0, 13, 92, 839, 720, 0, 0, 0, 47, 0,
- 0, 0, 0, 0, 14, 15, 16, 17, 51, 60,
- 61, 565, 62, 18, 19, 0, 567, 20, 0, 805,
- 21, 0, 0, 0, 0, 0, 568, 22, 23, 0,
- 92, 0, 804, 106, 24, 25, 0, 0, 127, 128,
+ 108, 110, 50, 159, 92, 163, 160, 93, 398, 103,
+ 104, 161, 162, 198, 418, 144, 113, 204, 205, 47,
+ 320, 143, 51, 688, 60, 201, 620, 61, 202, 62,
+ 349, 203, 569, 199, 200, 292, 299, 294, 399, 400,
+ 401, 106, 486, 421, 91, 123, 159, 296, 163, 160,
+ 702, 634, 106, 709, 161, 162, 518, 732, 703, 422,
+ 622, 196, 206, 4, 143, 106, 47, 623, 106, 51,
+ 507, 60, 8, 787, 61, 207, 62, 210, 211, 212,
+ 213, 527, 569, 187, 715, 215, 787, 187, -359, 218,
+ 174, 223, 219, 379, 432, 221, 225, 224, 114, 510,
+ 788, 789, 224, 214, 8, 216, 367, 259, -359, 260,
+ 630, 226, 227, 788, 789, 511, 434, 119, 244, 107,
+ 106, 174, 304, 305, 306, 307, 308, 309, 310, 311,
+ 107, 174, 702, 312, 313, 174, 174, 174, 224, 750,
+ 703, 174, 523, 107, 120, 224, 224, 18, 314, 315,
+ 178, 95, 265, 316, 317, 106, 18, -329, -140, -141,
+ 99, 198, -311, 122, 122, 204, 205, 254, 255, 412,
+ 413, 486, 488, 201, 252, 442, 202, 253, 494, 203,
+ 174, 199, 200, 716, 412, 413, 383, 384, 549, 758,
+ 304, 305, 306, 307, 308, 309, 310, 311, 107, 414,
+ -142, 312, 313, 122, 415, 122, -100, 416, 417, 196,
+ 838, 122, 640, 192, 414, 493, 314, 315, 786, 415,
+ 194, 316, 317, -451, 797, 304, 305, 306, 307, 308,
+ 309, 310, 311, 107, -523, 812, 312, 313, 228, 569,
+ 229, 387, 388, 389, 385, 386, 863, 788, 789, 865,
+ 806, 807, 808, 94, 96, 106, 230, 317, 98, 101,
+ 593, 128, 129, 456, 457, 132, 133, 134, 135, 246,
+ 794, 458, 459, 106, 353, 12, 247, 249, 127, 128,
129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 26, -210, 0, 0, 139, 140, 141, 0, 163, 853,
- 0, 159, 0, 393, 393, 0, 0, 160, 0, 161,
- 565, 162, 0, 0, 0, 0, 0, 143, 846, 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, 107, 12, 0, -393, -393, 13, 174, 0, 412,
- 413, 467, 468, -393, 0, 0, 0, 0, 0, 14,
- 0, 0, 106, 479, 480, 481, 0, 127, 128, 129,
- 130, 131, 132, 133, 134, 135, 195, 137, 138, 0,
- 0, 0, 22, 23, 140, 141, 0, 0, 0, 0,
- 0, 0, 0, 564, 0, 0, 0, 0, 0, 0,
- -393, 0, 0, 0, 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,
- 107, 0, 0, 14, 0, 0, 106, 479, 480, 481,
+ 10, 11, 250, 12, 139, 140, 141, 460, 461, 462,
+ 198, 376, 377, 378, 204, 205, 251, 256, 224, 261,
+ 393, 262, 201, 263, 264, 202, -208, 393, 203, 266,
+ 199, 200, 267, 269, 270, 271, 569, 272, 274, 846,
+ 273, 277, 447, 107, 320, 275, 281, 282, -524, 174,
+ 288, 433, 621, 106, 301, 300, 289, 331, 196, 338,
+ 627, 107, 335, 339, 350, 351, 360, 361, -101, 640,
+ 373, 661, 346, 122, 159, 365, 163, 160, 374, 375,
+ 380, 50, 161, 162, 381, 396, 499, 382, 402, 437,
+ 449, 464, 143, 719, -44, 569, 452, 441, 47, 463,
+ 530, 51, 528, 60, 532, 533, 61, 489, 62, 539,
+ 662, 528, 540, 552, 542, 320, 554, 503, 556, 555,
+ 570, 571, 557, 548, 667, 668, 669, 561, 559, 577,
+ 580, 579, 699, 582, 619, 585, 583, 584, 541, 591,
+ 543, 586, 587, 595, 553, -287, 605, 614, 624, 625,
+ 626, 628, 646, 651, 159, 596, 163, 160, 597, -382,
+ 638, 598, 161, 162, 568, 652, 499, 653, 412, 413,
+ 570, 571, 143, 558, 654, 600, 655, 143, 656, 658,
+ 659, 664, 252, 670, 671, 672, 673, 674, 675, 504,
+ 505, 594, 601, 602, 603, 676, 679, 680, 414, 506,
+ 681, 840, 841, 415, 682, 690, 416, 417, 689, 691,
+ 692, 712, 698, 700, 568, 723, 612, 613, 713, 630,
+ 724, 159, 725, 163, 160, 726, -400, 731, 734, 161,
+ 162, 747, 751, 861, 466, 752, -391, 6, 753, 143,
+ 9, -391, -391, -391, -391, -391, -391, -391, -391, -391,
+ -391, -391, -391, 10, 11, 756, 12, 760, -391, -391,
+ 13, 762, 763, 412, 413, 467, 468, -391, 765, 766,
+ 778, 771, 780, 14, -409, 795, 796, 479, 480, 481,
+ 798, 799, 803, 826, 805, 827, 660, 831, 833, 842,
+ 834, 845, 847, 852, 853, 866, 22, 23, 858, 106,
+ 832, 864, 869, 875, 127, 128, 129, 130, 131, 132,
+ 133, 134, 135, 195, -391, 867, 872, 873, 748, 371,
+ 372, 140, 141, -86, 173, 100, 97, 570, 571, 524,
+ 685, 175, 710, 466, 453, -391, 6, 455, 707, 9,
+ -391, -391, -391, -391, -391, -391, -391, -391, -391, -391,
+ -391, -391, 10, 11, 454, 12, 663, -391, -391, 13,
+ 645, 581, 412, 413, 467, 468, -391, 708, 665, 759,
+ 578, 568, 14, 446, 835, 47, 516, 107, 51, 837,
+ 60, 406, 720, 61, 92, 62, 517, 718, -47, 728,
+ -47, 839, 744, 862, 537, 22, 23, 546, 189, 438,
+ 844, 451, 727, 515, -47, -47, 649, -47, -47, 0,
+ 745, -47, 0, -391, 570, 571, 0, 0, 0, 231,
+ 0, 232, -503, 0, 0, 0, 0, 0, 0, 0,
+ 0, 543, 0, -47, 0, 233, 234, -47, 235, 236,
+ 92, 0, 237, 718, 0, 0, 0, 0, 0, -2,
+ 5, -47, 0, 6, 7, 8, 9, 47, 568, 0,
+ 51, 0, 60, 0, 238, 61, 802, 62, 239, 10,
+ 11, 0, 12, 570, 571, 0, 13, 92, 0, 0,
+ 801, 0, 240, 0, 0, 0, 0, 0, 0, 14,
+ 15, 16, 17, 0, 0, 0, 0, 0, 18, 19,
+ 0, 0, 20, 0, 0, 21, 159, 0, 163, 160,
+ 393, 393, 22, 23, 161, 162, 0, 568, 850, 24,
+ 25, 0, 0, 0, 143, 843, 0, 0, 836, 0,
+ 0, 0, 0, 0, 0, 26, -209, 466, 0, -391,
+ 6, 0, 393, 9, -391, -391, -391, -391, -391, -391,
+ -391, -391, -391, -391, -391, -391, 10, 11, 0, 12,
+ 0, -391, -391, 13, 0, 0, 412, 413, 467, 468,
+ -391, 0, 0, 0, 0, 0, 14, 0, 0, 106,
+ 479, 480, 481, 0, 127, 128, 129, 130, 131, 132,
+ 133, 134, 135, 195, 137, 138, 0, 0, 0, 22,
+ 23, 140, 141, 0, 0, 0, 0, 0, 0, 0,
+ 567, 0, 0, 0, 0, 0, 0, -391, 0, 0,
+ 0, 466, 0, -391, 6, 0, -536, 9, -391, -391,
+ -391, -391, -391, -391, -391, -391, -391, -391, -391, -391,
+ 10, 11, 0, 12, 0, -391, -391, 13, 0, 0,
+ 412, 413, 467, 468, -391, 0, 466, 107, -391, 6,
+ 14, 0, 9, -391, -391, -391, -391, -391, -391, -391,
+ -391, -391, -391, -391, -391, 10, 11, 0, 12, 0,
+ -391, -391, 13, 22, 23, 412, 413, 467, 468, -391,
+ 0, 0, 0, 0, 0, 14, 0, 0, 0, 0,
+ 0, -391, 0, 0, 0, 0, 0, 0, 0, 0,
+ -68, 0, 0, 0, 0, 0, 106, 0, 22, 23,
0, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 195, 137, 138, 0, 0, 0, 22, 23, 140, 141,
+ 136, 137, 138, 0, 0, 0, -391, 139, 140, 141,
+ 466, 0, -391, 6, 0, -90, 9, -391, -391, -391,
+ -391, -391, -391, -391, -391, -391, -391, -391, -391, 10,
+ 11, 0, 12, 0, -391, -391, 13, 0, 0, 412,
+ 413, 467, 468, -391, 0, 0, 0, 0, 0, 14,
+ 0, 0, 0, 0, 0, 5, 0, 0, 6, 7,
+ 8, 9, 0, 0, 107, 0, 0, 0, 0, 0,
+ 174, 0, 22, 23, 10, 11, 0, 12, 0, 0,
+ 0, 13, 0, 0, 0, 0, 0, 0, 0, 0,
+ -391, 0, 0, 0, 14, 15, 16, 17, 0, -527,
+ 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, 701, 0, 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, -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, 107, 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, 106, 0, 0, 22,
- 23, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 195, 0, 0, 0, 0, 0, 0, -393, 140, 141,
- 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, 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, -393, 0, 0, 0, 14, 15, 16, 17, 0,
- -529, 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, 589, 0, 106, 0,
- 0, 26, -210, 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, 0,
+ 26, 106, 6, 0, -53, 439, 127, 128, 129, 130,
+ 131, 132, 133, 134, 135, 195, 137, 0, 0, 0,
+ 0, 12, 5, 140, 141, 6, 7, 8, 9, 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, 702, 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, 589, 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, 0, 0, 0, 0, 174, 0, 0,
+ 0, 10, 11, 0, 12, 0, 0, 0, 13, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 107, 0, 0,
+ 0, 14, 15, 16, 17, 0, 0, 0, 0, 0,
+ 18, 19, 0, 0, 20, 0, 0, 21, 0, 107,
+ 0, 0, 0, 0, 22, 23, 0, 0, 440, 0,
+ 0, 24, 25, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 498, 0, 106, 0, 0, 26, -209, 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, 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, 701,
+ 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, 498, 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,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 107
+ 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, 0,
+ 0, 0, 0, 0, 0, 0, 0, 107
};
static const yytype_int16 yycheck[] =
{
- 22, 23, 43, 43, 14, 43, 14, 83, 2, 19,
- 20, 43, 339, 43, 244, 43, 26, 83, 2, 2,
- 2, 43, 2, 111, 112, 83, 83, 83, 83, 476,
- 118, 632, 341, 342, 343, 523, 83, 352, 231, 222,
- 83, 278, 3, 395, 3, 86, 86, 3, 86, 679,
- 352, 352, 362, 0, 86, 49, 86, 409, 86, 3,
- 647, 83, 84, 647, 86, 49, 49, 49, 3, 49,
- 1, 3, 6, 3, 3, 85, 523, 87, 88, 89,
- 90, 87, 3, 3, 3, 95, 3, 317, 87, 99,
- 75, 91, 102, 408, 1, 105, 81, 28, 29, 3,
- 410, 107, 19, 75, 6, 735, 408, 408, 107, 81,
- 293, 88, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 28, 29, 84, 85, 81, 87, 364, 87, 73,
- 74, 75, 76, 77, 78, 79, 80, 81, 99, 100,
- 84, 85, 88, 104, 105, 732, 81, 49, 732, 81,
- 741, 53, 174, 3, 87, 231, 36, 87, 87, 90,
- 81, 105, 8, 9, 81, 231, 396, 87, 87, 521,
- 82, 83, 402, 231, 231, 231, 231, 370, 8, 88,
- 771, 11, 30, 31, 231, 88, 777, 88, 231, 49,
- 93, 22, 93, 53, 74, 3, 684, 788, 78, 436,
- 8, 9, 10, 51, 52, 13, 14, 15, 16, 231,
- 99, 100, 60, 61, 94, 23, 96, 65, 93, 402,
- 68, 69, 823, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 547, 88, 84, 85, 89, 684, 93, 88,
- 30, 31, 89, 4, 93, 6, 35, 36, 37, 99,
- 100, 30, 31, 88, 104, 105, 28, 29, 859, 20,
- 21, 862, 23, 24, 15, 16, 27, 101, 102, 103,
- 60, 16, 17, 81, 284, 65, 387, 388, 389, 87,
- 92, 60, 94, 383, 384, 773, 65, 88, 49, 68,
- 69, 88, 53, 89, 370, 314, 315, 316, 385, 386,
- 574, 575, 88, 88, 370, 48, 67, 89, 88, 397,
- 332, 89, 370, 370, 370, 370, 91, 339, 406, 407,
- 91, 81, 91, 370, 88, 555, 773, 370, 87, 370,
- 88, 88, 3, 89, 88, 88, 88, 3, 88, 88,
- 428, 363, 430, 526, 832, 89, 93, 89, 370, 88,
- 3, 534, 88, 583, 88, 8, 9, 10, 11, 12,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 88,
- 23, 24, 25, 26, 89, 463, 370, 371, 687, 91,
- 8, 391, 92, 698, 91, 832, 47, 371, 371, 371,
- 89, 371, 414, 89, 416, 417, 105, 89, 628, 89,
- 476, 423, 585, 3, 93, 92, 94, 4, 105, 6,
- 476, 96, 98, 435, 97, 645, 94, 600, 601, 602,
- 89, 94, 90, 20, 21, 92, 23, 24, 81, 106,
- 27, 58, 90, 95, 444, 88, 88, 94, 88, 90,
- 93, 3, 500, 500, 500, 500, 89, 523, 94, 90,
- 90, 88, 49, 92, 476, 90, 53, 523, 499, 500,
- 92, 499, 92, 92, 95, 90, 488, 499, 106, 499,
- 67, 499, 94, 90, 90, 31, 88, 499, 500, 501,
- 502, 503, 88, 88, 88, 573, 29, 90, 90, 88,
- 88, 8, 88, 88, 88, 88, 88, 88, 825, 826,
- 88, 523, 88, 513, 514, 88, 88, 548, 548, 1,
- 548, 88, 4, 5, 6, 7, 548, 88, 548, 88,
- 548, 88, 88, 107, 94, 90, 548, 90, 20, 21,
- 857, 23, 90, 574, 575, 27, 574, 575, 90, 66,
- 88, 88, 574, 575, 574, 575, 574, 575, 40, 41,
- 42, 43, 574, 575, 88, 106, 105, 49, 50, 88,
- 88, 53, 88, 35, 56, 90, 88, 90, 656, 88,
- 106, 63, 64, 89, 35, 38, 55, 108, 70, 71,
- 72, 94, 91, 59, 105, 3, 106, 817, 106, 94,
- 105, 105, 62, 92, 86, 106, 94, 88, 90, 106,
- 93, 90, 105, 39, 94, 106, 106, 93, 684, 105,
- 88, 106, 106, 75, 94, 75, 298, 298, 684, 49,
- 732, 17, 16, 411, 628, 380, 50, 649, 664, 488,
- 585, 666, 548, 381, 742, 723, 3, 4, 370, 431,
- 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 382, 647, 345, 820, 23, 688, 25, 26,
- 822, 723, 684, 647, 647, 647, 824, 647, 858, 369,
- 78, 375, 829, 698, 555, 685, -1, 685, -1, 408,
- 702, -1, 423, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 773, -1, -1,
- -1, -1, 724, -1, 0, 1, -1, 773, 4, 5,
- 6, 7, -1, -1, 81, -1, -1, -1, -1, -1,
- -1, -1, -1, 90, 20, 21, -1, 23, -1, -1,
- -1, 27, 742, 821, 742, -1, -1, -1, 732, -1,
- -1, -1, -1, -1, 40, 41, 42, 43, 732, 732,
- 732, 773, 732, 49, 50, -1, 832, 53, -1, 781,
- 56, -1, -1, -1, -1, -1, 832, 63, 64, -1,
- 780, -1, 780, 3, 70, 71, -1, -1, 8, 9,
+ 22, 23, 2, 43, 14, 43, 43, 14, 339, 19,
+ 20, 43, 43, 83, 352, 43, 26, 83, 83, 2,
+ 244, 43, 2, 633, 2, 83, 526, 2, 83, 2,
+ 278, 83, 476, 83, 83, 222, 231, 3, 341, 342,
+ 343, 3, 395, 352, 3, 36, 86, 3, 86, 86,
+ 648, 3, 3, 3, 86, 86, 409, 3, 648, 352,
+ 3, 83, 84, 0, 86, 3, 49, 3, 3, 49,
+ 408, 49, 6, 1, 49, 85, 49, 87, 88, 89,
+ 90, 19, 526, 74, 678, 95, 1, 78, 87, 99,
+ 87, 75, 102, 317, 362, 105, 75, 81, 91, 408,
+ 28, 29, 81, 94, 6, 96, 293, 92, 107, 94,
+ 107, 111, 112, 28, 29, 408, 364, 88, 118, 81,
+ 3, 87, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 87, 730, 84, 85, 87, 87, 87, 81, 733,
+ 730, 87, 410, 81, 88, 81, 81, 49, 99, 100,
+ 22, 53, 174, 104, 105, 3, 49, 88, 88, 88,
+ 53, 231, 90, 93, 93, 231, 231, 8, 9, 30,
+ 31, 524, 396, 231, 8, 370, 231, 11, 402, 231,
+ 87, 231, 231, 683, 30, 31, 82, 83, 436, 739,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 60,
+ 88, 84, 85, 93, 65, 93, 88, 68, 69, 231,
+ 820, 93, 550, 89, 60, 402, 99, 100, 768, 65,
+ 88, 104, 105, 88, 774, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 88, 785, 84, 85, 89, 683,
+ 89, 101, 102, 103, 99, 100, 856, 28, 29, 859,
+ 35, 36, 37, 15, 16, 3, 88, 105, 16, 17,
+ 8, 9, 10, 383, 384, 13, 14, 15, 16, 88,
+ 770, 385, 386, 3, 284, 23, 48, 89, 8, 9,
10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 86, 87, -1, -1, 24, 25, 26, -1, 839, 839,
- -1, 839, -1, 825, 826, -1, -1, 839, -1, 839,
- 832, 839, -1, -1, -1, -1, -1, 839, 828, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, -1, 3, 4, -1, 857, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
- 21, 81, 23, -1, 25, 26, 27, 87, -1, 30,
- 31, 32, 33, 34, -1, -1, -1, -1, -1, 40,
- -1, -1, 3, 44, 45, 46, -1, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, 17, 18, 19, -1,
- -1, -1, 63, 64, 25, 26, -1, -1, -1, -1,
- -1, -1, -1, 34, -1, -1, -1, -1, -1, -1,
- 81, -1, -1, -1, 1, -1, 3, 4, -1, 90,
+ 20, 21, 88, 23, 24, 25, 26, 387, 388, 389,
+ 370, 314, 315, 316, 370, 370, 89, 91, 81, 91,
+ 332, 91, 370, 88, 88, 370, 87, 339, 370, 88,
+ 370, 370, 89, 88, 88, 88, 770, 88, 88, 829,
+ 89, 88, 370, 81, 558, 89, 88, 88, 88, 87,
+ 89, 363, 529, 3, 3, 91, 93, 92, 370, 91,
+ 537, 81, 8, 47, 89, 89, 89, 89, 88, 697,
+ 3, 585, 105, 93, 404, 93, 404, 404, 92, 94,
+ 96, 371, 404, 404, 97, 94, 404, 98, 105, 89,
+ 92, 391, 404, 686, 90, 829, 106, 370, 371, 94,
+ 58, 371, 414, 371, 416, 417, 371, 397, 371, 90,
+ 587, 423, 95, 88, 94, 629, 88, 407, 3, 90,
+ 476, 476, 89, 435, 601, 602, 603, 90, 94, 90,
+ 92, 88, 646, 92, 31, 95, 92, 92, 428, 90,
+ 430, 106, 94, 503, 444, 90, 90, 90, 88, 88,
+ 88, 88, 29, 88, 484, 503, 484, 484, 503, 90,
+ 90, 503, 484, 484, 476, 88, 484, 88, 30, 31,
+ 526, 526, 484, 463, 88, 503, 88, 489, 88, 88,
+ 88, 88, 8, 88, 88, 88, 88, 88, 88, 51,
+ 52, 503, 504, 505, 506, 88, 88, 88, 60, 61,
+ 90, 822, 823, 65, 90, 94, 68, 69, 90, 90,
+ 66, 106, 88, 88, 526, 88, 516, 517, 105, 107,
+ 88, 551, 88, 551, 551, 90, 35, 88, 88, 551,
+ 551, 90, 89, 854, 1, 106, 3, 4, 35, 551,
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,
- 81, -1, -1, 40, -1, -1, 3, 44, 45, 46,
- -1, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, -1, -1, -1, 63, 64, 25, 26,
- -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, 81, -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,
+ 17, 18, 19, 20, 21, 38, 23, 55, 25, 26,
+ 27, 94, 108, 30, 31, 32, 33, 34, 91, 105,
+ 59, 106, 3, 40, 106, 94, 105, 44, 45, 46,
+ 105, 62, 92, 94, 106, 106, 576, 88, 93, 105,
+ 90, 94, 39, 106, 106, 88, 63, 64, 93, 3,
+ 814, 105, 75, 75, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 81, 106, 106, 94, 730, 298,
+ 298, 25, 26, 90, 49, 17, 16, 683, 683, 411,
+ 629, 50, 663, 1, 380, 3, 4, 382, 650, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 381, 23, 587, 25, 26, 27,
+ 551, 489, 30, 31, 32, 33, 34, 657, 590, 740,
+ 484, 683, 40, 370, 817, 648, 44, 81, 648, 819,
+ 648, 345, 687, 648, 684, 648, 54, 684, 4, 701,
+ 6, 821, 721, 855, 423, 63, 64, 431, 78, 369,
+ 826, 375, 697, 408, 20, 21, 558, 23, 24, -1,
+ 722, 27, -1, 81, 770, 770, -1, -1, -1, 4,
+ -1, 6, 90, -1, -1, -1, -1, -1, -1, -1,
+ -1, 721, -1, 49, -1, 20, 21, 53, 23, 24,
+ 740, -1, 27, 740, -1, -1, -1, -1, -1, 0,
+ 1, 67, -1, 4, 5, 6, 7, 730, 770, -1,
+ 730, -1, 730, -1, 49, 730, 778, 730, 53, 20,
+ 21, -1, 23, 829, 829, -1, 27, 777, -1, -1,
+ 777, -1, 67, -1, -1, -1, -1, -1, -1, 40,
+ 41, 42, 43, -1, -1, -1, -1, -1, 49, 50,
+ -1, -1, 53, -1, -1, 56, 836, -1, 836, 836,
+ 822, 823, 63, 64, 836, 836, -1, 829, 836, 70,
+ 71, -1, -1, -1, 836, 825, -1, -1, 818, -1,
+ -1, -1, -1, -1, -1, 86, 87, 1, -1, 3,
+ 4, -1, 854, 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, -1, -1, -1, -1, -1, -1, 81, 25, 26,
+ -1, 25, 26, 27, -1, -1, 30, 31, 32, 33,
+ 34, -1, -1, -1, -1, -1, 40, -1, -1, 3,
+ 44, 45, 46, -1, 8, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, -1, -1, -1, 63,
+ 64, 25, 26, -1, -1, -1, -1, -1, -1, -1,
+ 34, -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, -1, -1,
- 40, -1, -1, -1, -1, -1, 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, -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,
+ 30, 31, 32, 33, 34, -1, 1, 81, 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, -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, -1, -1, 1, -1, -1, 4, 5,
+ 6, 7, -1, -1, 81, -1, -1, -1, -1, -1,
+ 87, -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, -1, -1, -1, -1, -1, -1, 63, 64, -1,
+ -1, -1, -1, -1, 70, 71, 72, -1, -1, -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, -1, -1, -1, -1, 87, -1, -1,
+ 86, 3, 4, -1, 90, 7, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, -1, -1, -1,
+ -1, 23, 1, 25, 26, 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,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 40, 41, 42, 43, -1, -1, -1, -1, -1,
+ 49, 50, -1, -1, 53, -1, -1, 56, -1, 81,
+ -1, -1, -1, -1, 63, 64, -1, -1, 90, -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, -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, 81, -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, 81
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1467,90 +1461,90 @@ static const yytype_uint16 yystos[] =
20, 21, 23, 27, 40, 41, 42, 43, 49, 50,
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, 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,
+ 164, 168, 172, 174, 178, 179, 202, 203, 221, 229,
+ 230, 238, 247, 267, 269, 280, 282, 304, 305, 306,
+ 348, 399, 400, 401, 402, 403, 407, 429, 431, 454,
+ 455, 456, 457, 458, 462, 463, 464, 467, 471, 479,
+ 494, 495, 129, 204, 131, 158, 239, 268, 281, 307,
+ 349, 3, 201, 255, 157, 53, 157, 172, 174, 53,
+ 164, 174, 175, 201, 201, 432, 3, 81, 197, 200,
+ 197, 480, 496, 201, 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, 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,
- 410, 202, 199, 75, 81, 75, 231, 231, 89, 89,
+ 25, 26, 160, 197, 242, 243, 244, 245, 246, 257,
+ 258, 259, 260, 261, 262, 263, 264, 265, 266, 267,
+ 269, 280, 282, 306, 315, 318, 321, 322, 325, 326,
+ 329, 119, 115, 113, 87, 231, 116, 270, 22, 120,
+ 117, 118, 124, 404, 125, 430, 126, 160, 465, 465,
+ 127, 128, 89, 498, 88, 17, 197, 208, 257, 260,
+ 261, 262, 263, 264, 322, 326, 197, 201, 240, 242,
+ 201, 201, 201, 201, 160, 201, 160, 169, 201, 201,
+ 408, 201, 198, 75, 81, 75, 230, 230, 89, 89,
88, 4, 6, 20, 21, 23, 24, 27, 49, 53,
- 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,
- 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,
+ 67, 472, 473, 475, 230, 491, 88, 48, 176, 89,
+ 88, 89, 8, 11, 8, 9, 91, 319, 173, 92,
+ 94, 91, 91, 88, 88, 197, 88, 89, 283, 88,
+ 88, 88, 88, 89, 88, 89, 441, 88, 466, 459,
+ 468, 88, 88, 499, 205, 241, 308, 350, 89, 93,
+ 410, 433, 200, 199, 3, 231, 3, 222, 134, 208,
+ 91, 3, 139, 474, 73, 74, 75, 76, 77, 78,
+ 79, 80, 84, 85, 99, 100, 104, 105, 197, 209,
+ 210, 211, 212, 213, 214, 215, 216, 217, 218, 219,
+ 493, 92, 161, 155, 166, 8, 210, 220, 91, 47,
+ 177, 316, 323, 327, 232, 271, 105, 405, 442, 177,
+ 89, 89, 501, 201, 201, 248, 251, 255, 256, 330,
+ 89, 89, 170, 411, 409, 93, 438, 200, 481, 497,
+ 223, 111, 112, 3, 92, 94, 218, 218, 218, 210,
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, 231, 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, 107,
- 334, 336, 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, 337, 335, 252,
- 90, 94, 90, 66, 491, 489, 490, 485, 487, 88,
- 211, 88, 72, 114, 130, 143, 145, 146, 198, 231,
- 3, 237, 88, 249, 106, 105, 366, 366, 384, 253,
- 256, 221, 336, 315, 438, 88, 88, 88, 90, 488,
- 198, 142, 144, 88, 3, 364, 280, 288, 367, 368,
- 452, 455, 343, 348, 254, 338, 316, 198, 147, 90,
- 145, 357, 366, 88, 89, 106, 35, 369, 372, 38,
- 386, 386, 253, 55, 389, 94, 108, 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
+ 492, 151, 194, 197, 184, 180, 94, 320, 194, 220,
+ 220, 220, 105, 233, 230, 273, 275, 284, 412, 444,
+ 460, 469, 30, 31, 60, 65, 68, 69, 337, 338,
+ 343, 421, 423, 424, 490, 500, 502, 206, 331, 249,
+ 309, 351, 184, 197, 177, 439, 434, 89, 410, 7,
+ 90, 203, 208, 224, 226, 227, 265, 306, 135, 92,
+ 140, 475, 106, 212, 213, 214, 215, 215, 216, 216,
+ 217, 217, 217, 94, 201, 195, 1, 32, 33, 156,
+ 185, 203, 238, 337, 348, 353, 358, 399, 400, 44,
+ 45, 46, 167, 181, 182, 183, 185, 360, 210, 230,
+ 317, 324, 328, 200, 210, 234, 235, 237, 1, 242,
+ 276, 272, 274, 230, 51, 52, 61, 337, 406, 413,
+ 421, 423, 426, 427, 428, 490, 44, 54, 185, 443,
+ 445, 448, 451, 184, 180, 339, 344, 19, 197, 422,
+ 58, 425, 197, 197, 505, 503, 504, 422, 506, 90,
+ 95, 230, 94, 230, 311, 314, 274, 171, 197, 177,
+ 482, 225, 88, 201, 88, 90, 3, 89, 230, 94,
+ 193, 90, 189, 186, 191, 190, 192, 34, 197, 244,
+ 322, 326, 359, 382, 187, 188, 361, 90, 276, 88,
+ 92, 243, 92, 92, 92, 95, 106, 94, 236, 279,
+ 277, 90, 275, 8, 197, 257, 262, 263, 264, 289,
+ 306, 197, 197, 197, 419, 90, 414, 415, 416, 417,
+ 418, 420, 201, 201, 90, 446, 447, 461, 470, 31,
+ 382, 200, 3, 3, 88, 88, 88, 200, 88, 207,
+ 107, 332, 334, 250, 3, 310, 312, 352, 90, 435,
+ 337, 421, 423, 484, 486, 240, 29, 228, 141, 493,
+ 196, 88, 88, 88, 88, 88, 88, 354, 88, 88,
+ 230, 210, 200, 237, 88, 248, 285, 200, 200, 200,
+ 88, 88, 88, 88, 88, 88, 88, 449, 452, 88,
+ 88, 90, 90, 340, 345, 209, 335, 333, 251, 90,
+ 94, 90, 66, 489, 487, 488, 483, 485, 88, 210,
+ 88, 72, 114, 130, 143, 145, 146, 197, 230, 3,
+ 236, 278, 106, 105, 364, 364, 382, 252, 255, 220,
+ 334, 313, 436, 88, 88, 88, 90, 486, 197, 142,
+ 144, 88, 3, 362, 88, 286, 365, 366, 450, 453,
+ 341, 346, 253, 336, 314, 197, 147, 90, 145, 355,
+ 364, 89, 106, 35, 367, 370, 38, 384, 384, 252,
+ 55, 387, 94, 108, 437, 91, 105, 373, 363, 287,
+ 371, 106, 368, 385, 342, 388, 347, 254, 59, 440,
+ 3, 476, 478, 374, 375, 356, 384, 1, 28, 29,
+ 290, 292, 296, 298, 382, 94, 105, 384, 105, 62,
+ 390, 255, 197, 92, 477, 106, 35, 36, 37, 376,
+ 379, 383, 384, 295, 300, 299, 288, 291, 293, 297,
+ 372, 369, 386, 389, 391, 148, 94, 106, 377, 380,
+ 357, 88, 210, 93, 90, 292, 230, 298, 251, 370,
+ 194, 194, 105, 201, 478, 94, 382, 39, 393, 301,
+ 242, 302, 106, 106, 392, 378, 381, 394, 93, 303,
+ 294, 194, 379, 251, 105, 251, 88, 106, 395, 75,
+ 396, 397, 106, 94, 398, 75
};
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
@@ -1566,56 +1560,56 @@ static const yytype_uint16 yyr1[] =
158, 157, 159, 159, 159, 161, 160, 160, 162, 162,
162, 162, 163, 163, 165, 166, 167, 164, 169, 170,
171, 168, 173, 172, 175, 174, 176, 176, 177, 177,
- 178, 178, 179, 180, 180, 181, 181, 181, 183, 182,
- 184, 182, 185, 185, 187, 186, 188, 186, 189, 186,
- 190, 186, 191, 186, 192, 186, 193, 186, 194, 186,
- 195, 197, 196, 196, 198, 199, 198, 200, 198, 201,
- 202, 203, 203, 203, 205, 206, 207, 208, 204, 209,
- 209, 209, 209, 209, 209, 209, 209, 209, 210, 211,
- 212, 212, 213, 213, 214, 214, 215, 215, 215, 216,
- 216, 216, 217, 217, 217, 217, 218, 218, 218, 218,
- 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, 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
+ 178, 178, 179, 180, 180, 181, 181, 181, 182, 182,
+ 183, 184, 184, 186, 185, 187, 185, 188, 185, 189,
+ 185, 190, 185, 191, 185, 192, 185, 193, 185, 194,
+ 196, 195, 195, 197, 198, 197, 199, 197, 200, 201,
+ 202, 202, 202, 204, 205, 206, 207, 203, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 209, 210, 211,
+ 211, 212, 212, 213, 213, 214, 214, 214, 215, 215,
+ 215, 216, 216, 216, 216, 217, 217, 217, 217, 218,
+ 218, 218, 219, 219, 219, 219, 219, 219, 219, 219,
+ 219, 219, 220, 222, 221, 223, 223, 224, 224, 224,
+ 225, 224, 226, 226, 227, 228, 228, 229, 230, 230,
+ 232, 231, 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,
+ 275, 277, 278, 276, 279, 276, 281, 280, 283, 284,
+ 285, 286, 287, 288, 282, 289, 289, 289, 289, 289,
+ 289, 290, 291, 291, 293, 294, 292, 295, 292, 296,
+ 297, 297, 299, 298, 300, 301, 298, 303, 302, 304,
+ 305, 307, 308, 309, 310, 306, 311, 313, 312, 312,
+ 314, 316, 317, 315, 315, 319, 320, 318, 321, 323,
+ 324, 322, 322, 325, 327, 328, 326, 326, 329, 331,
+ 330, 332, 333, 333, 335, 336, 334, 337, 337, 339,
+ 340, 341, 342, 338, 344, 345, 346, 347, 343, 349,
+ 350, 351, 352, 348, 354, 355, 356, 357, 353, 358,
+ 358, 358, 359, 359, 361, 362, 363, 360, 365, 364,
+ 366, 364, 367, 369, 368, 368, 371, 372, 370, 374,
+ 373, 375, 373, 376, 378, 377, 377, 380, 381, 379,
+ 382, 382, 382, 382, 383, 383, 383, 385, 386, 384,
+ 384, 388, 389, 387, 387, 391, 392, 390, 390, 394,
+ 395, 393, 393, 396, 398, 397, 397, 399, 400, 401,
+ 401, 402, 404, 405, 406, 403, 408, 409, 407, 411,
+ 410, 410, 412, 412, 414, 413, 415, 413, 416, 413,
+ 417, 413, 418, 413, 419, 413, 420, 413, 421, 422,
+ 422, 423, 424, 425, 425, 426, 427, 428, 430, 429,
+ 432, 433, 434, 435, 436, 437, 431, 439, 438, 438,
+ 440, 440, 442, 443, 441, 444, 444, 445, 446, 445,
+ 447, 445, 449, 450, 448, 452, 453, 451, 454, 454,
+ 454, 455, 455, 456, 457, 459, 460, 461, 458, 462,
+ 463, 464, 466, 465, 468, 469, 470, 467, 471, 471,
+ 472, 472, 472, 472, 472, 472, 472, 472, 472, 472,
+ 473, 474, 474, 475, 475, 476, 477, 477, 478, 480,
+ 481, 482, 483, 479, 484, 485, 485, 487, 486, 488,
+ 486, 489, 486, 490, 490, 491, 492, 492, 493, 494,
+ 496, 497, 495, 499, 500, 498, 501, 501, 503, 502,
+ 504, 502, 505, 502, 506, 502
};
/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */
@@ -1631,56 +1625,56 @@ static const yytype_uint8 yyr2[] =
0, 3, 2, 3, 3, 0, 4, 0, 1, 1,
1, 1, 2, 1, 0, 0, 0, 7, 0, 0,
0, 8, 0, 4, 0, 3, 1, 0, 2, 0,
- 2, 1, 2, 2, 0, 1, 1, 2, 0, 3,
- 0, 3, 2, 0, 0, 3, 0, 3, 0, 3,
- 0, 3, 0, 3, 0, 3, 0, 3, 0, 3,
- 2, 0, 4, 0, 1, 0, 3, 0, 4, 1,
- 1, 1, 2, 2, 0, 0, 0, 0, 9, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 3, 1, 3, 1, 3, 1, 3, 3, 1,
- 3, 3, 1, 3, 3, 3, 1, 2, 2, 2,
- 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, 0, 4, 3, 0, 1, 1, 2, 3, 0,
- 3, 0, 3, 1, 1, 1, 2, 1, 0, 3,
+ 2, 1, 2, 2, 0, 1, 1, 2, 1, 1,
+ 2, 2, 0, 0, 3, 0, 3, 0, 3, 0,
+ 3, 0, 3, 0, 3, 0, 3, 0, 3, 2,
+ 0, 4, 0, 1, 0, 3, 0, 4, 1, 1,
+ 1, 2, 2, 0, 0, 0, 0, 9, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 3, 1, 3, 1, 3, 1, 3, 3, 1, 3,
+ 3, 1, 3, 3, 3, 1, 2, 2, 2, 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,
+ 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, 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, 4, 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, 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,
- 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, 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,
+ 2, 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,
+ 4, 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, 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, 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
};
@@ -2358,7 +2352,7 @@ yyreduce:
switch (yyn)
{
case 5:
-#line 399 "fe/idl.ypp" /* yacc.c:1651 */
+#line 400 "fe/idl.ypp" /* yacc.c:1651 */
{
AST_Decl *d = (yyvsp[0].dcval);
if (d)
@@ -2371,314 +2365,314 @@ yyreduce:
"Annotating this type of definition is not supported");
}
}
-#line 2375 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2369 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 6:
-#line 412 "fe/idl.ypp" /* yacc.c:1651 */
+#line 413 "fe/idl.ypp" /* yacc.c:1651 */
{
}
-#line 2382 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2376 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 7:
-#line 418 "fe/idl.ypp" /* yacc.c:1651 */
+#line 419 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) = (yyvsp[0].dcval);
}
-#line 2390 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2384 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 8:
-#line 422 "fe/idl.ypp" /* yacc.c:1651 */
+#line 423 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) = 0;
}
-#line 2398 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2392 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 9:
-#line 426 "fe/idl.ypp" /* yacc.c:1651 */
+#line 427 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) = 0;
}
-#line 2406 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2400 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 10:
-#line 433 "fe/idl.ypp" /* yacc.c:1651 */
+#line 434 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_AnnotationDeclSeen);
}
-#line 2414 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2408 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 11:
-#line 437 "fe/idl.ypp" /* yacc.c:1651 */
+#line 438 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2423 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2417 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 12:
-#line 442 "fe/idl.ypp" /* yacc.c:1651 */
+#line 443 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen);
}
-#line 2431 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2425 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 13:
-#line 446 "fe/idl.ypp" /* yacc.c:1651 */
+#line 447 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 2440 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2434 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 14:
-#line 451 "fe/idl.ypp" /* yacc.c:1651 */
+#line 452 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen);
}
-#line 2448 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2442 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 15:
-#line 455 "fe/idl.ypp" /* yacc.c:1651 */
+#line 456 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2457 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2451 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 16:
-#line 460 "fe/idl.ypp" /* yacc.c:1651 */
+#line 461 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen);
}
-#line 2465 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2459 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 17:
-#line 464 "fe/idl.ypp" /* yacc.c:1651 */
+#line 465 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2474 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2468 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 18:
-#line 469 "fe/idl.ypp" /* yacc.c:1651 */
+#line 470 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen);
}
-#line 2482 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2476 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 19:
-#line 473 "fe/idl.ypp" /* yacc.c:1651 */
+#line 474 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 2491 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2485 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 20:
-#line 478 "fe/idl.ypp" /* yacc.c:1651 */
+#line 479 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen);
}
-#line 2499 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2493 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 21:
-#line 482 "fe/idl.ypp" /* yacc.c:1651 */
+#line 483 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2508 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2502 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 22:
-#line 487 "fe/idl.ypp" /* yacc.c:1651 */
+#line 488 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen);
}
-#line 2516 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2510 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 23:
-#line 491 "fe/idl.ypp" /* yacc.c:1651 */
+#line 492 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2525 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2519 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 24:
-#line 496 "fe/idl.ypp" /* yacc.c:1651 */
+#line 497 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen);
}
-#line 2533 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2527 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 25:
-#line 500 "fe/idl.ypp" /* yacc.c:1651 */
+#line 501 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = (yyvsp[-2].dcval);
}
-#line 2542 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2536 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 26:
-#line 505 "fe/idl.ypp" /* yacc.c:1651 */
+#line 506 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeDeclSeen);
}
-#line 2550 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2544 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 27:
-#line 509 "fe/idl.ypp" /* yacc.c:1651 */
+#line 510 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2559 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2553 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 28:
-#line 514 "fe/idl.ypp" /* yacc.c:1651 */
+#line 515 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentDeclSeen);
}
-#line 2567 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2561 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 29:
-#line 518 "fe/idl.ypp" /* yacc.c:1651 */
+#line 519 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2576 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2570 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 30:
-#line 523 "fe/idl.ypp" /* yacc.c:1651 */
+#line 524 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeDeclSeen);
}
-#line 2584 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2578 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 31:
-#line 527 "fe/idl.ypp" /* yacc.c:1651 */
+#line 528 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2593 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2587 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 32:
-#line 532 "fe/idl.ypp" /* yacc.c:1651 */
+#line 533 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventDeclSeen);
}
-#line 2601 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2595 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 33:
-#line 536 "fe/idl.ypp" /* yacc.c:1651 */
+#line 537 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2610 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2604 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 34:
-#line 541 "fe/idl.ypp" /* yacc.c:1651 */
+#line 542 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeDeclSeen);
}
-#line 2618 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2612 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 35:
-#line 545 "fe/idl.ypp" /* yacc.c:1651 */
+#line 546 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2627 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2621 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 36:
-#line 550 "fe/idl.ypp" /* yacc.c:1651 */
+#line 551 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorDeclSeen);
}
-#line 2635 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2629 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 37:
-#line 554 "fe/idl.ypp" /* yacc.c:1651 */
+#line 555 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
(yyval.dcval) = 0;
}
-#line 2644 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2638 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 38:
-#line 559 "fe/idl.ypp" /* yacc.c:1651 */
+#line 560 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->err()->syntax_error (idl_global->parse_state());
}
-#line 2652 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2646 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 39:
-#line 563 "fe/idl.ypp" /* yacc.c:1651 */
+#line 564 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
yyerrok;
(yyval.dcval) = 0;
}
-#line 2662 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2656 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 40:
-#line 572 "fe/idl.ypp" /* yacc.c:1651 */
+#line 573 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSeen);
}
-#line 2670 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2664 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 41:
-#line 576 "fe/idl.ypp" /* yacc.c:1651 */
+#line 577 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 2678 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2672 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 42:
-#line 583 "fe/idl.ypp" /* yacc.c:1651 */
+#line 584 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ModuleIDSeen);
@@ -2717,27 +2711,27 @@ yyreduce:
(yyval.dcval) = m;
}
-#line 2721 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2715 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 43:
-#line 622 "fe/idl.ypp" /* yacc.c:1651 */
+#line 623 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSqSeen);
}
-#line 2729 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2723 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 44:
-#line 626 "fe/idl.ypp" /* yacc.c:1651 */
+#line 627 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen);
}
-#line 2737 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2731 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 45:
-#line 630 "fe/idl.ypp" /* yacc.c:1651 */
+#line 631 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ModuleQsSeen);
/*
@@ -2747,19 +2741,19 @@ yyreduce:
idl_global->scopes ().pop ();
(yyval.dcval) = (yyvsp[-5].dcval);
}
-#line 2751 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2745 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 46:
-#line 643 "fe/idl.ypp" /* yacc.c:1651 */
+#line 644 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleIDSeen);
}
-#line 2759 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2753 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 47:
-#line 650 "fe/idl.ypp" /* yacc.c:1651 */
+#line 651 "fe/idl.ypp" /* yacc.c:1651 */
{
// The module_header rule is common to template module, fixed
// module and instantiated template module. In the last
@@ -2773,11 +2767,11 @@ yyreduce:
IDL_GlobalData::PS_ModuleIDSeen);
}
}
-#line 2777 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2771 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 48:
-#line 664 "fe/idl.ypp" /* yacc.c:1651 */
+#line 665 "fe/idl.ypp" /* yacc.c:1651 */
{
if (FE_Utils::duplicate_param_id ((yyvsp[0].plval)))
{
@@ -2787,11 +2781,11 @@ yyreduce:
return 1;
}
}
-#line 2791 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2785 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 49:
-#line 674 "fe/idl.ypp" /* yacc.c:1651 */
+#line 675 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleParamsSeen);
@@ -2821,27 +2815,27 @@ yyreduce:
// of the template module.
idl_global->current_params ((yyvsp[-2].plval));
}
-#line 2825 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2819 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 50:
-#line 704 "fe/idl.ypp" /* yacc.c:1651 */
+#line 705 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleSqSeen);
}
-#line 2833 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2827 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 51:
-#line 708 "fe/idl.ypp" /* yacc.c:1651 */
+#line 709 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleBodySeen);
}
-#line 2841 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2835 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 52:
-#line 712 "fe/idl.ypp" /* yacc.c:1651 */
+#line 713 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleQsSeen);
@@ -2858,29 +2852,29 @@ yyreduce:
// that we are no longer in a template module scope.
idl_global->current_params (0);
}
-#line 2862 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2856 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 58:
-#line 746 "fe/idl.ypp" /* yacc.c:1651 */
+#line 747 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (
IDL_GlobalData::PS_ModuleRefSeen);
}
-#line 2871 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2865 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 59:
-#line 751 "fe/idl.ypp" /* yacc.c:1651 */
+#line 752 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (
IDL_GlobalData::PS_ModuleRefParamsSeen);
}
-#line 2880 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2874 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 60:
-#line 756 "fe/idl.ypp" /* yacc.c:1651 */
+#line 757 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (
IDL_GlobalData::PS_ModuleRefIDSeen);
@@ -2958,29 +2952,29 @@ yyreduce:
idl_global->in_tmpl_mod_no_alias (itmna_flag);
idl_global->in_tmpl_mod_alias (false);
}
-#line 2962 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2956 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 61:
-#line 837 "fe/idl.ypp" /* yacc.c:1651 */
+#line 838 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (
IDL_GlobalData::PS_InstModuleSeen);
}
-#line 2971 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2965 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 62:
-#line 842 "fe/idl.ypp" /* yacc.c:1651 */
+#line 843 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (
IDL_GlobalData::PS_InstModuleArgsSeen);
}
-#line 2980 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 2974 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 63:
-#line 847 "fe/idl.ypp" /* yacc.c:1651 */
+#line 848 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (
IDL_GlobalData::PS_InstModuleIDSeen);
@@ -3042,11 +3036,11 @@ yyreduce:
idl_global->set_err_count (idl_global->err_count () + 1);
}
}
-#line 3046 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3040 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 66:
-#line 917 "fe/idl.ypp" /* yacc.c:1651 */
+#line 918 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Interface *i = 0;
@@ -3084,27 +3078,27 @@ yyreduce:
*/
idl_global->scopes ().push (i);
}
-#line 3088 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3082 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 67:
-#line 955 "fe/idl.ypp" /* yacc.c:1651 */
+#line 956 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSqSeen);
}
-#line 3096 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3090 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 68:
-#line 959 "fe/idl.ypp" /* yacc.c:1651 */
+#line 960 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen);
}
-#line 3104 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3098 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 69:
-#line 963 "fe/idl.ypp" /* yacc.c:1651 */
+#line 964 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceQsSeen);
@@ -3113,28 +3107,28 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 3117 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3111 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 70:
-#line 975 "fe/idl.ypp" /* yacc.c:1651 */
+#line 976 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSeen);
}
-#line 3125 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3119 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 71:
-#line 979 "fe/idl.ypp" /* yacc.c:1651 */
+#line 980 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceIDSeen);
(yyval.idval) = (yyvsp[0].idval);
}
-#line 3134 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3128 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 72:
-#line 987 "fe/idl.ypp" /* yacc.c:1651 */
+#line 988 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
@@ -3170,11 +3164,11 @@ yyreduce:
(yyvsp[0].nlval) = 0;
}
}
-#line 3174 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3168 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 73:
-#line 1024 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1025 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
@@ -3203,11 +3197,11 @@ yyreduce:
(yyvsp[0].nlval) = 0;
}
}
-#line 3207 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3201 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 74:
-#line 1054 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1055 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
@@ -3236,44 +3230,44 @@ yyreduce:
(yyvsp[0].nlval) = 0;
}
}
-#line 3240 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3234 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 75:
-#line 1086 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1087 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
}
-#line 3248 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3242 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 76:
-#line 1090 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1091 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyvsp[0].nlval)->truncatable ((yyvsp[-2].bval));
(yyval.nlval) = (yyvsp[0].nlval);
}
-#line 3257 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3251 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 77:
-#line 1095 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1096 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.nlval) = 0;
}
-#line 3265 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3259 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 82:
-#line 1109 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1110 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->err ()->unsupported_error ("custom is not supported");
}
-#line 3273 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3267 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 84:
-#line 1117 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1118 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_ValueType *v = 0;
@@ -3316,27 +3310,27 @@ yyreduce:
*/
idl_global->scopes ().push (v);
}
-#line 3320 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3314 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 85:
-#line 1160 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1161 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen);
}
-#line 3328 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3322 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 86:
-#line 1164 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1165 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen);
}
-#line 3336 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3330 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 87:
-#line 1168 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1169 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen);
@@ -3355,11 +3349,11 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 3359 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3353 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 88:
-#line 1191 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1192 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_ValueType *v = 0;
@@ -3402,27 +3396,27 @@ yyreduce:
*/
idl_global->scopes ().push (v);
}
-#line 3406 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3400 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 89:
-#line 1234 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1235 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen);
}
-#line 3414 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3408 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 90:
-#line 1238 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1239 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen);
}
-#line 3422 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3416 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 91:
-#line 1242 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1243 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen);
@@ -3431,19 +3425,19 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 3435 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3429 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 92:
-#line 1255 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1256 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
}
-#line 3443 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3437 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 93:
-#line 1259 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1260 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
@@ -3474,61 +3468,61 @@ yyreduce:
(yyvsp[-2].nlval) = 0;
}
}
-#line 3478 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3472 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 94:
-#line 1293 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1294 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSeen);
}
-#line 3486 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3480 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 95:
-#line 1297 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1298 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeIDSeen);
(yyval.idval) = (yyvsp[0].idval);
}
-#line 3495 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3489 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 96:
-#line 1305 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1306 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.bval) = true;
}
-#line 3503 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3497 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 97:
-#line 1309 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1310 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.bval) = false;
}
-#line 3511 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3505 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 98:
-#line 1317 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1318 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.nlval) = (yyvsp[0].nlval);
}
-#line 3519 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3513 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 99:
-#line 1321 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1322 "fe/idl.ypp" /* yacc.c:1651 */
{
/* | EMPTY */
(yyval.nlval) = 0;
}
-#line 3528 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3522 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 100:
-#line 1330 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1331 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -3551,11 +3545,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 3555 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3549 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 101:
-#line 1354 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1355 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -3578,11 +3572,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 3582 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3576 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 102:
-#line 1380 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1381 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen);
@@ -3643,191 +3637,194 @@ yyreduce:
delete (yyvsp[-1].idval);
(yyvsp[-1].idval) = 0;
}
-#line 3647 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3641 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 108:
-#line 1456 "fe/idl.ypp" /* yacc.c:1651 */
+#line 1457 "fe/idl.ypp" /* yacc.c:1651 */
{
- /* is $0 to member_i */
(yyval.vival) = AST_Field::vis_PUBLIC;
}
-#line 3656 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3649 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
case 109:
#line 1461 "fe/idl.ypp" /* yacc.c:1651 */
{
- }
-#line 3663 "fe/idl.tab.cpp" /* yacc.c:1651 */
- break;
-
- case 110:
-#line 1464 "fe/idl.ypp" /* yacc.c:1651 */
- {
- /* is $0 to member_i */
(yyval.vival) = AST_Field::vis_PRIVATE;
}
-#line 3672 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3657 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 111:
-#line 1469 "fe/idl.ypp" /* yacc.c:1651 */
+ case 110:
+#line 1468 "fe/idl.ypp" /* yacc.c:1651 */
{
+ if ((yyvsp[0].decls_val))
+ {
+ AST_Decls &decls = *(yyvsp[0].decls_val);
+ for (size_t i = 0; i < decls.size (); i++)
+ {
+ AST_Field * field = dynamic_cast<AST_Field*>(decls[i]);
+ if (field)
+ {
+ field->visibility ((yyvsp[-1].vival));
+ }
+ }
+ }
}
-#line 3679 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3676 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 114:
-#line 1480 "fe/idl.ypp" /* yacc.c:1651 */
+ case 113:
+#line 1491 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen);
}
-#line 3687 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3684 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 115:
-#line 1484 "fe/idl.ypp" /* yacc.c:1651 */
+ case 114:
+#line 1495 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 3695 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3692 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 116:
-#line 1488 "fe/idl.ypp" /* yacc.c:1651 */
+ case 115:
+#line 1499 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen);
}
-#line 3703 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3700 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 117:
-#line 1492 "fe/idl.ypp" /* yacc.c:1651 */
+ case 116:
+#line 1503 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 3711 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3708 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 118:
-#line 1496 "fe/idl.ypp" /* yacc.c:1651 */
+ case 117:
+#line 1507 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen);
}
-#line 3719 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3716 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 119:
-#line 1500 "fe/idl.ypp" /* yacc.c:1651 */
+ case 118:
+#line 1511 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 3727 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3724 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 120:
-#line 1504 "fe/idl.ypp" /* yacc.c:1651 */
+ case 119:
+#line 1515 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen);
}
-#line 3735 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3732 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 121:
-#line 1508 "fe/idl.ypp" /* yacc.c:1651 */
+ case 120:
+#line 1519 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
}
-#line 3743 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3740 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 122:
-#line 1512 "fe/idl.ypp" /* yacc.c:1651 */
+ case 121:
+#line 1523 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen);
}
-#line 3751 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3748 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 123:
-#line 1516 "fe/idl.ypp" /* yacc.c:1651 */
+ case 122:
+#line 1527 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 3759 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3756 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 124:
-#line 1520 "fe/idl.ypp" /* yacc.c:1651 */
+ case 123:
+#line 1531 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
}
-#line 3767 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3764 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 125:
-#line 1524 "fe/idl.ypp" /* yacc.c:1651 */
+ case 124:
+#line 1535 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 3775 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3772 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 126:
-#line 1528 "fe/idl.ypp" /* yacc.c:1651 */
+ case 125:
+#line 1539 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen);
}
-#line 3783 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3780 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 127:
-#line 1532 "fe/idl.ypp" /* yacc.c:1651 */
+ case 126:
+#line 1543 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 3791 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3788 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 128:
-#line 1536 "fe/idl.ypp" /* yacc.c:1651 */
+ case 127:
+#line 1547 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->err()->syntax_error (idl_global->parse_state());
}
-#line 3799 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3796 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 129:
-#line 1540 "fe/idl.ypp" /* yacc.c:1651 */
+ case 128:
+#line 1551 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
yyerrok;
}
-#line 3808 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3805 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 130:
-#line 1548 "fe/idl.ypp" /* yacc.c:1651 */
+ case 129:
+#line 1559 "fe/idl.ypp" /* yacc.c:1651 */
{
ACE_NEW_RETURN ((yyval.nlval),
UTL_NameList ((yyvsp[-1].idlist),
(yyvsp[0].nlval)),
1);
}
-#line 3819 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3816 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 131:
-#line 1559 "fe/idl.ypp" /* yacc.c:1651 */
+ case 130:
+#line 1570 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SNListCommaSeen);
}
-#line 3827 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3824 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 132:
-#line 1563 "fe/idl.ypp" /* yacc.c:1651 */
+ case 131:
+#line 1574 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ScopedNameSeen);
@@ -3847,19 +3844,19 @@ yyreduce:
(yyval.nlval) = (yyvsp[-3].nlval);
}
}
-#line 3851 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3848 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 133:
-#line 1583 "fe/idl.ypp" /* yacc.c:1651 */
+ case 132:
+#line 1594 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.nlval) = 0;
}
-#line 3859 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3856 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 134:
-#line 1590 "fe/idl.ypp" /* yacc.c:1651 */
+ case 133:
+#line 1601 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
@@ -3868,19 +3865,19 @@ yyreduce:
0),
1);
}
-#line 3872 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3869 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 135:
-#line 1599 "fe/idl.ypp" /* yacc.c:1651 */
+ case 134:
+#line 1610 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen);
}
-#line 3880 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3877 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 136:
-#line 1603 "fe/idl.ypp" /* yacc.c:1651 */
+ case 135:
+#line 1614 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
@@ -3900,11 +3897,11 @@ yyreduce:
sn),
1);
}
-#line 3904 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3901 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 137:
-#line 1624 "fe/idl.ypp" /* yacc.c:1651 */
+ case 136:
+#line 1635 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen);
@@ -3914,11 +3911,11 @@ yyreduce:
ACE::strdelete ((yyvsp[0].strval));
(yyvsp[0].strval) = 0;
}
-#line 3918 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3915 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 138:
-#line 1634 "fe/idl.ypp" /* yacc.c:1651 */
+ case 137:
+#line 1645 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen);
@@ -3930,11 +3927,11 @@ yyreduce:
(yyvsp[-3].idlist)->nconc (sn);
(yyval.idlist) = (yyvsp[-3].idlist);
}
-#line 3934 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3931 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 139:
-#line 1648 "fe/idl.ypp" /* yacc.c:1651 */
+ case 138:
+#line 1659 "fe/idl.ypp" /* yacc.c:1651 */
{
ACE_NEW_RETURN ((yyval.idval),
Identifier ((yyvsp[0].strval)),
@@ -3942,11 +3939,11 @@ yyreduce:
ACE::strdelete ((yyvsp[0].strval));
(yyvsp[0].strval) = 0;
}
-#line 3946 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3943 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 140:
-#line 1658 "fe/idl.ypp" /* yacc.c:1651 */
+ case 139:
+#line 1669 "fe/idl.ypp" /* yacc.c:1651 */
{
/* defining_id is a defining identifier
whereas id is usually a reference to a defining identifier */
@@ -3954,11 +3951,11 @@ yyreduce:
ACE::strdelete ((yyvsp[0].strval));
(yyvsp[0].strval) = 0;
}
-#line 3958 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 3955 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 141:
-#line 1669 "fe/idl.ypp" /* yacc.c:1651 */
+ case 140:
+#line 1680 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval), 0);
@@ -4001,11 +3998,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 4005 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4002 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 142:
-#line 1713 "fe/idl.ypp" /* yacc.c:1651 */
+ case 141:
+#line 1724 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -4031,11 +4028,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 4035 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4032 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 143:
-#line 1740 "fe/idl.ypp" /* yacc.c:1651 */
+ case 142:
+#line 1751 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -4061,43 +4058,43 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 4065 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4062 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 144:
-#line 1769 "fe/idl.ypp" /* yacc.c:1651 */
+ case 143:
+#line 1780 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConstSeen);
}
-#line 4073 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4070 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 145:
-#line 1773 "fe/idl.ypp" /* yacc.c:1651 */
+ case 144:
+#line 1784 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConstTypeSeen);
}
-#line 4081 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4078 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 146:
-#line 1777 "fe/idl.ypp" /* yacc.c:1651 */
+ case 145:
+#line 1788 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConstIDSeen);
}
-#line 4089 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4086 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 147:
-#line 1781 "fe/idl.ypp" /* yacc.c:1651 */
+ case 146:
+#line 1792 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConstAssignSeen);
}
-#line 4097 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4094 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 148:
-#line 1785 "fe/idl.ypp" /* yacc.c:1651 */
+ case 147:
+#line 1796 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) = 0;
UTL_ScopedName n ((yyvsp[-4].idval), 0);
@@ -4153,27 +4150,27 @@ yyreduce:
delete (yyvsp[-4].idval);
(yyvsp[-4].idval) = 0;
}
-#line 4157 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4154 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 155:
-#line 1850 "fe/idl.ypp" /* yacc.c:1651 */
+ case 154:
+#line 1861 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_string;
}
-#line 4165 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4162 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 156:
-#line 1854 "fe/idl.ypp" /* yacc.c:1651 */
+ case 155:
+#line 1865 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_wstring;
}
-#line 4173 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4170 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 157:
-#line 1858 "fe/idl.ypp" /* yacc.c:1651 */
+ case 156:
+#line 1869 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_PredefinedType *c = 0;
@@ -4239,11 +4236,11 @@ yyreduce:
sn = 0;
(yyvsp[0].idlist) = 0;
}
-#line 4243 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4240 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 161:
-#line 1931 "fe/idl.ypp" /* yacc.c:1651 */
+ case 160:
+#line 1942 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4252,11 +4249,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4256 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4253 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 163:
-#line 1944 "fe/idl.ypp" /* yacc.c:1651 */
+ case 162:
+#line 1955 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4265,11 +4262,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4269 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4266 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 165:
-#line 1957 "fe/idl.ypp" /* yacc.c:1651 */
+ case 164:
+#line 1968 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4278,11 +4275,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4282 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4279 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 167:
-#line 1970 "fe/idl.ypp" /* yacc.c:1651 */
+ case 166:
+#line 1981 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4291,11 +4288,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4295 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4292 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 168:
-#line 1979 "fe/idl.ypp" /* yacc.c:1651 */
+ case 167:
+#line 1990 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4304,11 +4301,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4308 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4305 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 170:
-#line 1992 "fe/idl.ypp" /* yacc.c:1651 */
+ case 169:
+#line 2003 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4317,11 +4314,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4321 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4318 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 171:
-#line 2001 "fe/idl.ypp" /* yacc.c:1651 */
+ case 170:
+#line 2012 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4330,11 +4327,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4334 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4331 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 173:
-#line 2014 "fe/idl.ypp" /* yacc.c:1651 */
+ case 172:
+#line 2025 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4343,11 +4340,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4347 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4344 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 174:
-#line 2023 "fe/idl.ypp" /* yacc.c:1651 */
+ case 173:
+#line 2034 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4356,11 +4353,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4360 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4357 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 175:
-#line 2032 "fe/idl.ypp" /* yacc.c:1651 */
+ case 174:
+#line 2043 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4369,11 +4366,11 @@ yyreduce:
(yyvsp[0].exval)
);
}
-#line 4373 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4370 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 177:
-#line 2045 "fe/idl.ypp" /* yacc.c:1651 */
+ case 176:
+#line 2056 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen ()->create_expr (
@@ -4382,11 +4379,11 @@ yyreduce:
0
);
}
-#line 4386 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4383 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 178:
-#line 2054 "fe/idl.ypp" /* yacc.c:1651 */
+ case 177:
+#line 2065 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen()->create_expr (
@@ -4395,11 +4392,11 @@ yyreduce:
0
);
}
-#line 4399 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4396 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 179:
-#line 2063 "fe/idl.ypp" /* yacc.c:1651 */
+ case 178:
+#line 2074 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen()->create_expr (
@@ -4408,11 +4405,11 @@ yyreduce:
0
);
}
-#line 4412 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4409 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 180:
-#line 2075 "fe/idl.ypp" /* yacc.c:1651 */
+ case 179:
+#line 2086 "fe/idl.ypp" /* yacc.c:1651 */
{
/*
* An expression which is a scoped name is not resolved now,
@@ -4470,104 +4467,104 @@ yyreduce:
delete (yyvsp[0].idlist);
(yyvsp[0].idlist) = 0;
}
-#line 4474 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4471 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 182:
-#line 2134 "fe/idl.ypp" /* yacc.c:1651 */
+ case 181:
+#line 2145 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) = (yyvsp[-1].exval);
}
-#line 4482 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4479 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 183:
-#line 2141 "fe/idl.ypp" /* yacc.c:1651 */
+ case 182:
+#line 2152 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].ival));
}
-#line 4490 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4487 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 184:
-#line 2145 "fe/idl.ypp" /* yacc.c:1651 */
+ case 183:
+#line 2156 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) =
idl_global->gen ()->create_expr ((yyvsp[0].uival));
}
-#line 4499 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4496 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 185:
-#line 2150 "fe/idl.ypp" /* yacc.c:1651 */
+ case 184:
+#line 2161 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].sval));
(yyvsp[0].sval)->destroy ();
delete (yyvsp[0].sval);
(yyvsp[0].sval) = 0;
}
-#line 4510 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4507 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 186:
-#line 2157 "fe/idl.ypp" /* yacc.c:1651 */
+ case 185:
+#line 2168 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].wsval));
}
-#line 4518 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4515 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 187:
-#line 2161 "fe/idl.ypp" /* yacc.c:1651 */
+ case 186:
+#line 2172 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].cval));
}
-#line 4526 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4523 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 188:
-#line 2165 "fe/idl.ypp" /* yacc.c:1651 */
+ case 187:
+#line 2176 "fe/idl.ypp" /* yacc.c:1651 */
{
ACE_OutputCDR::from_wchar wc ((yyvsp[0].wcval));
(yyval.exval) = idl_global->gen ()->create_expr (wc);
}
-#line 4535 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4532 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 189:
-#line 2170 "fe/idl.ypp" /* yacc.c:1651 */
+ case 188:
+#line 2181 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].fixval));
}
-#line 4543 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4540 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 190:
-#line 2174 "fe/idl.ypp" /* yacc.c:1651 */
+ case 189:
+#line 2185 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].dval));
}
-#line 4551 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4548 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 191:
-#line 2178 "fe/idl.ypp" /* yacc.c:1651 */
+ case 190:
+#line 2189 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) = idl_global->gen ()->create_expr (true);
}
-#line 4559 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4556 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 192:
-#line 2182 "fe/idl.ypp" /* yacc.c:1651 */
+ case 191:
+#line 2193 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) = idl_global->gen ()->create_expr (false);
}
-#line 4567 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4564 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 193:
-#line 2189 "fe/idl.ypp" /* yacc.c:1651 */
+ case 192:
+#line 2200 "fe/idl.ypp" /* yacc.c:1651 */
{
int good_expression = 1;
(yyvsp[0].exval)->evaluate (AST_Expression::EK_positive_int);
@@ -4632,11 +4629,11 @@ yyreduce:
idl_global->err ()->syntax_error (idl_global->parse_state ());
}
}
-#line 4636 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4633 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 194:
-#line 2257 "fe/idl.ypp" /* yacc.c:1651 */
+ case 193:
+#line 2268 "fe/idl.ypp" /* yacc.c:1651 */
{
if (idl_global->idl_version_ < IDL_VERSION_4)
{
@@ -4653,31 +4650,31 @@ yyreduce:
fe_add_annotation_decl (annotation_decl);
idl_global->scopes ().push (annotation_decl);
}
-#line 4657 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4654 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 195:
-#line 2274 "fe/idl.ypp" /* yacc.c:1651 */
+ case 194:
+#line 2285 "fe/idl.ypp" /* yacc.c:1651 */
{
Identifier *id = (yyvsp[-4].idval);
idl_global->scopes ().pop ();
id->destroy ();
delete id;
}
-#line 4668 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4665 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 201:
-#line 2292 "fe/idl.ypp" /* yacc.c:1651 */
+ case 200:
+#line 2303 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen);
idl_global->in_typedef (true);
}
-#line 4677 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4674 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 205:
-#line 2306 "fe/idl.ypp" /* yacc.c:1651 */
+ case 204:
+#line 2317 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *scope = idl_global->scopes ().top_non_null ();
UTL_Scope *root = idl_global->scopes ().bottom ();
@@ -4725,27 +4722,27 @@ yyreduce:
delete result;
}
}
-#line 4729 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4726 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 206:
-#line 2357 "fe/idl.ypp" /* yacc.c:1651 */
+ case 205:
+#line 2368 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) = (yyvsp[0].exval);
}
-#line 4737 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4734 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 207:
-#line 2361 "fe/idl.ypp" /* yacc.c:1651 */
+ case 206:
+#line 2372 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.exval) = 0;
}
-#line 4745 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4742 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 208:
-#line 2368 "fe/idl.ypp" /* yacc.c:1651 */
+ case 207:
+#line 2379 "fe/idl.ypp" /* yacc.c:1651 */
{
AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val);
@@ -4755,11 +4752,11 @@ yyreduce:
}
(yyval.annotations_val) = annotations;
}
-#line 4759 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4756 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 209:
-#line 2381 "fe/idl.ypp" /* yacc.c:1651 */
+ case 208:
+#line 2392 "fe/idl.ypp" /* yacc.c:1651 */
{
AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val);
AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val);
@@ -4769,19 +4766,19 @@ yyreduce:
}
(yyval.annotations_val) = annotations;
}
-#line 4773 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4770 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 210:
-#line 2391 "fe/idl.ypp" /* yacc.c:1651 */
+ case 209:
+#line 2402 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.annotations_val) = new AST_Annotation_Appls ();
}
-#line 4781 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4778 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 211:
-#line 2398 "fe/idl.ypp" /* yacc.c:1651 */
+ case 210:
+#line 2409 "fe/idl.ypp" /* yacc.c:1651 */
{
if (idl_global->idl_version_ < IDL_VERSION_4)
{
@@ -4834,11 +4831,11 @@ yyreduce:
(yyval.annotation_decl_val) = decl;
}
-#line 4838 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4835 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 212:
-#line 2451 "fe/idl.ypp" /* yacc.c:1651 */
+ case 211:
+#line 2462 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->ignore_lookup_errors_ = false;
AST_Annotation_Appl *appl = 0;
@@ -4855,27 +4852,27 @@ yyreduce:
(yyval.annotation_val) = appl;
}
-#line 4859 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4856 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 213:
-#line 2471 "fe/idl.ypp" /* yacc.c:1651 */
+ case 212:
+#line 2482 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.annotation_params_val) = (yyvsp[-1].annotation_params_val);
}
-#line 4867 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4864 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 214:
-#line 2475 "fe/idl.ypp" /* yacc.c:1651 */
+ case 213:
+#line 2486 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.annotation_params_val) = 0;
}
-#line 4875 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4872 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 215:
-#line 2482 "fe/idl.ypp" /* yacc.c:1651 */
+ case 214:
+#line 2493 "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;
@@ -4884,99 +4881,99 @@ yyreduce:
params->push (param);
(yyval.annotation_params_val) = params;
}
-#line 4888 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4885 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 216:
-#line 2491 "fe/idl.ypp" /* yacc.c:1651 */
+ case 215:
+#line 2502 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.annotation_params_val) = (yyvsp[0].annotation_params_val);
}
-#line 4896 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4893 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 217:
-#line 2498 "fe/idl.ypp" /* yacc.c:1651 */
+ case 216:
+#line 2509 "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 4906 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4903 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 218:
-#line 2506 "fe/idl.ypp" /* yacc.c:1651 */
+ case 217:
+#line 2517 "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 4916 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4913 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 219:
-#line 2512 "fe/idl.ypp" /* yacc.c:1651 */
+ case 218:
+#line 2523 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.annotation_params_val) = new AST_Annotation_Appl::Params;
}
-#line 4924 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4921 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 220:
-#line 2519 "fe/idl.ypp" /* yacc.c:1651 */
+ case 219:
+#line 2530 "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 4935 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4932 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 221:
-#line 2529 "fe/idl.ypp" /* yacc.c:1651 */
+ case 220:
+#line 2540 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen);
idl_global->in_typedef (true);
}
-#line 4944 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4941 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 222:
-#line 2534 "fe/idl.ypp" /* yacc.c:1651 */
+ case 221:
+#line 2545 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) = (yyvsp[0].dcval);
}
-#line 4952 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4949 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 223:
-#line 2538 "fe/idl.ypp" /* yacc.c:1651 */
+ case 222:
+#line 2549 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) = (yyvsp[0].dcval);
}
-#line 4960 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4957 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 224:
-#line 2542 "fe/idl.ypp" /* yacc.c:1651 */
+ case 223:
+#line 2553 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) = (yyvsp[0].dcval);
}
-#line 4968 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4965 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 225:
-#line 2546 "fe/idl.ypp" /* yacc.c:1651 */
+ case 224:
+#line 2557 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) = (yyvsp[0].dcval);
}
-#line 4976 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 4973 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 226:
-#line 2550 "fe/idl.ypp" /* yacc.c:1651 */
+ case 225:
+#line 2561 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Native *node = 0;
@@ -5002,27 +4999,27 @@ yyreduce:
delete (yyvsp[0].deval);
(yyvsp[0].deval) = 0;
}
-#line 5006 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5003 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 227:
-#line 2576 "fe/idl.ypp" /* yacc.c:1651 */
+ case 226:
+#line 2587 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) = 0;
}
-#line 5014 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5011 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 228:
-#line 2583 "fe/idl.ypp" /* yacc.c:1651 */
+ case 227:
+#line 2594 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_TypeSpecSeen);
}
-#line 5022 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5019 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 229:
-#line 2587 "fe/idl.ypp" /* yacc.c:1651 */
+ case 228:
+#line 2598 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
FE_Declarator *d = 0;
@@ -5087,22 +5084,22 @@ yyreduce:
(yyval.dcval) = t;
}
-#line 5091 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5088 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 232:
-#line 2660 "fe/idl.ypp" /* yacc.c:1651 */
+ case 231:
+#line 2671 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) =
idl_global->scopes ().bottom ()->lookup_primitive_type (
(yyvsp[0].etval)
);
}
-#line 5102 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5099 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 234:
-#line 2668 "fe/idl.ypp" /* yacc.c:1651 */
+ case 233:
+#line 2679 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d = 0;
@@ -5125,30 +5122,30 @@ yyreduce:
(yyval.dcval) = d;
}
-#line 5129 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5126 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 252:
-#line 2723 "fe/idl.ypp" /* yacc.c:1651 */
+ case 251:
+#line 2734 "fe/idl.ypp" /* yacc.c:1651 */
{
ACE_NEW_RETURN ((yyval.dlval),
UTL_DeclList ((yyvsp[-1].deval),
(yyvsp[0].dlval)),
1);
}
-#line 5140 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5137 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 253:
-#line 2734 "fe/idl.ypp" /* yacc.c:1651 */
+ case 252:
+#line 2745 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen);
}
-#line 5148 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5145 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 254:
-#line 2738 "fe/idl.ypp" /* yacc.c:1651 */
+ case 253:
+#line 2749 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen);
@@ -5168,38 +5165,38 @@ yyreduce:
(yyval.dlval) = (yyvsp[-3].dlval);
}
}
-#line 5172 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5169 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 255:
-#line 2758 "fe/idl.ypp" /* yacc.c:1651 */
+ case 254:
+#line 2769 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dlval) = 0;
}
-#line 5180 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5177 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 258:
-#line 2770 "fe/idl.ypp" /* yacc.c:1651 */
+ case 257:
+#line 2781 "fe/idl.ypp" /* yacc.c:1651 */
{
ACE_NEW_RETURN ((yyval.dlval),
UTL_DeclList ((yyvsp[-1].deval),
(yyvsp[0].dlval)),
1);
}
-#line 5191 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5188 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 259:
-#line 2781 "fe/idl.ypp" /* yacc.c:1651 */
+ case 258:
+#line 2792 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen);
}
-#line 5199 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5196 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 260:
-#line 2785 "fe/idl.ypp" /* yacc.c:1651 */
+ case 259:
+#line 2796 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen);
@@ -5219,19 +5216,19 @@ yyreduce:
(yyval.dlval) = (yyvsp[-3].dlval);
}
}
-#line 5223 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5220 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 261:
-#line 2805 "fe/idl.ypp" /* yacc.c:1651 */
+ case 260:
+#line 2816 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dlval) = 0;
}
-#line 5231 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5228 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 262:
-#line 2812 "fe/idl.ypp" /* yacc.c:1651 */
+ case 261:
+#line 2823 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_ScopedName *sn = 0;
ACE_NEW_RETURN (sn,
@@ -5244,11 +5241,11 @@ yyreduce:
0),
1);
}
-#line 5248 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5245 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 263:
-#line 2828 "fe/idl.ypp" /* yacc.c:1651 */
+ case 262:
+#line 2839 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_ScopedName *sn = 0;
ACE_NEW_RETURN (sn,
@@ -5263,156 +5260,156 @@ yyreduce:
(yyvsp[0].dcval)),
1);
}
-#line 5267 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5264 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 266:
-#line 2851 "fe/idl.ypp" /* yacc.c:1651 */
+ case 265:
+#line 2862 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_long;
}
-#line 5275 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5272 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 267:
-#line 2855 "fe/idl.ypp" /* yacc.c:1651 */
+ case 266:
+#line 2866 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_longlong;
}
-#line 5283 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5280 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 268:
-#line 2859 "fe/idl.ypp" /* yacc.c:1651 */
+ case 267:
+#line 2870 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_short;
}
-#line 5291 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5288 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 269:
-#line 2866 "fe/idl.ypp" /* yacc.c:1651 */
+ case 268:
+#line 2877 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_ulong;
}
-#line 5299 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5296 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 270:
-#line 2870 "fe/idl.ypp" /* yacc.c:1651 */
+ case 269:
+#line 2881 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_ulonglong;
}
-#line 5307 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5304 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 271:
-#line 2874 "fe/idl.ypp" /* yacc.c:1651 */
+ case 270:
+#line 2885 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_ushort;
}
-#line 5315 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5312 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 272:
-#line 2881 "fe/idl.ypp" /* yacc.c:1651 */
+ case 271:
+#line 2892 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_double;
}
-#line 5323 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5320 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 273:
-#line 2885 "fe/idl.ypp" /* yacc.c:1651 */
+ case 272:
+#line 2896 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_float;
}
-#line 5331 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5328 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 274:
-#line 2889 "fe/idl.ypp" /* yacc.c:1651 */
+ case 273:
+#line 2900 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_longdouble;
}
-#line 5339 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5336 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 275:
-#line 2896 "fe/idl.ypp" /* yacc.c:1651 */
+ case 274:
+#line 2907 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_fixed;
}
-#line 5347 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5344 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 276:
-#line 2903 "fe/idl.ypp" /* yacc.c:1651 */
+ case 275:
+#line 2914 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_char;
}
-#line 5355 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5352 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 277:
-#line 2907 "fe/idl.ypp" /* yacc.c:1651 */
+ case 276:
+#line 2918 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_wchar;
}
-#line 5363 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5360 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 278:
-#line 2914 "fe/idl.ypp" /* yacc.c:1651 */
+ case 277:
+#line 2925 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_octet;
}
-#line 5371 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5368 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 279:
-#line 2921 "fe/idl.ypp" /* yacc.c:1651 */
+ case 278:
+#line 2932 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_bool;
}
-#line 5379 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5376 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 280:
-#line 2928 "fe/idl.ypp" /* yacc.c:1651 */
+ case 279:
+#line 2939 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_any;
}
-#line 5387 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5384 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 281:
-#line 2935 "fe/idl.ypp" /* yacc.c:1651 */
+ case 280:
+#line 2946 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.etval) = AST_Expression::EV_object;
}
-#line 5395 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5392 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 282:
-#line 2942 "fe/idl.ypp" /* yacc.c:1651 */
+ case 281:
+#line 2953 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen);
}
-#line 5403 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5400 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 283:
-#line 2946 "fe/idl.ypp" /* yacc.c:1651 */
+ case 282:
+#line 2957 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen);
(yyval.idval) = (yyvsp[0].idval);
}
-#line 5412 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5409 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 284:
-#line 2955 "fe/idl.ypp" /* yacc.c:1651 */
+ case 283:
+#line 2966 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval), 0);
@@ -5443,27 +5440,27 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 5447 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5444 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 285:
-#line 2986 "fe/idl.ypp" /* yacc.c:1651 */
+ case 284:
+#line 2997 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen);
}
-#line 5455 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5452 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 286:
-#line 2990 "fe/idl.ypp" /* yacc.c:1651 */
+ case 285:
+#line 3001 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen);
}
-#line 5463 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5460 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 287:
-#line 2994 "fe/idl.ypp" /* yacc.c:1651 */
+ case 286:
+#line 3005 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen);
@@ -5475,51 +5472,42 @@ yyreduce:
);
idl_global->scopes ().pop ();
}
-#line 5479 "fe/idl.tab.cpp" /* yacc.c:1651 */
- break;
-
- case 291:
-#line 3015 "fe/idl.ypp" /* yacc.c:1651 */
- {
- /* is $0 to member_i */
- (yyval.vival) = AST_Field::vis_NA;
- }
-#line 5488 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5476 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 292:
-#line 3020 "fe/idl.ypp" /* yacc.c:1651 */
+ case 290:
+#line 3027 "fe/idl.ypp" /* yacc.c:1651 */
{
- if ((yyvsp[0].decls_val))
+ if ((yyvsp[-1].annotations_val))
{
- AST_Decls & decls = *(yyvsp[0].decls_val);
+ AST_Decls &decls = *(yyvsp[0].decls_val);
for (size_t i = 0; i < decls.size (); i++)
{
decls[i]->annotation_appls ((yyvsp[-1].annotations_val));
}
}
}
-#line 5503 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5491 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 293:
-#line 3034 "fe/idl.ypp" /* yacc.c:1651 */
+ case 291:
+#line 3041 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_MemberTypeSeen);
}
-#line 5511 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5499 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 294:
-#line 3038 "fe/idl.ypp" /* yacc.c:1651 */
+ case 292:
+#line 3045 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsSeen);
}
-#line 5519 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5507 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 295:
-#line 3042 "fe/idl.ypp" /* yacc.c:1651 */
+ case 293:
+#line 3049 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
FE_Declarator *d = 0;
@@ -5561,13 +5549,7 @@ yyreduce:
continue;
}
- /* $0 denotes Visibility, must be on yacc reduction stack. */
- f =
- idl_global->gen ()->create_field (
- tp,
- d->name (),
- (yyvsp[-5].vival)
- );
+ f = idl_global->gen ()->create_field (tp, d->name ());
members->push_back (f);
(void) s->fe_add_field (f);
}
@@ -5579,53 +5561,53 @@ yyreduce:
(yyval.decls_val) = members;
}
-#line 5583 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5565 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 296:
-#line 3102 "fe/idl.ypp" /* yacc.c:1651 */
+ case 294:
+#line 3103 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->err()->syntax_error (idl_global->parse_state ());
}
-#line 5591 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5573 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 297:
-#line 3106 "fe/idl.ypp" /* yacc.c:1651 */
+ case 295:
+#line 3107 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
yyerrok;
}
-#line 5600 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5582 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 298:
-#line 3114 "fe/idl.ypp" /* yacc.c:1651 */
+ case 296:
+#line 3115 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen);
}
-#line 5608 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5590 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 299:
-#line 3118 "fe/idl.ypp" /* yacc.c:1651 */
+ case 297:
+#line 3119 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen);
(yyval.idval) = (yyvsp[0].idval);
}
-#line 5617 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5599 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 300:
-#line 3126 "fe/idl.ypp" /* yacc.c:1651 */
+ case 298:
+#line 3127 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SwitchSeen);
}
-#line 5625 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5607 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 301:
-#line 3130 "fe/idl.ypp" /* yacc.c:1651 */
+ case 299:
+#line 3131 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[-3].idval), 0);
@@ -5658,19 +5640,19 @@ yyreduce:
* Don't delete $1 yet; we'll need it a bit later.
*/
}
-#line 5662 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5644 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 302:
-#line 3163 "fe/idl.ypp" /* yacc.c:1651 */
+ case 300:
+#line 3164 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SwitchTypeSeen);
}
-#line 5670 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5652 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 303:
-#line 3167 "fe/idl.ypp" /* yacc.c:1651 */
+ case 301:
+#line 3168 "fe/idl.ypp" /* yacc.c:1651 */
{
/*
* The top of the scopes must be an empty union we added after we
@@ -5726,27 +5708,27 @@ yyreduce:
delete (yyvsp[-8].idval);
(yyvsp[-8].idval) = 0;
}
-#line 5730 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5712 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 304:
-#line 3223 "fe/idl.ypp" /* yacc.c:1651 */
+ case 302:
+#line 3224 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionSqSeen);
}
-#line 5738 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5720 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 305:
-#line 3227 "fe/idl.ypp" /* yacc.c:1651 */
+ case 303:
+#line 3228 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionBodySeen);
}
-#line 5746 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5728 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 306:
-#line 3231 "fe/idl.ypp" /* yacc.c:1651 */
+ case 304:
+#line 3232 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionQsSeen);
@@ -5762,22 +5744,22 @@ yyreduce:
idl_global->scopes ().pop ();
}
}
-#line 5766 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5748 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 307:
-#line 3250 "fe/idl.ypp" /* yacc.c:1651 */
+ case 305:
+#line 3251 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) =
idl_global->scopes ().bottom ()->lookup_primitive_type (
(yyvsp[0].etval)
);
}
-#line 5777 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5759 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 308:
-#line 3257 "fe/idl.ypp" /* yacc.c:1651 */
+ case 306:
+#line 3258 "fe/idl.ypp" /* yacc.c:1651 */
{
/* wchars are not allowed. */
if ((yyvsp[0].etval) == AST_Expression::EV_wchar)
@@ -5790,11 +5772,11 @@ yyreduce:
(yyvsp[0].etval)
);
}
-#line 5794 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5776 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 309:
-#line 3270 "fe/idl.ypp" /* yacc.c:1651 */
+ case 307:
+#line 3271 "fe/idl.ypp" /* yacc.c:1651 */
{
/* octets are not allowed. */
idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE);
@@ -5803,22 +5785,22 @@ yyreduce:
(yyvsp[0].etval)
);
}
-#line 5807 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5789 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 310:
-#line 3279 "fe/idl.ypp" /* yacc.c:1651 */
+ case 308:
+#line 3280 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) =
idl_global->scopes ().bottom ()->lookup_primitive_type (
(yyvsp[0].etval)
);
}
-#line 5818 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5800 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 312:
-#line 3287 "fe/idl.ypp" /* yacc.c:1651 */
+ case 310:
+#line 3288 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d = 0;
@@ -5925,27 +5907,27 @@ yyreduce:
delete (yyvsp[0].idlist);
(yyvsp[0].idlist) = 0;
}
-#line 5929 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5911 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 316:
-#line 3404 "fe/idl.ypp" /* yacc.c:1651 */
+ case 314:
+#line 3405 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen);
}
-#line 5937 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5919 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 317:
-#line 3408 "fe/idl.ypp" /* yacc.c:1651 */
+ case 315:
+#line 3409 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen);
}
-#line 5945 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5927 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 318:
-#line 3412 "fe/idl.ypp" /* yacc.c:1651 */
+ case 316:
+#line 3413 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_UnionBranch *b = 0;
@@ -5974,39 +5956,39 @@ yyreduce:
f = 0;
}
}
-#line 5978 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5960 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 319:
-#line 3441 "fe/idl.ypp" /* yacc.c:1651 */
+ case 317:
+#line 3442 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->err()->syntax_error (idl_global->parse_state());
}
-#line 5986 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5968 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 320:
-#line 3445 "fe/idl.ypp" /* yacc.c:1651 */
+ case 318:
+#line 3446 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
yyerrok;
}
-#line 5995 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5977 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 321:
-#line 3453 "fe/idl.ypp" /* yacc.c:1651 */
+ case 319:
+#line 3454 "fe/idl.ypp" /* yacc.c:1651 */
{
ACE_NEW_RETURN ((yyval.llval),
UTL_LabelList ((yyvsp[-1].ulval),
(yyvsp[0].llval)),
1);
}
-#line 6006 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 5988 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 322:
-#line 3463 "fe/idl.ypp" /* yacc.c:1651 */
+ case 320:
+#line 3464 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_LabelList *ll = 0;
ACE_NEW_RETURN (ll,
@@ -6024,27 +6006,27 @@ yyreduce:
(yyval.llval) = (yyvsp[-1].llval);
}
}
-#line 6028 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6010 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 323:
-#line 3481 "fe/idl.ypp" /* yacc.c:1651 */
+ case 321:
+#line 3482 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.llval) = 0;
}
-#line 6036 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6018 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 324:
-#line 3488 "fe/idl.ypp" /* yacc.c:1651 */
+ case 322:
+#line 3489 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_DefaultSeen);
}
-#line 6044 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6026 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 325:
-#line 3492 "fe/idl.ypp" /* yacc.c:1651 */
+ case 323:
+#line 3493 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen);
@@ -6053,27 +6035,27 @@ yyreduce:
0
);
}
-#line 6057 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6039 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 326:
-#line 3501 "fe/idl.ypp" /* yacc.c:1651 */
+ case 324:
+#line 3502 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_CaseSeen);
}
-#line 6065 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6047 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 327:
-#line 3505 "fe/idl.ypp" /* yacc.c:1651 */
+ case 325:
+#line 3506 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen);
}
-#line 6073 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6055 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 328:
-#line 3509 "fe/idl.ypp" /* yacc.c:1651 */
+ case 326:
+#line 3510 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen);
@@ -6082,19 +6064,19 @@ yyreduce:
(yyvsp[-2].exval)
);
}
-#line 6086 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6068 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 329:
-#line 3521 "fe/idl.ypp" /* yacc.c:1651 */
+ case 327:
+#line 3522 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemTypeSeen);
}
-#line 6094 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6076 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 330:
-#line 3525 "fe/idl.ypp" /* yacc.c:1651 */
+ case 328:
+#line 3526 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemDeclSeen);
@@ -6138,11 +6120,11 @@ yyreduce:
(yyvsp[0].deval) = 0;
}
}
-#line 6142 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6124 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 331:
-#line 3572 "fe/idl.ypp" /* yacc.c:1651 */
+ case 329:
+#line 3573 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -6164,11 +6146,11 @@ yyreduce:
(yyval.dcval) = d;
}
-#line 6168 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6150 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 332:
-#line 3597 "fe/idl.ypp" /* yacc.c:1651 */
+ case 330:
+#line 3598 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -6188,19 +6170,19 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 6192 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6174 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 333:
-#line 3620 "fe/idl.ypp" /* yacc.c:1651 */
+ case 331:
+#line 3621 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen);
}
-#line 6200 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6182 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 334:
-#line 3624 "fe/idl.ypp" /* yacc.c:1651 */
+ case 332:
+#line 3625 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval), 0);
@@ -6231,27 +6213,27 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 6235 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6217 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 335:
-#line 3655 "fe/idl.ypp" /* yacc.c:1651 */
+ case 333:
+#line 3656 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EnumSqSeen);
}
-#line 6243 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6225 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 336:
-#line 3659 "fe/idl.ypp" /* yacc.c:1651 */
+ case 334:
+#line 3660 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EnumBodySeen);
}
-#line 6251 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6233 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 337:
-#line 3663 "fe/idl.ypp" /* yacc.c:1651 */
+ case 335:
+#line 3664 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EnumQsSeen);
@@ -6270,19 +6252,19 @@ yyreduce:
idl_global->scopes ().pop ();
}
}
-#line 6274 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6256 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 339:
-#line 3688 "fe/idl.ypp" /* yacc.c:1651 */
+ case 337:
+#line 3689 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EnumCommaSeen);
}
-#line 6282 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6264 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 342:
-#line 3697 "fe/idl.ypp" /* yacc.c:1651 */
+ case 340:
+#line 3698 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
Identifier id ((yyvsp[0].strval));
@@ -6314,27 +6296,27 @@ yyreduce:
(void) s->fe_add_enum_val (e);
}
}
-#line 6318 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6300 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 343:
-#line 3733 "fe/idl.ypp" /* yacc.c:1651 */
+ case 341:
+#line 3734 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceCommaSeen);
}
-#line 6326 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6308 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 344:
-#line 3737 "fe/idl.ypp" /* yacc.c:1651 */
+ case 342:
+#line 3738 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceExprSeen);
}
-#line 6334 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6316 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 345:
-#line 3741 "fe/idl.ypp" /* yacc.c:1651 */
+ case 343:
+#line 3742 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen);
@@ -6418,11 +6400,11 @@ yyreduce:
ev = 0;
(yyval.dcval) = seq;
}
-#line 6422 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6404 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 346:
-#line 3826 "fe/idl.ypp" /* yacc.c:1651 */
+ case 344:
+#line 3827 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen);
@@ -6487,11 +6469,11 @@ yyreduce:
(yyval.dcval) = seq;
}
-#line 6491 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6473 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 347:
-#line 3894 "fe/idl.ypp" /* yacc.c:1651 */
+ case 345:
+#line 3895 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSeen);
@@ -6500,19 +6482,19 @@ yyreduce:
*/
idl_global->scopes ().push (0);
}
-#line 6504 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6486 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 348:
-#line 3903 "fe/idl.ypp" /* yacc.c:1651 */
+ case 346:
+#line 3904 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSqSeen);
}
-#line 6512 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6494 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 349:
-#line 3907 "fe/idl.ypp" /* yacc.c:1651 */
+ case 347:
+#line 3908 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SequenceTypeSeen);
Decl_Annotations_Pair *seq_head = new Decl_Annotations_Pair;
@@ -6520,36 +6502,36 @@ yyreduce:
seq_head->annotations = (yyvsp[-1].annotations_val);
(yyval.decl_annotations_pair_val) = seq_head;
}
-#line 6524 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6506 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 350:
-#line 3918 "fe/idl.ypp" /* yacc.c:1651 */
+ case 348:
+#line 3919 "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 6533 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6515 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 351:
-#line 3927 "fe/idl.ypp" /* yacc.c:1651 */
+ case 349:
+#line 3928 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen);
}
-#line 6541 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6523 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 352:
-#line 3931 "fe/idl.ypp" /* yacc.c:1651 */
+ case 350:
+#line 3932 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen);
}
-#line 6549 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6531 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 353:
-#line 3935 "fe/idl.ypp" /* yacc.c:1651 */
+ case 351:
+#line 3936 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen);
@@ -6591,11 +6573,11 @@ yyreduce:
delete ev;
ev = 0;
}
-#line 6595 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6577 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 354:
-#line 3977 "fe/idl.ypp" /* yacc.c:1651 */
+ case 352:
+#line 3978 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted);
@@ -6618,35 +6600,35 @@ yyreduce:
(yyval.dcval) = tao_string_decl;
}
-#line 6622 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6604 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 355:
-#line 4003 "fe/idl.ypp" /* yacc.c:1651 */
+ case 353:
+#line 4004 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen);
}
-#line 6630 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6612 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 356:
-#line 4011 "fe/idl.ypp" /* yacc.c:1651 */
+ case 354:
+#line 4012 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen);
}
-#line 6638 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6620 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 357:
-#line 4015 "fe/idl.ypp" /* yacc.c:1651 */
+ case 355:
+#line 4016 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen);
}
-#line 6646 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6628 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 358:
-#line 4019 "fe/idl.ypp" /* yacc.c:1651 */
+ case 356:
+#line 4020 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen);
@@ -6679,11 +6661,11 @@ yyreduce:
(yyval.dcval) = string;
}
}
-#line 6683 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6665 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 359:
-#line 4052 "fe/idl.ypp" /* yacc.c:1651 */
+ case 357:
+#line 4053 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted);
@@ -6706,27 +6688,27 @@ yyreduce:
(yyval.dcval) = string;
}
-#line 6710 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6692 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 360:
-#line 4078 "fe/idl.ypp" /* yacc.c:1651 */
+ case 358:
+#line 4079 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen);
}
-#line 6718 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6700 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 361:
-#line 4085 "fe/idl.ypp" /* yacc.c:1651 */
+ case 359:
+#line 4086 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen);
}
-#line 6726 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6708 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 362:
-#line 4089 "fe/idl.ypp" /* yacc.c:1651 */
+ case 360:
+#line 4090 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted);
@@ -6764,22 +6746,22 @@ yyreduce:
(yyval.dcval) = array;
}
-#line 6768 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6750 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 363:
-#line 4130 "fe/idl.ypp" /* yacc.c:1651 */
+ case 361:
+#line 4131 "fe/idl.ypp" /* yacc.c:1651 */
{
ACE_NEW_RETURN ((yyval.elval),
UTL_ExprList ((yyvsp[-1].exval),
(yyvsp[0].elval)),
1);
}
-#line 6779 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6761 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 364:
-#line 4140 "fe/idl.ypp" /* yacc.c:1651 */
+ case 362:
+#line 4141 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_ExprList *el = 0;
ACE_NEW_RETURN (el,
@@ -6797,35 +6779,35 @@ yyreduce:
(yyval.elval) = (yyvsp[-1].elval);
}
}
-#line 6801 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6783 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 365:
-#line 4158 "fe/idl.ypp" /* yacc.c:1651 */
+ case 363:
+#line 4159 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.elval) = 0;
}
-#line 6809 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6791 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 366:
-#line 4165 "fe/idl.ypp" /* yacc.c:1651 */
+ case 364:
+#line 4166 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen);
}
-#line 6817 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6799 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 367:
-#line 4169 "fe/idl.ypp" /* yacc.c:1651 */
+ case 365:
+#line 4170 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen);
}
-#line 6825 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6807 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 368:
-#line 4173 "fe/idl.ypp" /* yacc.c:1651 */
+ case 366:
+#line 4174 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen);
@@ -6879,43 +6861,43 @@ yyreduce:
delete ev;
ev = 0;
}
-#line 6883 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6865 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 371:
-#line 4235 "fe/idl.ypp" /* yacc.c:1651 */
+ case 369:
+#line 4236 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen);
}
-#line 6891 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6873 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 372:
-#line 4239 "fe/idl.ypp" /* yacc.c:1651 */
+ case 370:
+#line 4240 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen);
}
-#line 6899 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6881 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 373:
-#line 4243 "fe/idl.ypp" /* yacc.c:1651 */
+ case 371:
+#line 4244 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen);
}
-#line 6907 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6889 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 374:
-#line 4247 "fe/idl.ypp" /* yacc.c:1651 */
+ case 372:
+#line 4248 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen);
}
-#line 6915 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6897 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 375:
-#line 4251 "fe/idl.ypp" /* yacc.c:1651 */
+ case 373:
+#line 4252 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Attribute *a = 0;
@@ -6975,43 +6957,43 @@ yyreduce:
delete (yyvsp[-2].dlval);
(yyvsp[-2].dlval) = 0;
}
-#line 6979 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6961 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 376:
-#line 4314 "fe/idl.ypp" /* yacc.c:1651 */
+ case 374:
+#line 4315 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen);
}
-#line 6987 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6969 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 377:
-#line 4318 "fe/idl.ypp" /* yacc.c:1651 */
+ case 375:
+#line 4319 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen);
}
-#line 6995 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6977 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 378:
-#line 4322 "fe/idl.ypp" /* yacc.c:1651 */
+ case 376:
+#line 4323 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen);
}
-#line 7003 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6985 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 379:
-#line 4326 "fe/idl.ypp" /* yacc.c:1651 */
+ case 377:
+#line 4327 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted);
}
-#line 7011 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 6993 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 380:
-#line 4330 "fe/idl.ypp" /* yacc.c:1651 */
+ case 378:
+#line 4331 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Attribute *a = 0;
@@ -7080,19 +7062,19 @@ yyreduce:
delete (yyvsp[-4].dlval);
(yyvsp[-4].dlval) = 0;
}
-#line 7084 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7066 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 381:
-#line 4402 "fe/idl.ypp" /* yacc.c:1651 */
+ case 379:
+#line 4403 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen);
}
-#line 7092 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7074 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 382:
-#line 4406 "fe/idl.ypp" /* yacc.c:1651 */
+ case 380:
+#line 4407 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -7121,27 +7103,27 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 7125 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7107 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 383:
-#line 4435 "fe/idl.ypp" /* yacc.c:1651 */
+ case 381:
+#line 4436 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen);
}
-#line 7133 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7115 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 384:
-#line 4439 "fe/idl.ypp" /* yacc.c:1651 */
+ case 382:
+#line 4440 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen);
}
-#line 7141 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7123 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 385:
-#line 4443 "fe/idl.ypp" /* yacc.c:1651 */
+ case 383:
+#line 4444 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen);
/*
@@ -7149,19 +7131,19 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 7153 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7135 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 386:
-#line 4455 "fe/idl.ypp" /* yacc.c:1651 */
+ case 384:
+#line 4456 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen);
}
-#line 7161 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7143 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 387:
-#line 4459 "fe/idl.ypp" /* yacc.c:1651 */
+ case 385:
+#line 4460 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
Identifier id ((yyvsp[0].strval));
@@ -7225,27 +7207,27 @@ yyreduce:
*/
idl_global->scopes ().push (o);
}
-#line 7229 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7211 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 388:
-#line 4523 "fe/idl.ypp" /* yacc.c:1651 */
+ case 386:
+#line 4524 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
}
-#line 7237 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7219 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 389:
-#line 4527 "fe/idl.ypp" /* yacc.c:1651 */
+ case 387:
+#line 4528 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
}
-#line 7245 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7227 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 390:
-#line 4531 "fe/idl.ypp" /* yacc.c:1651 */
+ case 388:
+#line 4532 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Operation *o = 0;
@@ -7274,57 +7256,57 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 7278 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7260 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 391:
-#line 4563 "fe/idl.ypp" /* yacc.c:1651 */
+ case 389:
+#line 4564 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen);
(yyval.ofval) = AST_Operation::OP_oneway;
}
-#line 7287 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7269 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 392:
-#line 4568 "fe/idl.ypp" /* yacc.c:1651 */
+ case 390:
+#line 4569 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen);
(yyval.ofval) = AST_Operation::OP_idempotent;
}
-#line 7296 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7278 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 393:
-#line 4573 "fe/idl.ypp" /* yacc.c:1651 */
+ case 391:
+#line 4574 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.ofval) = AST_Operation::OP_noflags;
}
-#line 7304 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7286 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 395:
-#line 4581 "fe/idl.ypp" /* yacc.c:1651 */
+ case 393:
+#line 4582 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) =
idl_global->scopes ().bottom ()->lookup_primitive_type (
AST_Expression::EV_void
);
}
-#line 7315 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7297 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 396:
-#line 4591 "fe/idl.ypp" /* yacc.c:1651 */
+ case 394:
+#line 4592 "fe/idl.ypp" /* yacc.c:1651 */
{
//@@ PS_FactorySeen?
idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen);
}
-#line 7324 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7306 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 397:
-#line 4596 "fe/idl.ypp" /* yacc.c:1651 */
+ case 395:
+#line 4597 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
@@ -7365,19 +7347,19 @@ yyreduce:
*/
idl_global->scopes ().push (factory);
}
-#line 7369 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7351 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 398:
-#line 4637 "fe/idl.ypp" /* yacc.c:1651 */
+ case 396:
+#line 4638 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
}
-#line 7377 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7359 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 399:
-#line 4641 "fe/idl.ypp" /* yacc.c:1651 */
+ case 397:
+#line 4642 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
@@ -7390,67 +7372,67 @@ yyreduce:
idl_global->scopes ().pop ();
}
-#line 7394 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7376 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 400:
-#line 4657 "fe/idl.ypp" /* yacc.c:1651 */
+ case 398:
+#line 4658 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
}
-#line 7402 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7384 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 401:
-#line 4661 "fe/idl.ypp" /* yacc.c:1651 */
+ case 399:
+#line 4662 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
}
-#line 7410 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7392 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 402:
-#line 4665 "fe/idl.ypp" /* yacc.c:1651 */
+ case 400:
+#line 4666 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
}
-#line 7418 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7400 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 403:
-#line 4670 "fe/idl.ypp" /* yacc.c:1651 */
+ case 401:
+#line 4671 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
}
-#line 7426 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7408 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 405:
-#line 4680 "fe/idl.ypp" /* yacc.c:1651 */
+ case 403:
+#line 4681 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen);
}
-#line 7434 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7416 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 408:
-#line 4689 "fe/idl.ypp" /* yacc.c:1651 */
+ case 406:
+#line 4690 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen);
}
-#line 7442 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7424 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 409:
-#line 4693 "fe/idl.ypp" /* yacc.c:1651 */
+ case 407:
+#line 4694 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen);
}
-#line 7450 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7432 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 410:
-#line 4697 "fe/idl.ypp" /* yacc.c:1651 */
+ case 408:
+#line 4698 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Argument *a = 0;
@@ -7482,67 +7464,67 @@ yyreduce:
delete (yyvsp[0].deval);
(yyvsp[0].deval) = 0;
}
-#line 7486 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7468 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 411:
-#line 4732 "fe/idl.ypp" /* yacc.c:1651 */
+ case 409:
+#line 4733 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
}
-#line 7494 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7476 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 412:
-#line 4736 "fe/idl.ypp" /* yacc.c:1651 */
+ case 410:
+#line 4737 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
}
-#line 7502 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7484 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 413:
-#line 4740 "fe/idl.ypp" /* yacc.c:1651 */
+ case 411:
+#line 4741 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen);
}
-#line 7510 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7492 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 414:
-#line 4745 "fe/idl.ypp" /* yacc.c:1651 */
+ case 412:
+#line 4746 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen);
}
-#line 7518 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7500 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 416:
-#line 4755 "fe/idl.ypp" /* yacc.c:1651 */
+ case 414:
+#line 4756 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen);
}
-#line 7526 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7508 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 419:
-#line 4764 "fe/idl.ypp" /* yacc.c:1651 */
+ case 417:
+#line 4765 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen);
}
-#line 7534 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7516 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 420:
-#line 4768 "fe/idl.ypp" /* yacc.c:1651 */
+ case 418:
+#line 4769 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen);
}
-#line 7542 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7524 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 421:
-#line 4772 "fe/idl.ypp" /* yacc.c:1651 */
+ case 419:
+#line 4773 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Argument *a = 0;
@@ -7581,22 +7563,22 @@ yyreduce:
delete (yyvsp[0].deval);
(yyvsp[0].deval) = 0;
}
-#line 7585 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7567 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 422:
-#line 4814 "fe/idl.ypp" /* yacc.c:1651 */
+ case 420:
+#line 4815 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dcval) =
idl_global->scopes ().bottom ()->lookup_primitive_type (
(yyvsp[0].etval)
);
}
-#line 7596 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7578 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 425:
-#line 4823 "fe/idl.ypp" /* yacc.c:1651 */
+ case 423:
+#line 4824 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d = 0;
@@ -7700,186 +7682,186 @@ yyreduce:
(yyval.dcval) = d;
}
-#line 7704 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7686 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 426:
-#line 4930 "fe/idl.ypp" /* yacc.c:1651 */
+ case 424:
+#line 4931 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dival) = AST_Argument::dir_IN;
}
-#line 7712 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7694 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 427:
-#line 4934 "fe/idl.ypp" /* yacc.c:1651 */
+ case 425:
+#line 4935 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dival) = AST_Argument::dir_OUT;
}
-#line 7720 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7702 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 428:
-#line 4938 "fe/idl.ypp" /* yacc.c:1651 */
+ case 426:
+#line 4939 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.dival) = AST_Argument::dir_INOUT;
}
-#line 7728 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7710 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 429:
-#line 4945 "fe/idl.ypp" /* yacc.c:1651 */
+ case 427:
+#line 4946 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen);
}
-#line 7736 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7718 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 430:
-#line 4949 "fe/idl.ypp" /* yacc.c:1651 */
+ case 428:
+#line 4950 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen);
}
-#line 7744 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7726 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 431:
-#line 4954 "fe/idl.ypp" /* yacc.c:1651 */
+ case 429:
+#line 4955 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen);
(yyval.nlval) = (yyvsp[-1].nlval);
}
-#line 7753 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7735 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 432:
-#line 4959 "fe/idl.ypp" /* yacc.c:1651 */
+ case 430:
+#line 4960 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.nlval) = 0;
}
-#line 7761 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7743 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 433:
-#line 4966 "fe/idl.ypp" /* yacc.c:1651 */
+ case 431:
+#line 4967 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen);
}
-#line 7769 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7751 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 434:
-#line 4970 "fe/idl.ypp" /* yacc.c:1651 */
+ case 432:
+#line 4971 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen);
}
-#line 7777 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7759 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 435:
-#line 4975 "fe/idl.ypp" /* yacc.c:1651 */
+ case 433:
+#line 4976 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen);
(yyval.nlval) = (yyvsp[-1].nlval);
}
-#line 7786 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7768 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 436:
-#line 4980 "fe/idl.ypp" /* yacc.c:1651 */
+ case 434:
+#line 4981 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.nlval) = 0;
}
-#line 7794 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7776 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 437:
-#line 4987 "fe/idl.ypp" /* yacc.c:1651 */
+ case 435:
+#line 4988 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen);
}
-#line 7802 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7784 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 438:
-#line 4991 "fe/idl.ypp" /* yacc.c:1651 */
+ case 436:
+#line 4992 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen);
}
-#line 7810 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7792 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 439:
-#line 4996 "fe/idl.ypp" /* yacc.c:1651 */
+ case 437:
+#line 4997 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen);
(yyval.nlval) = (yyvsp[-1].nlval);
}
-#line 7819 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7801 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 440:
-#line 5001 "fe/idl.ypp" /* yacc.c:1651 */
+ case 438:
+#line 5002 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.nlval) = 0;
}
-#line 7827 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7809 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 441:
-#line 5008 "fe/idl.ypp" /* yacc.c:1651 */
+ case 439:
+#line 5009 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen);
}
-#line 7835 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7817 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 442:
-#line 5012 "fe/idl.ypp" /* yacc.c:1651 */
+ case 440:
+#line 5013 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen);
}
-#line 7843 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7825 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 443:
-#line 5017 "fe/idl.ypp" /* yacc.c:1651 */
+ case 441:
+#line 5018 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen);
(yyval.slval) = (yyvsp[-1].slval);
}
-#line 7852 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7834 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 444:
-#line 5022 "fe/idl.ypp" /* yacc.c:1651 */
+ case 442:
+#line 5023 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.slval) = 0;
}
-#line 7860 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7842 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 445:
-#line 5029 "fe/idl.ypp" /* yacc.c:1651 */
+ case 443:
+#line 5030 "fe/idl.ypp" /* yacc.c:1651 */
{
ACE_NEW_RETURN ((yyval.slval),
UTL_StrList ((yyvsp[-1].sval),
(yyvsp[0].slval)),
1);
}
-#line 7871 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7853 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 446:
-#line 5040 "fe/idl.ypp" /* yacc.c:1651 */
+ case 444:
+#line 5041 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen);
}
-#line 7879 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7861 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 447:
-#line 5044 "fe/idl.ypp" /* yacc.c:1651 */
+ case 445:
+#line 5045 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_StrList *sl = 0;
ACE_NEW_RETURN (sl,
@@ -7897,19 +7879,19 @@ yyreduce:
(yyval.slval) = (yyvsp[-3].slval);
}
}
-#line 7901 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7883 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 448:
-#line 5062 "fe/idl.ypp" /* yacc.c:1651 */
+ case 446:
+#line 5063 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.slval) = 0;
}
-#line 7909 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7891 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 449:
-#line 5069 "fe/idl.ypp" /* yacc.c:1651 */
+ case 447:
+#line 5070 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d =
@@ -7934,11 +7916,11 @@ yyreduce:
delete (yyvsp[0].sval);
(yyvsp[0].sval) = 0;
}
-#line 7938 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7920 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 450:
-#line 5097 "fe/idl.ypp" /* yacc.c:1651 */
+ case 448:
+#line 5098 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Decl *d = ScopeAsDecl (s);
@@ -7972,11 +7954,11 @@ yyreduce:
delete (yyvsp[0].sval);
(yyvsp[0].sval) = 0;
}
-#line 7976 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7958 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 453:
-#line 5140 "fe/idl.ypp" /* yacc.c:1651 */
+ case 451:
+#line 5141 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -8000,11 +7982,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 8004 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 7986 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 454:
-#line 5167 "fe/idl.ypp" /* yacc.c:1651 */
+ case 452:
+#line 5168 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Component *c = 0;
@@ -8043,27 +8025,27 @@ yyreduce:
*/
idl_global->scopes ().push (c);
}
-#line 8047 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8029 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 455:
-#line 5206 "fe/idl.ypp" /* yacc.c:1651 */
+ case 453:
+#line 5207 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen);
}
-#line 8055 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8037 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 456:
-#line 5210 "fe/idl.ypp" /* yacc.c:1651 */
+ case 454:
+#line 5211 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen);
}
-#line 8063 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8045 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 457:
-#line 5214 "fe/idl.ypp" /* yacc.c:1651 */
+ case 455:
+#line 5215 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen);
@@ -8072,27 +8054,27 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 8076 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8058 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 458:
-#line 5227 "fe/idl.ypp" /* yacc.c:1651 */
+ case 456:
+#line 5228 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen);
}
-#line 8084 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8066 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 459:
-#line 5231 "fe/idl.ypp" /* yacc.c:1651 */
+ case 457:
+#line 5232 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
}
-#line 8092 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8074 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 460:
-#line 5235 "fe/idl.ypp" /* yacc.c:1651 */
+ case 458:
+#line 5236 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
@@ -8126,147 +8108,147 @@ yyreduce:
(yyvsp[-2].idlist) = 0;
}
}
-#line 8130 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8112 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 461:
-#line 5272 "fe/idl.ypp" /* yacc.c:1651 */
+ case 459:
+#line 5273 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
}
-#line 8138 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8120 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 462:
-#line 5276 "fe/idl.ypp" /* yacc.c:1651 */
+ case 460:
+#line 5277 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 8146 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8128 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 463:
-#line 5280 "fe/idl.ypp" /* yacc.c:1651 */
+ case 461:
+#line 5281 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.idlist) = 0;
}
-#line 8154 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8136 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 466:
-#line 5292 "fe/idl.ypp" /* yacc.c:1651 */
+ case 464:
+#line 5293 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen);
}
-#line 8162 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8144 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 467:
-#line 5296 "fe/idl.ypp" /* yacc.c:1651 */
+ case 465:
+#line 5297 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8170 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8152 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 468:
-#line 5300 "fe/idl.ypp" /* yacc.c:1651 */
+ case 466:
+#line 5301 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen);
}
-#line 8178 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8160 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 469:
-#line 5304 "fe/idl.ypp" /* yacc.c:1651 */
+ case 467:
+#line 5305 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8186 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8168 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 470:
-#line 5308 "fe/idl.ypp" /* yacc.c:1651 */
+ case 468:
+#line 5309 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen);
}
-#line 8194 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8176 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 471:
-#line 5312 "fe/idl.ypp" /* yacc.c:1651 */
+ case 469:
+#line 5313 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8202 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8184 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 472:
-#line 5316 "fe/idl.ypp" /* yacc.c:1651 */
+ case 470:
+#line 5317 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen);
}
-#line 8210 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8192 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 473:
-#line 5320 "fe/idl.ypp" /* yacc.c:1651 */
+ case 471:
+#line 5321 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8218 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8200 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 474:
-#line 5324 "fe/idl.ypp" /* yacc.c:1651 */
+ case 472:
+#line 5325 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen);
}
-#line 8226 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8208 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 475:
-#line 5328 "fe/idl.ypp" /* yacc.c:1651 */
+ case 473:
+#line 5329 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8234 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8216 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 476:
-#line 5332 "fe/idl.ypp" /* yacc.c:1651 */
+ case 474:
+#line 5333 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
}
-#line 8242 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8224 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 477:
-#line 5336 "fe/idl.ypp" /* yacc.c:1651 */
+ case 475:
+#line 5337 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8250 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8232 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 478:
-#line 5340 "fe/idl.ypp" /* yacc.c:1651 */
+ case 476:
+#line 5341 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen);
}
-#line 8258 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8240 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 479:
-#line 5344 "fe/idl.ypp" /* yacc.c:1651 */
+ case 477:
+#line 5345 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8266 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8248 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 480:
-#line 5350 "fe/idl.ypp" /* yacc.c:1651 */
+ case 478:
+#line 5351 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
@@ -8353,21 +8335,21 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 8357 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8339 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 481:
-#line 5440 "fe/idl.ypp" /* yacc.c:1651 */
+ case 479:
+#line 5441 "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 8367 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8349 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 482:
-#line 5446 "fe/idl.ypp" /* yacc.c:1651 */
+ case 480:
+#line 5447 "fe/idl.ypp" /* yacc.c:1651 */
{
Identifier *corba_id = 0;
@@ -8390,11 +8372,11 @@ yyreduce:
conc_name),
1);
}
-#line 8394 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8376 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 483:
-#line 5471 "fe/idl.ypp" /* yacc.c:1651 */
+ case 481:
+#line 5472 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
@@ -8497,37 +8479,37 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 8501 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8483 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 484:
-#line 5577 "fe/idl.ypp" /* yacc.c:1651 */
+ case 482:
+#line 5578 "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 8511 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8493 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 485:
-#line 5586 "fe/idl.ypp" /* yacc.c:1651 */
+ case 483:
+#line 5587 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.bval) = true;
}
-#line 8519 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8501 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 486:
-#line 5590 "fe/idl.ypp" /* yacc.c:1651 */
+ case 484:
+#line 5591 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.bval) = false;
}
-#line 8527 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8509 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 487:
-#line 5596 "fe/idl.ypp" /* yacc.c:1651 */
+ case 485:
+#line 5597 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
@@ -8597,11 +8579,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 8601 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8583 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 488:
-#line 5668 "fe/idl.ypp" /* yacc.c:1651 */
+ case 486:
+#line 5669 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
@@ -8671,11 +8653,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 8675 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8657 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 489:
-#line 5740 "fe/idl.ypp" /* yacc.c:1651 */
+ case 487:
+#line 5741 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
bool so_far_so_good = true;
@@ -8745,11 +8727,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 8749 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8731 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 490:
-#line 5813 "fe/idl.ypp" /* yacc.c:1651 */
+ case 488:
+#line 5814 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Home *h = 0;
@@ -8786,70 +8768,70 @@ yyreduce:
*/
idl_global->scopes ().push (h);
}
-#line 8790 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8772 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 491:
-#line 5850 "fe/idl.ypp" /* yacc.c:1651 */
+ case 489:
+#line 5851 "fe/idl.ypp" /* yacc.c:1651 */
{
/*
* Done with this component - pop it off the scopes stack.
*/
idl_global->scopes ().pop ();
}
-#line 8801 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8783 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 492:
-#line 5860 "fe/idl.ypp" /* yacc.c:1651 */
+ case 490:
+#line 5861 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen);
}
-#line 8809 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8791 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 493:
-#line 5864 "fe/idl.ypp" /* yacc.c:1651 */
+ case 491:
+#line 5865 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen);
}
-#line 8817 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8799 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 494:
-#line 5868 "fe/idl.ypp" /* yacc.c:1651 */
+ case 492:
+#line 5869 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
}
-#line 8825 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8807 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 495:
-#line 5872 "fe/idl.ypp" /* yacc.c:1651 */
+ case 493:
+#line 5873 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
}
-#line 8833 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8815 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 496:
-#line 5876 "fe/idl.ypp" /* yacc.c:1651 */
+ case 494:
+#line 5877 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen);
}
-#line 8841 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8823 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 497:
-#line 5880 "fe/idl.ypp" /* yacc.c:1651 */
+ case 495:
+#line 5881 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen);
}
-#line 8849 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8831 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 498:
-#line 5884 "fe/idl.ypp" /* yacc.c:1651 */
+ case 496:
+#line 5885 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen);
@@ -8895,107 +8877,107 @@ yyreduce:
(yyvsp[-6].nlval) = 0;
}
}
-#line 8899 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8881 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 499:
-#line 5933 "fe/idl.ypp" /* yacc.c:1651 */
+ case 497:
+#line 5934 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen);
}
-#line 8907 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8889 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 500:
-#line 5937 "fe/idl.ypp" /* yacc.c:1651 */
+ case 498:
+#line 5938 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 8915 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8897 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 501:
-#line 5941 "fe/idl.ypp" /* yacc.c:1651 */
+ case 499:
+#line 5942 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.idlist) = 0;
}
-#line 8923 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8905 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 502:
-#line 5949 "fe/idl.ypp" /* yacc.c:1651 */
+ case 500:
+#line 5950 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.idlist) = (yyvsp[0].idlist);
}
-#line 8931 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8913 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 503:
-#line 5953 "fe/idl.ypp" /* yacc.c:1651 */
+ case 501:
+#line 5954 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.idlist) = 0;
}
-#line 8939 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8921 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 504:
-#line 5960 "fe/idl.ypp" /* yacc.c:1651 */
+ case 502:
+#line 5961 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen);
}
-#line 8947 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8929 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 505:
-#line 5964 "fe/idl.ypp" /* yacc.c:1651 */
+ case 503:
+#line 5965 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen);
}
-#line 8955 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8937 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 506:
-#line 5968 "fe/idl.ypp" /* yacc.c:1651 */
+ case 504:
+#line 5969 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen);
}
-#line 8963 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8945 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 510:
-#line 5981 "fe/idl.ypp" /* yacc.c:1651 */
+ case 508:
+#line 5982 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen);
}
-#line 8971 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8953 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 511:
-#line 5985 "fe/idl.ypp" /* yacc.c:1651 */
+ case 509:
+#line 5986 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8979 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8961 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 512:
-#line 5989 "fe/idl.ypp" /* yacc.c:1651 */
+ case 510:
+#line 5990 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen);
}
-#line 8987 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8969 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 513:
-#line 5993 "fe/idl.ypp" /* yacc.c:1651 */
+ case 511:
+#line 5994 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 8995 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 8977 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 514:
-#line 6001 "fe/idl.ypp" /* yacc.c:1651 */
+ case 512:
+#line 6002 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -9018,19 +9000,19 @@ yyreduce:
*/
idl_global->scopes ().push (f);
}
-#line 9022 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9004 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 515:
-#line 6024 "fe/idl.ypp" /* yacc.c:1651 */
+ case 513:
+#line 6025 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
}
-#line 9030 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9012 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 516:
-#line 6028 "fe/idl.ypp" /* yacc.c:1651 */
+ case 514:
+#line 6029 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
@@ -9048,11 +9030,11 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 9052 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9034 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 517:
-#line 6050 "fe/idl.ypp" /* yacc.c:1651 */
+ case 515:
+#line 6051 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -9079,19 +9061,19 @@ yyreduce:
*/
idl_global->scopes ().push (f);
}
-#line 9083 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9065 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 518:
-#line 6077 "fe/idl.ypp" /* yacc.c:1651 */
+ case 516:
+#line 6078 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted);
}
-#line 9091 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9073 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 519:
-#line 6081 "fe/idl.ypp" /* yacc.c:1651 */
+ case 517:
+#line 6082 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
@@ -9109,11 +9091,11 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 9113 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9095 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 525:
-#line 6114 "fe/idl.ypp" /* yacc.c:1651 */
+ case 523:
+#line 6115 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -9136,11 +9118,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 9140 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9122 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 526:
-#line 6142 "fe/idl.ypp" /* yacc.c:1651 */
+ case 524:
+#line 6143 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
UTL_ScopedName n ((yyvsp[0].idval),
@@ -9163,11 +9145,11 @@ yyreduce:
delete (yyvsp[0].idval);
(yyvsp[0].idval) = 0;
}
-#line 9167 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9149 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 527:
-#line 6169 "fe/idl.ypp" /* yacc.c:1651 */
+ case 525:
+#line 6170 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_EventType *e = 0;
@@ -9211,27 +9193,27 @@ yyreduce:
delete (yyvsp[-1].idval);
(yyvsp[-1].idval) = 0;
}
-#line 9215 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9197 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 528:
-#line 6213 "fe/idl.ypp" /* yacc.c:1651 */
+ case 526:
+#line 6214 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen);
}
-#line 9223 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9205 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 529:
-#line 6217 "fe/idl.ypp" /* yacc.c:1651 */
+ case 527:
+#line 6218 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen);
}
-#line 9231 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9213 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 530:
-#line 6221 "fe/idl.ypp" /* yacc.c:1651 */
+ case 528:
+#line 6222 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen);
@@ -9240,19 +9222,19 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 9244 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9226 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 531:
-#line 6235 "fe/idl.ypp" /* yacc.c:1651 */
+ case 529:
+#line 6236 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.idval) = (yyvsp[0].idval);
}
-#line 9252 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9234 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 532:
-#line 6244 "fe/idl.ypp" /* yacc.c:1651 */
+ case 530:
+#line 6245 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen);
@@ -9265,29 +9247,29 @@ yyreduce:
ACE_TEXT (" custom yet\n")));
(yyval.idval) = 0;
}
-#line 9269 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9251 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 533:
-#line 6261 "fe/idl.ypp" /* yacc.c:1651 */
+ case 531:
+#line 6262 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen);
(yyval.idval) = (yyvsp[0].idval);
}
-#line 9279 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9261 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 534:
-#line 6270 "fe/idl.ypp" /* yacc.c:1651 */
+ case 532:
+#line 6271 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen);
}
-#line 9287 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9269 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 535:
-#line 6274 "fe/idl.ypp" /* yacc.c:1651 */
+ case 533:
+#line 6275 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen);
@@ -9316,11 +9298,11 @@ yyreduce:
(yyvsp[-2].nlval) = 0;
}
}
-#line 9320 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9302 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 536:
-#line 6307 "fe/idl.ypp" /* yacc.c:1651 */
+ case 534:
+#line 6308 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_EventType *e = 0;
@@ -9369,27 +9351,27 @@ yyreduce:
*/
idl_global->scopes ().push (e);
}
-#line 9373 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9355 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 537:
-#line 6356 "fe/idl.ypp" /* yacc.c:1651 */
+ case 535:
+#line 6357 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen);
}
-#line 9381 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9363 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 538:
-#line 6360 "fe/idl.ypp" /* yacc.c:1651 */
+ case 536:
+#line 6361 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen);
}
-#line 9389 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9371 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 539:
-#line 6364 "fe/idl.ypp" /* yacc.c:1651 */
+ case 537:
+#line 6365 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen);
@@ -9398,108 +9380,108 @@ yyreduce:
*/
idl_global->scopes ().pop ();
}
-#line 9402 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9384 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 540:
-#line 6376 "fe/idl.ypp" /* yacc.c:1651 */
+ case 538:
+#line 6377 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.idval) = (yyvsp[0].idval);
}
-#line 9410 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9392 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 541:
-#line 6380 "fe/idl.ypp" /* yacc.c:1651 */
+ case 539:
+#line 6381 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.idval) = (yyvsp[0].idval);
}
-#line 9418 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9400 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 542:
-#line 6387 "fe/idl.ypp" /* yacc.c:1651 */
+ case 540:
+#line 6388 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.ntval) = AST_Decl::NT_type;
}
-#line 9426 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9408 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 543:
-#line 6391 "fe/idl.ypp" /* yacc.c:1651 */
+ case 541:
+#line 6392 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.ntval) = AST_Decl::NT_struct;
}
-#line 9434 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9416 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 544:
-#line 6395 "fe/idl.ypp" /* yacc.c:1651 */
+ case 542:
+#line 6396 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.ntval) = AST_Decl::NT_union;
}
-#line 9442 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9424 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 545:
-#line 6399 "fe/idl.ypp" /* yacc.c:1651 */
+ case 543:
+#line 6400 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.ntval) = AST_Decl::NT_eventtype;
}
-#line 9450 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9432 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 546:
-#line 6403 "fe/idl.ypp" /* yacc.c:1651 */
+ case 544:
+#line 6404 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.ntval) = AST_Decl::NT_sequence;
}
-#line 9458 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9440 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 547:
-#line 6407 "fe/idl.ypp" /* yacc.c:1651 */
+ case 545:
+#line 6408 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.ntval) = AST_Decl::NT_interface;
}
-#line 9466 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9448 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 548:
-#line 6411 "fe/idl.ypp" /* yacc.c:1651 */
+ case 546:
+#line 6412 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.ntval) = AST_Decl::NT_valuetype;
}
-#line 9474 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9456 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 549:
-#line 6415 "fe/idl.ypp" /* yacc.c:1651 */
+ case 547:
+#line 6416 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.ntval) = AST_Decl::NT_enum;
}
-#line 9482 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9464 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 550:
-#line 6419 "fe/idl.ypp" /* yacc.c:1651 */
+ case 548:
+#line 6420 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.ntval) = AST_Decl::NT_except;
}
-#line 9490 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9472 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 551:
-#line 6423 "fe/idl.ypp" /* yacc.c:1651 */
+ case 549:
+#line 6424 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.ntval) = AST_Decl::NT_const;
t_param_const_type = (yyvsp[0].etval);
}
-#line 9499 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9481 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 552:
-#line 6431 "fe/idl.ypp" /* yacc.c:1651 */
+ case 550:
+#line 6432 "fe/idl.ypp" /* yacc.c:1651 */
{
if ((yyvsp[0].plval) == 0)
{
@@ -9527,11 +9509,11 @@ yyreduce:
(yyval.plval) = (yyvsp[0].plval);
}
-#line 9531 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9513 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 553:
-#line 6462 "fe/idl.ypp" /* yacc.c:1651 */
+ case 551:
+#line 6463 "fe/idl.ypp" /* yacc.c:1651 */
{
if ((yyvsp[-2].plval) == 0)
{
@@ -9544,19 +9526,19 @@ yyreduce:
delete (yyvsp[0].pival);
(yyvsp[0].pival) = 0;
}
-#line 9548 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9530 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 554:
-#line 6475 "fe/idl.ypp" /* yacc.c:1651 */
+ case 552:
+#line 6476 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.plval) = 0;
}
-#line 9556 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9538 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 555:
-#line 6482 "fe/idl.ypp" /* yacc.c:1651 */
+ case 553:
+#line 6483 "fe/idl.ypp" /* yacc.c:1651 */
{
ACE_NEW_RETURN ((yyval.pival),
@@ -9581,11 +9563,11 @@ yyreduce:
tao_enum_constant_decl = 0;
}
}
-#line 9585 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9567 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 556:
-#line 6507 "fe/idl.ypp" /* yacc.c:1651 */
+ case 554:
+#line 6508 "fe/idl.ypp" /* yacc.c:1651 */
{
ACE_NEW_RETURN ((yyval.pival),
FE_Utils::T_Param_Info,
@@ -9600,19 +9582,19 @@ yyreduce:
ACE::strdelete ((yyvsp[0].strval));
(yyvsp[0].strval) = 0;
}
-#line 9604 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9586 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 557:
-#line 6525 "fe/idl.ypp" /* yacc.c:1651 */
+ case 555:
+#line 6526 "fe/idl.ypp" /* yacc.c:1651 */
{
ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1);
}
-#line 9612 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9594 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 558:
-#line 6532 "fe/idl.ypp" /* yacc.c:1651 */
+ case 556:
+#line 6533 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_StrList *sl = 0;
ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), 0), 1);
@@ -9627,37 +9609,37 @@ yyreduce:
(yyval.slval) = (yyvsp[-2].slval);
}
}
-#line 9631 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9613 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 559:
-#line 6547 "fe/idl.ypp" /* yacc.c:1651 */
+ case 557:
+#line 6548 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.slval) = 0;
}
-#line 9639 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9621 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 560:
-#line 6554 "fe/idl.ypp" /* yacc.c:1651 */
+ case 558:
+#line 6555 "fe/idl.ypp" /* yacc.c:1651 */
{
ACE_NEW_RETURN ((yyval.sval),
UTL_String ((yyvsp[0].strval), true),
1);
}
-#line 9649 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9631 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 561:
-#line 6563 "fe/idl.ypp" /* yacc.c:1651 */
+ case 559:
+#line 6564 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen);
}
-#line 9657 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9639 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 562:
-#line 6567 "fe/idl.ypp" /* yacc.c:1651 */
+ case 560:
+#line 6568 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen);
UTL_Scope *s = idl_global->scopes ().top_non_null ();
@@ -9675,102 +9657,102 @@ yyreduce:
// Push it on the scopes stack.
idl_global->scopes ().push (p);
}
-#line 9679 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9661 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 563:
-#line 6585 "fe/idl.ypp" /* yacc.c:1651 */
+ case 561:
+#line 6586 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen);
}
-#line 9687 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9669 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 564:
-#line 6589 "fe/idl.ypp" /* yacc.c:1651 */
+ case 562:
+#line 6590 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen);
}
-#line 9695 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9677 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 565:
-#line 6593 "fe/idl.ypp" /* yacc.c:1651 */
+ case 563:
+#line 6594 "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 9706 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9688 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 566:
-#line 6603 "fe/idl.ypp" /* yacc.c:1651 */
+ case 564:
+#line 6604 "fe/idl.ypp" /* yacc.c:1651 */
{
}
-#line 9713 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9695 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 567:
-#line 6609 "fe/idl.ypp" /* yacc.c:1651 */
+ case 565:
+#line 6610 "fe/idl.ypp" /* yacc.c:1651 */
{
}
-#line 9720 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9702 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 568:
-#line 6612 "fe/idl.ypp" /* yacc.c:1651 */
+ case 566:
+#line 6613 "fe/idl.ypp" /* yacc.c:1651 */
{
}
-#line 9727 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9709 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 569:
-#line 6618 "fe/idl.ypp" /* yacc.c:1651 */
+ case 567:
+#line 6619 "fe/idl.ypp" /* yacc.c:1651 */
{
}
-#line 9734 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9716 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 570:
-#line 6621 "fe/idl.ypp" /* yacc.c:1651 */
+ case 568:
+#line 6622 "fe/idl.ypp" /* yacc.c:1651 */
{
}
-#line 9741 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9723 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 571:
-#line 6624 "fe/idl.ypp" /* yacc.c:1651 */
+ case 569:
+#line 6625 "fe/idl.ypp" /* yacc.c:1651 */
{
}
-#line 9748 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9730 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 572:
-#line 6627 "fe/idl.ypp" /* yacc.c:1651 */
+ case 570:
+#line 6628 "fe/idl.ypp" /* yacc.c:1651 */
{
}
-#line 9755 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9737 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 573:
-#line 6630 "fe/idl.ypp" /* yacc.c:1651 */
+ case 571:
+#line 6631 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
}
-#line 9763 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9745 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 574:
-#line 6634 "fe/idl.ypp" /* yacc.c:1651 */
+ case 572:
+#line 6635 "fe/idl.ypp" /* yacc.c:1651 */
{
}
-#line 9770 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9752 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 575:
-#line 6640 "fe/idl.ypp" /* yacc.c:1651 */
+ case 573:
+#line 6641 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen);
UTL_Scope *s = idl_global->scopes ().top_non_null ();
@@ -9839,11 +9821,11 @@ yyreduce:
delete (yyvsp[-1].idlist);
(yyvsp[-1].idlist) = 0;
}
-#line 9843 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9825 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 576:
-#line 6709 "fe/idl.ypp" /* yacc.c:1651 */
+ case 574:
+#line 6710 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen);
UTL_Scope *s = idl_global->scopes ().top_non_null ();
@@ -9890,11 +9872,11 @@ yyreduce:
delete (yyvsp[-1].idlist);
(yyvsp[-1].idlist) = 0;
}
-#line 9894 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9876 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 577:
-#line 6759 "fe/idl.ypp" /* yacc.c:1651 */
+ case 575:
+#line 6760 "fe/idl.ypp" /* yacc.c:1651 */
{
if ((yyvsp[0].alval) == 0)
{
@@ -9906,11 +9888,11 @@ yyreduce:
(yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval));
(yyval.alval) = (yyvsp[0].alval);
}
-#line 9910 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9892 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 578:
-#line 6774 "fe/idl.ypp" /* yacc.c:1651 */
+ case 576:
+#line 6775 "fe/idl.ypp" /* yacc.c:1651 */
{
if ((yyvsp[-3].alval) == 0)
{
@@ -9922,19 +9904,19 @@ yyreduce:
(yyvsp[-3].alval)->enqueue_tail ((yyvsp[0].dcval));
(yyval.alval) = (yyvsp[-3].alval);
}
-#line 9926 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9908 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 579:
-#line 6786 "fe/idl.ypp" /* yacc.c:1651 */
+ case 577:
+#line 6787 "fe/idl.ypp" /* yacc.c:1651 */
{
(yyval.alval) = 0;
}
-#line 9934 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9916 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 580:
-#line 6793 "fe/idl.ypp" /* yacc.c:1651 */
+ case 578:
+#line 6794 "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
@@ -9990,27 +9972,27 @@ yyreduce:
0);
}
}
-#line 9994 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9976 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 582:
-#line 6856 "fe/idl.ypp" /* yacc.c:1651 */
+ case 580:
+#line 6857 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen);
}
-#line 10002 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9984 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 583:
-#line 6860 "fe/idl.ypp" /* yacc.c:1651 */
+ case 581:
+#line 6861 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen);
}
-#line 10010 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 9992 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 584:
-#line 6864 "fe/idl.ypp" /* yacc.c:1651 */
+ case 582:
+#line 6865 "fe/idl.ypp" /* yacc.c:1651 */
{
UTL_Scope *s = idl_global->scopes ().top_non_null ();
AST_Connector *parent = 0;
@@ -10062,102 +10044,102 @@ yyreduce:
idl_global->scopes ().push (c);
}
}
-#line 10066 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10048 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 585:
-#line 6919 "fe/idl.ypp" /* yacc.c:1651 */
+ case 583:
+#line 6920 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen);
}
-#line 10074 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10056 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 586:
-#line 6923 "fe/idl.ypp" /* yacc.c:1651 */
+ case 584:
+#line 6924 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen);
}
-#line 10082 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10064 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 587:
-#line 6927 "fe/idl.ypp" /* yacc.c:1651 */
+ case 585:
+#line 6928 "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 10093 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10075 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 590:
-#line 6942 "fe/idl.ypp" /* yacc.c:1651 */
+ case 588:
+#line 6943 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen);
}
-#line 10101 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10083 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 591:
-#line 6946 "fe/idl.ypp" /* yacc.c:1651 */
+ case 589:
+#line 6947 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 10109 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10091 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 592:
-#line 6950 "fe/idl.ypp" /* yacc.c:1651 */
+ case 590:
+#line 6951 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen);
}
-#line 10117 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10099 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 593:
-#line 6954 "fe/idl.ypp" /* yacc.c:1651 */
+ case 591:
+#line 6955 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 10125 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10107 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 594:
-#line 6958 "fe/idl.ypp" /* yacc.c:1651 */
+ case 592:
+#line 6959 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen);
}
-#line 10133 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10115 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 595:
-#line 6962 "fe/idl.ypp" /* yacc.c:1651 */
+ case 593:
+#line 6963 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 10141 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10123 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 596:
-#line 6966 "fe/idl.ypp" /* yacc.c:1651 */
+ case 594:
+#line 6967 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen);
}
-#line 10149 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10131 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
- case 597:
-#line 6970 "fe/idl.ypp" /* yacc.c:1651 */
+ case 595:
+#line 6971 "fe/idl.ypp" /* yacc.c:1651 */
{
idl_global->set_parse_state (IDL_GlobalData::PS_NoState);
}
-#line 10157 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10139 "fe/idl.tab.cpp" /* yacc.c:1651 */
break;
-#line 10161 "fe/idl.tab.cpp" /* yacc.c:1651 */
+#line 10143 "fe/idl.tab.cpp" /* yacc.c:1651 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -10385,7 +10367,7 @@ yyreturn:
#endif
return yyresult;
}
-#line 6975 "fe/idl.ypp" /* yacc.c:1910 */
+#line 6976 "fe/idl.ypp" /* yacc.c:1910 */
/* programs */
diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp
index 9d759cf5745..923357f130c 100644
--- a/TAO/TAO_IDL/fe/idl.ypp
+++ b/TAO/TAO_IDL/fe/idl.ypp
@@ -378,6 +378,7 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none;
%type <decl_annotations_pair_val> seq_head
%type <decls_val> member_i;
+%type <vival> visibility;
%%
/*
@@ -1451,22 +1452,32 @@ value_element
';'
;
-state_member
+visibility
: IDL_PUBLIC
{
- /* is $0 to member_i */
- $<vival>$ = AST_Field::vis_PUBLIC;
- }
- member_i
- {
+ $$ = AST_Field::vis_PUBLIC;
}
| IDL_PRIVATE
{
- /* is $0 to member_i */
- $<vival>$ = AST_Field::vis_PRIVATE;
+ $$ = AST_Field::vis_PRIVATE;
}
- member_i
+ ;
+
+state_member
+ : visibility member_i
{
+ if ($2)
+ {
+ AST_Decls &decls = *$2;
+ for (size_t i = 0; i < decls.size (); i++)
+ {
+ AST_Field * field = dynamic_cast<AST_Field*>(decls[i]);
+ if (field)
+ {
+ field->visibility ($1);
+ }
+ }
+ }
}
;
@@ -3011,19 +3022,15 @@ members
| %empty
;
-member :
+member
+ : annotations_maybe member_i
{
- /* is $0 to member_i */
- $<vival>$ = AST_Field::vis_NA;
- }
- annotations_maybe member_i
- {
- if ($3)
+ if ($1)
{
- AST_Decls & decls = *$3;
+ AST_Decls &decls = *$2;
for (size_t i = 0; i < decls.size (); i++)
{
- decls[i]->annotation_appls ($2);
+ decls[i]->annotation_appls ($1);
}
}
}
@@ -3080,13 +3087,7 @@ member_i :
continue;
}
- /* $0 denotes Visibility, must be on yacc reduction stack. */
- f =
- idl_global->gen ()->create_field (
- tp,
- d->name (),
- $<vival>0
- );
+ f = idl_global->gen ()->create_field (tp, d->name ());
members->push_back (f);
(void) s->fe_add_field (f);
}
diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h
index 535e6740ab8..0eb2d152125 100644
--- a/TAO/TAO_IDL/include/ast_field.h
+++ b/TAO/TAO_IDL/include/ast_field.h
@@ -113,7 +113,12 @@ public:
// Data Accessors.
AST_Type *field_type (void) const;
- Visibility visibility (void) const;
+
+ /// Get and Set Visibility
+ ///{
+ Visibility visibility () const;
+ void visibility (Visibility val);
+ ///}
// Are we or do we contain a wstring?
virtual int contains_wstring (void);
diff --git a/TAO/TAO_IDL/include/idl_version.h b/TAO/TAO_IDL/include/idl_version.h
index d76d79dff12..03255a88962 100644
--- a/TAO/TAO_IDL/include/idl_version.h
+++ b/TAO/TAO_IDL/include/idl_version.h
@@ -17,7 +17,7 @@
* NOTE: If updated, idlVersionNames in util/idl_version.cpp must be updated
* as well!
*/
-enum TAO_IDL_FE_Export SpecificIdlVersion
+enum SpecificIdlVersion
{
/// Invalid Version Value
IDL_VERSION_INVALID,
diff --git a/TAO/TAO_IDL/util/idl_version.cpp b/TAO/TAO_IDL/util/idl_version.cpp
index 14a70dc821c..2ab8a542b24 100644
--- a/TAO/TAO_IDL/util/idl_version.cpp
+++ b/TAO/TAO_IDL/util/idl_version.cpp
@@ -44,16 +44,15 @@ const char * IdlVersion::to_string () const
void IdlVersion::from_string (const char * version)
{
- if (!version)
+ if (version)
{
- version_ = IDL_VERSION_INVALID;
- }
- for (int i = 0; i < IDL_VERSION_COUNT; i++)
- {
- if (!ACE_OS::strcmp (version, idlVersionNames[i]))
+ for (int i = 0; i < IDL_VERSION_COUNT; i++)
{
- version_ = static_cast<SpecificIdlVersion> (i);
- return;
+ if (!ACE_OS::strcmp (version, idlVersionNames[i]))
+ {
+ version_ = static_cast<SpecificIdlVersion> (i);
+ return;
+ }
}
}
version_ = IDL_VERSION_INVALID;
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 794c6cf3cb5..dd35eaf62dc 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -62,7 +62,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
*/
-
#include "idl_defines.h"
#include "idl_global.h"
#include "global_extern.h"
@@ -84,13 +83,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "ace/OS_NS_unistd.h"
#include "ace/Process.h"
#include "ace/Env_Value_T.h"
+// FUZZ: disable check_for_streams_include
+#include "ace/streams.h"
// Define an increment for the size of the array used to store names of
// included files.
#undef INCREMENT
#define INCREMENT 64
-static long *pSeenOnce= 0;
+static long *pSeenOnce = 0;
#if defined (ACE_OPENVMS)
#include <unixlib.h>
@@ -1949,12 +1950,19 @@ IDL_GlobalData::eval (const char *string)
// Set up Flex to read from string
tao_yy_scan_string (string);
- // emulate DRV_drive()
+ // Disable Output
+ std::streambuf *default_streambuf = ACE_DEFAULT_LOG_STREAM->rdbuf ();
+ ACE_DEFAULT_LOG_STREAM->rdbuf (0);
u_long const flags = ACE_LOG_MSG->flags ();
ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
+
+ // emulate DRV_drive()
FE_yyparse ();
idl_global->check_primary_keys ();
AST_check_fwd_decls ();
+
+ // Renable Output
+ ACE_DEFAULT_LOG_STREAM->rdbuf (default_streambuf);
ACE_LOG_MSG->set_flags (flags);
// Have Flex Cleanup
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
index 77cb464198f..e36501dbb8a 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
@@ -17,6 +17,7 @@ project(*test) : namingexe, rtscheduling_server {
idlflags += -SS -St -o ..
IDL_Files {
+ gendir = ..
../FP_Scheduling.idl
}
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
index a77487e663e..4a9902496b4 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
@@ -18,6 +18,7 @@ project(*test) : namingexe, rtscheduling_server {
idlflags += -SS -St -o ..
IDL_Files {
+ gendir = ..
../MIF_Scheduling.idl
}
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP.mpc b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
index 67fc0f96766..4178a55c569 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
@@ -15,6 +15,7 @@ project : htbp, orbsvcslib, orbsvcs_output, install, tao_versioning_idl_defaults
idlflags += -Sci -Gp -Gd -Sa -Sorb \
-o HTIOP
idlflags -= -St
+ gendir = HTIOP
HTIOP/htiop_endpoints.pidl
}
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
index 30e99c0ffa4..afcc8c0a05d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.mpc
@@ -58,6 +58,7 @@ project(SSLIOP) : orbsvcslib, orbsvcs_output, install, security, ssl, pi_server,
idlflags += -Sci -Gp -Gd -Sa -Sorb \
-o SSLIOP
idlflags -= -St
+ gendir = SSLIOP
SSLIOP/ssl_endpoints.pidl
}
}
diff --git a/TAO/tests/IDLv4/annotations/be_init.cpp b/TAO/tests/IDLv4/annotations/be_init.cpp
index f2936a93376..2d7124c7182 100644
--- a/TAO/tests/IDLv4/annotations/be_init.cpp
+++ b/TAO/tests/IDLv4/annotations/be_init.cpp
@@ -6,6 +6,7 @@
#include "ace/OS_NS_stdlib.h"
#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_stdio.h"
#ifndef ACE_LACKS_IOSTREAM_TOTALLY
# include "ace/streams.h"
@@ -1027,6 +1028,7 @@ BE_post_init (char *[], long)
idl_global->unknown_annotations_ =
IDL_GlobalData::UNKNOWN_ANNOTATIONS_ERROR;
Annotation_Test t ("Optionally, Unknown Annotation Application Causes Err");
+ // Any mention of "Error" will be picked up by scoreboard ^^^
t.last_error (UTL_Error::EIDL_LOOKUP_ERROR).error_count (1);
t.run (
"struct struct10 {\n"
@@ -1213,6 +1215,39 @@ BE_post_init (char *[], long)
).assert_annotation_decl ("::@annotationannotation");
} catch (Failed const &) {}
+ /* -------------------------------------------------------------------------
+ * Struct Field Visibility Must be vis_NA
+ * -------------------------------------------------------------------------
+ * Test for: https://github.com/DOCGroup/ACE_TAO/issues/784
+ *
+ * In the bison file, visibility for valuetype state members (which are the
+ * same class as normal fields) was being passed through the bison stack.
+ * When adding support for annotations, the grammar was changed and it was
+ * broken, causing bogus data to be passed to regular struct field as their
+ * visibility.
+ *
+ * This is a test to assert that struct fields have vis_NA. This can't be put
+ * anywhere else at the moment because this is the only test that's an
+ * instance of the idl compiler.
+ */
+ try {
+ Annotation_Test t ("Struct Field Visibility Must be vis_NA");
+ AST_Decl *member_decl = t.assert_node ("struct1::member");
+ AST_Field *member = AST_Field::narrow_from_decl (member_decl);
+ if (!member)
+ {
+ t.failed ("Could Not Get member");
+ }
+ if (member->visibility() != AST_Field::vis_NA)
+ {
+ char buffer[100];
+ ACE_OS::snprintf (&buffer[0], 100,
+ "struct field visibility is %u, which is not equal to vis_NA",
+ static_cast<unsigned> (member->visibility ()));
+ t.failed (&buffer[0]);
+ }
+ } catch (Failed const &) {}
+
// Done, Print Overall Results
if (failed_test_count)
{
View Lorry Controller Status