diff options
author | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-12-07 14:21:40 -0600 |
---|---|---|
committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-12-07 14:21:40 -0600 |
commit | 949dd8e0748d0594046a31116dce5bee155b9fe9 (patch) | |
tree | 878820544cc335e678c2651ec12ff4ccc725b0fe | |
parent | 0fe080e49f7734773c6bc8787bd04691a03a620f (diff) | |
download | ATCD-949dd8e0748d0594046a31116dce5bee155b9fe9.tar.gz |
tao_idl: Annotate Array Base Type
-rw-r--r-- | TAO/TAO_IDL/ast/ast_array.cpp | 15 | ||||
-rw-r--r-- | TAO/TAO_IDL/fe/idl.tab.cpp | 2537 | ||||
-rw-r--r-- | TAO/TAO_IDL/fe/idl.ypp | 33 | ||||
-rw-r--r-- | TAO/TAO_IDL/include/ast_array.h | 15 | ||||
-rw-r--r-- | TAO/tests/IDLv4/annotations/be_init.cpp | 47 |
5 files changed, 1355 insertions, 1292 deletions
diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp index 6f4ed33f32a..a70329e4758 100644 --- a/TAO/TAO_IDL/ast/ast_array.cpp +++ b/TAO/TAO_IDL/ast/ast_array.cpp @@ -97,7 +97,8 @@ AST_Array::AST_Array (UTL_ScopedName *n, n), pd_n_dims (nd), pd_base_type (0), - owns_base_type_ (false) + owns_base_type_ (false), + base_type_annotations_ (0) { this->pd_dims = this->compute_dims (ds, nd); @@ -271,3 +272,15 @@ AST_Array::set_dims (AST_Expression **ds, } IMPL_NARROW_FROM_DECL(AST_Array) + +AST_Annotation_Appls * +AST_Array::base_type_annotations() +{ + return base_type_annotations_; +} + +void +AST_Array::base_type_annotations(AST_Annotation_Appls *annotations) +{ + base_type_annotations_ = annotations; +} diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index f2423eb17c3..3ce423a7f23 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -584,7 +584,7 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1654 +#define YYLAST 1566 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 109 @@ -593,7 +593,7 @@ union yyalloc /* YYNRULES -- Number of rules. */ #define YYNRULES 597 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 878 +#define YYNSTATES 879 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ @@ -684,30 +684,30 @@ static const yytype_uint16 yyrline[] = 3515, 3566, 3591, 3615, 3619, 3650, 3654, 3614, 3678, 3683, 3681, 3687, 3691, 3727, 3731, 3725, 3818, 3888, 3897, 3887, 3911, 3921, 3925, 3919, 3970, 3996, 4005, 4009, 4003, 4045, - 4071, 4079, 4078, 4118, 4128, 4146, 4154, 4158, 4153, 4218, - 4219, 4224, 4228, 4232, 4236, 4223, 4303, 4307, 4311, 4315, - 4302, 4391, 4395, 4424, 4428, 4390, 4444, 4448, 4512, 4516, - 4442, 4551, 4556, 4561, 4568, 4569, 4580, 4585, 4626, 4579, - 4646, 4645, 4654, 4653, 4664, 4669, 4667, 4673, 4678, 4682, - 4677, 4721, 4720, 4729, 4728, 4739, 4744, 4742, 4748, 4753, - 4757, 4752, 4802, 4809, 4810, 4811, 4918, 4922, 4926, 4934, - 4938, 4933, 4947, 4955, 4959, 4954, 4968, 4976, 4980, 4975, - 4989, 4997, 5001, 4996, 5010, 5017, 5029, 5027, 5050, 5057, - 5085, 5122, 5123, 5127, 5156, 5195, 5199, 5155, 5216, 5220, - 5214, 5261, 5260, 5268, 5275, 5276, 5281, 5280, 5289, 5288, - 5297, 5296, 5305, 5304, 5313, 5312, 5321, 5320, 5329, 5328, - 5338, 5428, 5434, 5459, 5565, 5574, 5578, 5584, 5656, 5728, - 5802, 5801, 5849, 5853, 5857, 5861, 5865, 5869, 5848, 5922, - 5921, 5929, 5936, 5941, 5949, 5953, 5948, 5963, 5964, 5968, - 5970, 5969, 5978, 5977, 5990, 6013, 5988, 6039, 6066, 6037, - 6090, 6091, 6092, 6096, 6097, 6101, 6128, 6158, 6202, 6206, - 6156, 6221, 6230, 6248, 6259, 6258, 6296, 6345, 6349, 6294, - 6364, 6368, 6375, 6379, 6383, 6387, 6391, 6395, 6399, 6403, - 6407, 6411, 6419, 6450, 6463, 6470, 6495, 6513, 6520, 6535, - 6542, 6552, 6556, 6574, 6578, 6551, 6591, 6597, 6600, 6607, - 6606, 6613, 6612, 6619, 6618, 6628, 6697, 6747, 6762, 6774, - 6781, 6840, 6845, 6849, 6844, 6908, 6912, 6907, 6925, 6926, - 6931, 6930, 6939, 6938, 6947, 6946, 6955, 6954 + 4071, 4079, 4078, 4123, 4133, 4151, 4159, 4163, 4158, 4223, + 4224, 4229, 4233, 4237, 4241, 4228, 4308, 4312, 4316, 4320, + 4307, 4396, 4400, 4429, 4433, 4395, 4449, 4453, 4517, 4521, + 4447, 4556, 4561, 4566, 4573, 4574, 4585, 4590, 4631, 4584, + 4651, 4650, 4659, 4658, 4669, 4674, 4672, 4678, 4683, 4687, + 4682, 4726, 4725, 4734, 4733, 4744, 4749, 4747, 4753, 4758, + 4762, 4757, 4807, 4814, 4815, 4816, 4923, 4927, 4931, 4939, + 4943, 4938, 4952, 4960, 4964, 4959, 4973, 4981, 4985, 4980, + 4994, 5002, 5006, 5001, 5015, 5022, 5034, 5032, 5055, 5062, + 5090, 5127, 5128, 5132, 5161, 5200, 5204, 5160, 5221, 5225, + 5219, 5266, 5265, 5273, 5280, 5281, 5286, 5285, 5294, 5293, + 5302, 5301, 5310, 5309, 5318, 5317, 5326, 5325, 5334, 5333, + 5343, 5433, 5439, 5464, 5570, 5579, 5583, 5589, 5661, 5733, + 5807, 5806, 5854, 5858, 5862, 5866, 5870, 5874, 5853, 5927, + 5926, 5934, 5941, 5946, 5954, 5958, 5953, 5968, 5969, 5973, + 5975, 5974, 5983, 5982, 5995, 6018, 5993, 6044, 6071, 6042, + 6095, 6096, 6097, 6101, 6102, 6106, 6133, 6163, 6207, 6211, + 6161, 6226, 6235, 6253, 6264, 6263, 6301, 6350, 6354, 6299, + 6369, 6373, 6380, 6384, 6388, 6392, 6396, 6400, 6404, 6408, + 6412, 6416, 6424, 6455, 6468, 6475, 6500, 6518, 6525, 6540, + 6547, 6557, 6561, 6579, 6583, 6556, 6596, 6602, 6605, 6612, + 6611, 6618, 6617, 6624, 6623, 6633, 6702, 6752, 6767, 6779, + 6786, 6845, 6850, 6854, 6849, 6913, 6917, 6912, 6930, 6931, + 6936, 6935, 6944, 6943, 6952, 6951, 6960, 6959 }; #endif @@ -845,10 +845,10 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -632 +#define YYPACT_NINF -631 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-632))) + (!!((Yystate) == (-631))) #define YYTABLE_NINF -539 @@ -859,94 +859,94 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -632, 113, 1298, -632, -632, -632, -632, -632, -632, -632, - -632, -632, -632, -632, 146, 157, 70, -2, -632, 146, - 146, -632, 40, 40, -632, -632, 146, -632, -632, 74, - -632, 626, 32, 73, -632, -632, 29, -632, -632, -632, - -632, -632, -632, 567, -632, -632, -632, -632, -632, 1429, - 86, -632, -632, 95, -632, 165, -632, -632, -632, -632, - -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, - -632, -632, -632, -632, 118, -632, -632, -632, 118, -632, - -632, 124, 133, 354, 40, 146, 1538, 146, 146, 146, - 146, -632, -632, -632, 103, 146, 107, -632, 115, 146, - -632, 118, 146, 164, 181, 146, -632, -632, 37, -632, - 117, -632, -632, 184, -632, 191, 194, 719, -632, -632, - -632, 200, 241, -632, 201, 203, 204, 83, -632, 193, - -632, -632, -632, -632, -632, -632, 205, -632, -632, -632, - -632, -632, -632, 214, -632, -632, -632, -632, -632, -632, - -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, - -632, 165, -632, -632, -632, 5, -632, -632, 206, -632, - 207, 212, 213, -632, 40, 215, 216, 217, -632, 223, - 225, 231, 232, 219, 235, 236, 244, -632, -632, -632, - 245, 246, -632, -632, -632, -632, 214, -632, -632, -632, - -632, -632, -632, -632, -632, -632, 214, -632, -632, -632, - -632, -632, -632, -632, -632, 247, -632, 248, -632, -632, - 243, -632, 300, -632, -632, -632, 49, 50, -632, -632, - -632, 354, -632, -632, -632, -632, 218, -632, -632, -632, - -632, 302, -632, -632, 54, 222, -632, -632, -632, -632, - -632, -632, -632, -632, 316, -632, 154, 251, 292, -632, - -632, -632, -632, -632, -632, 214, -632, -632, 238, -632, - -632, -632, -632, -632, -632, -632, -632, -632, 292, 255, - 258, -632, -632, -632, 146, 146, 260, 261, -632, -632, - -632, 259, -632, 300, -632, -632, -632, -632, -632, -632, - 348, -632, 262, 265, -632, -632, -632, -632, -632, -632, - -632, -632, -632, -632, 187, 187, 187, 154, 214, -632, - -632, 257, 263, 275, -9, 105, 116, -632, -632, -632, - -632, -632, 40, -632, -632, -632, -632, 267, -632, 40, - -632, 154, 154, 154, 250, -632, -632, -632, -632, -632, - -632, -632, 210, -632, 249, -632, -632, -632, -632, -632, - -632, -632, -632, 40, 292, -632, -632, -632, 285, 243, - 608, 1351, 293, 283, -632, 719, -632, -632, -632, 276, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 290, 146, -632, 214, 1080, 828, 154, -632, -632, -632, - -632, -632, 154, -632, -632, -632, -632, -632, 155, 996, - -632, -632, -632, -632, 65, 327, 40, 40, -632, -632, - -632, -632, -632, 65, -632, 296, -632, 294, 289, 303, - -632, -632, 1115, 214, -632, 40, 292, -632, -632, -632, - -632, 310, -632, -632, 146, -632, -632, 314, 317, 401, - 319, -632, -632, 263, 275, -9, 105, 105, 116, 116, - -632, -632, -632, -632, -632, 312, -632, -632, -632, 320, - -632, -632, -632, -632, -632, -632, 1573, -632, -632, -632, - -632, -632, 321, -632, -632, -632, 324, 326, 886, 328, - 329, 344, 343, -632, 335, -632, 315, 352, 353, 696, - 93, 40, 40, 40, -632, 359, -632, -632, -632, -632, - -632, -632, -632, 146, 146, -632, 360, -632, -632, -632, - 1199, 912, 413, 414, -632, 214, 300, -632, -632, 69, - 90, 363, 365, 367, 300, 368, -632, -632, -632, -632, - -632, -632, 57, -632, -632, 370, 372, 214, -632, 80, - 1538, -632, 428, -632, -632, -632, -632, 54, -632, 375, - -632, 376, 377, 380, 382, 384, -632, 214, -632, -632, - -632, -632, -632, 385, 386, -632, 1519, 1519, -632, -632, - -632, -632, -632, -632, -632, 154, -632, 300, -632, -632, - -632, -632, -632, -632, 467, 214, -632, -632, -632, -632, - -632, -632, 97, 97, 97, 388, -632, 394, 395, 396, - 397, 398, 399, -632, -632, -632, 400, 403, 402, 404, - -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, - 154, 154, 289, 146, -632, 406, 408, 407, -632, 423, - -632, -632, -632, -632, -632, 405, 154, 410, 1376, -632, - 40, -632, -632, -632, -632, -632, -632, -632, -632, -632, - 60, -632, -632, -632, 343, 315, 417, 146, 409, -632, - -632, -632, -632, -632, -632, -632, -632, -632, -632, 411, - 411, -632, -632, -632, -632, 414, 146, -632, -632, -632, - -632, -632, -632, -632, -632, 418, 419, 420, 421, 80, - -632, -632, -632, 40, -632, -632, -632, -632, 425, 214, - 64, -632, -632, -632, -632, -632, 479, -632, -632, -632, - -632, -632, 415, -632, 40, -632, -632, -632, -632, -632, - 214, 427, 1244, -632, -632, 411, 431, 432, 424, 489, - 487, 487, 146, 471, 433, -632, -632, 214, 438, -632, - -632, 429, -632, -632, -632, -632, -632, 426, -632, -632, - -632, -632, -632, -632, -632, -632, 474, 534, 434, -632, - 487, 114, 414, -632, 447, 437, 487, 445, 481, 146, - 40, -632, -632, 459, -632, 446, 220, 487, -632, -632, - -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, - -632, -632, -632, -632, 214, -632, 462, -632, -632, -632, - -632, 451, -632, -632, -632, 465, 154, 466, 468, 58, - -632, 197, 146, 489, 40, 40, 455, 146, 534, -632, - 469, 414, 522, -632, -632, -632, -632, -632, 1493, -632, - -632, -632, 456, 458, -632, -632, -632, -632, -632, -632, - -632, 472, -632, -632, -632, -632, 40, 220, 146, 461, - -632, 146, 480, 463, -632, -632, -632, -632, -632, -632, - 492, -632, 488, 477, -632, -632, 498, -632 + -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 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -996,7 +996,7 @@ static const yytype_uint16 yydefact[] = 577, 0, 76, 133, 0, 0, 0, 210, 98, 344, 352, 357, 0, 212, 286, 290, 210, 210, 456, 0, 113, 104, 371, 376, 0, 486, 0, 0, 594, 369, - 370, 590, 592, 0, 596, 0, 588, 0, 0, 252, + 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, @@ -1007,86 +1007,86 @@ static const yytype_uint16 yydefact[] = 0, 0, 0, 0, 476, 0, 464, 466, 468, 470, 472, 474, 478, 0, 0, 509, 0, 507, 510, 512, 0, 0, 0, 0, 482, 481, 0, 485, 484, 0, - 0, 0, 0, 0, 0, 0, 587, 147, 366, 362, - 365, 253, 0, 336, 341, 291, 0, 500, 495, 0, - 0, 199, 207, 200, 45, 556, 50, 0, 131, 0, - 69, 0, 0, 0, 0, 0, 395, 425, 422, 423, - 424, 386, 394, 0, 0, 210, 0, 0, 87, 107, - 350, 349, 345, 353, 358, 0, 213, 0, 217, 287, - 289, 296, 293, 292, 266, 312, 307, 308, 309, 310, - 302, 311, 0, 0, 0, 0, 457, 0, 0, 0, - 0, 0, 0, 514, 517, 506, 0, 0, 0, 0, - 372, 377, 480, 575, 576, 595, 591, 593, 483, 597, - 0, 0, 363, 0, 342, 0, 338, 0, 91, 0, - 573, 569, 571, 564, 568, 0, 0, 0, 0, 578, - 0, 129, 121, 115, 125, 123, 127, 210, 117, 119, - 0, 111, 109, 220, 0, 219, 0, 0, 0, 489, - 487, 488, 477, 467, 469, 471, 473, 475, 479, 0, - 0, 511, 513, 530, 539, 0, 0, 148, 367, 364, - 254, 337, 339, 385, 496, 0, 0, 0, 0, 566, - 202, 206, 205, 0, 56, 42, 51, 55, 0, 132, - 0, 397, 218, 297, 294, 303, 400, 515, 518, 373, - 378, 261, 0, 210, 0, 574, 570, 572, 565, 567, + 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, 368, 340, 497, 0, 52, + 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, 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 + 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 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -632, -632, 297, 298, 525, -565, -632, -632, -632, -632, - -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, - -632, -560, -632, -632, -632, -632, -632, -632, -632, -632, - -632, -632, -632, -632, -632, -632, -135, -632, -632, -632, - -632, -632, -632, -632, -632, -632, -632, -632, 221, -632, - -632, 88, -632, -632, -632, 581, -632, -632, -632, -632, - -632, -632, -632, 583, -632, 226, -632, -632, -239, -632, - -632, 189, -632, -632, -632, -632, -312, -365, -632, -632, - -632, -632, -632, -632, -632, -632, -325, -632, -632, -22, - -632, -632, -188, -10, -632, 6, -632, -632, -632, -632, - -189, -29, -227, -632, 224, 227, 228, -134, -109, -142, - -31, -632, -305, -632, -632, -632, -632, -632, -632, -632, - -632, -632, -85, 552, -632, -632, -632, -632, -62, 18, - 16, -632, 56, -632, -40, 119, -441, -632, -632, -632, - -27, -632, -632, -610, -129, -632, -632, -8, -632, -63, - -632, -632, -43, -42, -55, -54, -52, 266, -632, -38, - -632, -32, -632, -632, -632, -632, 196, 284, -632, -290, - -632, -632, -632, -30, -632, -28, -632, -632, -632, -632, - -632, -632, -632, -632, -632, -184, -632, -632, -632, -632, - -632, -182, -632, -632, -632, -632, -632, -632, -632, -41, - -632, -632, -632, -632, -632, -632, -632, -86, -632, -632, - -632, -632, -632, -632, -632, -76, -632, -632, -632, -71, - -632, -632, -632, -632, -632, -632, -632, 9, -632, -632, - -327, -632, -632, -632, -632, -632, -632, -632, -632, -632, - -632, 17, -632, -632, -632, -632, -632, -632, -632, -632, - -632, -632, -632, -632, -632, -632, -632, -631, -632, -632, - -632, -632, -632, -181, -632, -632, -632, -632, -632, -632, - -632, -632, -214, -632, -632, -491, -632, -577, -632, -632, - -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, - -632, -632, 20, 22, -632, -632, -632, -632, -632, -632, - -632, -632, -632, 282, -632, -632, -632, -632, -632, -632, - -632, -632, -632, -632, -282, 229, -238, -632, -632, -632, - -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, - -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, - -632, -632, -632, -632, -632, -632, -632, -632, -632, -632, - -632, -632, -632, -632, -632, -632, -632, -632, 566, -632, - -632, -632, -632, -632, -632, -632, -632, -632, 270, -632, - -632, -172, -632, -632, -632, -632, -632, -632, -632, -37, - -632, -632, -632, 253, -632, -632, 100, -632, -632, -632, - -632, -632, -632, -632, -632, -632, -632, -632, -632, -632 + -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 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -1095,42 +1095,42 @@ 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, 648, 731, 706, 732, 707, 708, 748, 827, + 302, 450, 647, 731, 705, 732, 706, 707, 748, 828, 33, 118, 391, 34, 35, 124, 333, 469, 36, 85, 37, 142, 332, 38, 39, 40, 126, 334, 482, 41, - 217, 362, 546, 42, 258, 43, 102, 248, 340, 44, - 45, 395, 483, 484, 577, 576, 394, 470, 562, 573, - 574, 561, 564, 563, 565, 559, 392, 465, 650, 318, - 222, 293, 109, 354, 46, 471, 83, 284, 427, 630, + 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, 550, 444, 445, - 647, 49, 50, 295, 344, 403, 494, 495, 588, 496, - 472, 86, 208, 285, 592, 145, 146, 147, 148, 52, - 355, 429, 633, 356, 720, 744, 779, 357, 358, 149, + 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, 590, 406, 593, - 667, 736, 666, 55, 88, 56, 268, 407, 668, 737, - 771, 818, 600, 792, 819, 793, 820, 862, 815, 794, - 821, 795, 817, 816, 851, 853, 861, 57, 58, 59, - 89, 286, 430, 635, 543, 636, 723, 544, 164, 341, + 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, 539, 632, 540, 631, 722, - 473, 419, 522, 685, 742, 776, 420, 523, 686, 743, - 778, 474, 90, 287, 431, 637, 475, 657, 751, 787, - 832, 476, 571, 486, 575, 735, 770, 717, 738, 739, - 757, 774, 823, 758, 772, 822, 769, 785, 786, 811, - 830, 857, 812, 831, 858, 572, 813, 760, 775, 824, - 764, 777, 825, 802, 826, 856, 850, 859, 870, 872, - 873, 876, 477, 478, 63, 64, 65, 183, 347, 505, - 66, 220, 364, 290, 363, 408, 506, 607, 608, 609, - 610, 611, 605, 612, 641, 526, 642, 423, 528, 509, - 510, 511, 67, 185, 68, 105, 291, 436, 639, 724, - 766, 366, 435, 781, 276, 348, 516, 409, 517, 616, - 617, 518, 679, 740, 519, 680, 741, 69, 70, 71, - 72, 73, 279, 410, 618, 74, 75, 76, 188, 278, - 77, 280, 411, 619, 78, 241, 242, 303, 243, 783, - 806, 784, 79, 111, 368, 549, 698, 643, 699, 644, - 696, 697, 695, 424, 245, 390, 330, 80, 81, 112, + 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 }; @@ -1140,341 +1140,323 @@ static const yytype_int16 yydefgoto[] = static const yytype_int16 yytable[] = { 108, 110, 163, 144, 92, 159, 93, 204, 47, 103, - 104, 160, 205, 161, 398, 162, 113, 320, 51, 60, - 198, 143, 61, 690, 62, 418, 226, 227, 201, 202, - 485, 203, 621, 244, 292, 568, 399, 400, 401, 349, - 199, 200, 299, 106, 515, 163, 209, 18, 159, 718, - 432, 99, 294, 296, 160, 47, 161, 106, 162, 789, - 634, 196, 206, 711, 143, 51, 60, 734, 106, 61, - 421, 62, 623, 383, 384, 207, 8, 210, 211, 212, - 213, 504, 568, 704, 524, 215, 790, 791, 705, 218, - 379, 252, 219, 624, 253, 221, 106, 259, 520, 260, - 106, 594, 128, 129, 752, 367, 132, 133, 134, 135, - 412, 413, 223, 4, 422, 789, 12, -141, 224, 18, - 119, 107, 122, 95, 123, 434, 507, 304, 305, 306, - 307, 308, 309, 310, 311, 107, 174, 174, 312, 313, - 414, 174, 790, 791, 174, 415, 107, 174, -313, 91, - 224, 174, 265, 314, 315, 204, 485, 106, 316, 317, - 205, 120, 187, 8, 761, 114, 187, 704, 198, 487, - 508, 224, 705, 174, 107, 493, 201, 202, 224, 203, - 174, 442, 214, -331, 216, 412, 413, 178, 199, 200, - 106, -142, 225, 788, 719, -143, 122, 548, 224, 799, - 122, 254, 255, -100, 385, 386, 501, 502, 122, 196, - 814, 122, 840, 192, 492, 414, 503, 387, 388, 389, - 415, 194, 640, 416, 417, 790, 791, 304, 305, 306, - 307, 308, 309, 310, 311, 107, 94, 96, 312, 313, - 412, 413, 98, 101, 568, 460, 461, 462, 865, 456, - 457, 867, -453, 314, 315, 808, 809, 810, 316, 317, - 304, 305, 306, 307, 308, 309, 310, 311, 107, -525, - 414, 312, 313, 228, 353, 415, 458, 459, 416, 417, - 229, 796, 230, 376, 377, 378, 661, 662, 246, 247, - 249, 250, 317, 251, 204, 224, 256, 261, 262, 205, - 263, 264, -209, 106, 266, 301, 267, 198, 273, 300, - 393, 269, 488, 270, 331, 201, 202, 393, 203, 271, - 272, 499, 500, 274, 335, 275, 688, 199, 200, 447, - 320, 568, 277, 281, 282, -526, 289, 288, 622, 339, - 848, 433, 338, 346, 350, 542, 628, 351, 196, 360, - 361, 373, 365, 380, 374, 402, -361, 106, 663, 375, - 381, 396, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 195, 640, 382, 437, 449, 441, 47, 557, 140, - 141, 464, 452, -44, 463, 527, 536, 51, 60, 537, - 568, 61, 525, 62, 529, 530, 538, 541, 551, 664, - 569, 525, 553, 320, 555, 570, 558, 554, 556, 587, - 560, 578, 579, 547, 669, 670, 671, 106, 580, 701, - 582, 583, 127, 128, 129, 130, 131, 132, 133, 134, - 135, 195, 137, 138, 552, 107, 584, 596, 585, 140, - 141, 586, 589, -288, 620, 597, 598, 569, 599, 606, - 615, 625, 570, 626, 567, 627, 629, 646, 163, 601, - -384, 159, 638, 651, 652, 653, 143, 160, 654, 161, - 655, 162, 656, 658, 659, 252, 672, 143, 595, 602, - 603, 604, 673, 674, 675, 676, 677, 678, 681, 694, - 660, 682, 683, 700, 684, 107, 691, 693, 702, 842, - 843, 567, 692, 613, 614, 713, 725, 726, 727, 163, - 209, 728, 159, 733, -402, 715, 716, 749, 160, 753, - 161, 754, 162, 745, 756, 759, 763, 765, 143, 767, - 755, 863, 773, 780, 768, 163, 163, 782, 159, 159, - -411, 797, 798, 801, 160, 160, 161, 161, 162, 162, - 800, 805, 807, 833, 143, 143, 828, 829, 836, 835, - 844, 849, 854, 847, 855, 860, 866, 871, 868, 869, - 106, 875, 710, 877, 173, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 10, 11, 834, - 12, 139, 140, 141, 874, 371, 372, 750, 100, 97, - 521, 687, 175, 712, 453, 665, 645, 581, 454, 569, - 455, 106, 6, 762, 570, 439, 127, 128, 129, 130, - 131, 132, 133, 134, 135, 195, 137, 545, 709, 405, - -47, 12, -47, 140, 141, 837, 446, 746, 542, 839, - 714, 689, 841, 864, 189, 451, -47, -47, 107, -47, - -47, 438, 534, -47, 47, -101, 846, 649, 0, 0, - 122, 512, 729, 567, 51, 60, 0, 0, 61, 0, - 62, 0, 0, 0, 0, -47, 92, 0, 721, -47, - 0, 730, 0, 0, 0, 0, 0, 0, 0, 107, - 0, 0, 0, -47, 0, 0, 569, 591, 440, 106, - 0, 570, 747, 0, 127, 128, 129, 130, 131, 132, - 133, 134, 135, 136, 137, 138, 10, 11, 0, 12, - 139, 140, 141, 231, 0, 232, 0, 0, 0, 0, - 0, 0, 92, 0, 721, 838, 0, 0, 47, 233, - 234, 0, 235, 236, 0, 0, 237, 0, 51, 60, - 567, 0, 61, 0, 62, 569, 0, 0, 804, 0, - 570, 0, 0, 0, 0, 0, 0, 0, 238, 92, - 0, 803, 239, 0, 0, 0, 0, 107, 0, 0, - 0, 0, 0, 174, 0, 0, 240, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 163, 852, 0, - 159, 0, 393, 393, 0, 0, 160, 0, 161, 567, - 162, 0, 0, 0, 0, 0, 143, 845, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 466, - 0, -393, 6, 0, 393, 9, -393, -393, -393, -393, - -393, -393, -393, -393, -393, -393, -393, -393, 10, 11, - 0, 12, 0, -393, -393, 13, 0, 0, 412, 413, - 467, 468, -393, 0, 0, 0, 0, 0, 14, 0, - 0, 0, 479, 480, 481, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 106, - 0, 22, 23, 0, 127, 128, 129, 130, 131, 132, - 133, 134, 135, 136, 137, 138, 0, 0, 0, -393, - 139, 140, 141, 466, 0, -393, 6, 0, -86, 9, - -393, -393, -393, -393, -393, -393, -393, -393, -393, -393, - -393, -393, 10, 11, 0, 12, 0, -393, -393, 13, - 0, 0, 412, 413, 467, 468, -393, 0, 0, 0, - 0, 0, 14, 0, 0, 0, 479, 480, 481, 0, - 0, 0, 0, 0, 0, 0, 0, 107, 0, 0, - 0, 0, 0, 174, 0, 22, 23, 0, 0, 0, + 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, + 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, + 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, 0, 0, 0, - 0, 0, 0, -393, 0, 0, 0, 466, 0, -393, - 6, 0, -538, 9, -393, -393, -393, -393, -393, -393, + 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, 0, 0, 412, 413, 467, 468, + 0, -393, -393, 13, 22, 23, 412, 413, 467, 468, -393, 0, 0, 0, 0, 0, 14, 0, 0, 0, - 513, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 514, 0, 0, 0, 0, 0, 0, 0, 0, 22, - 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -393, 0, 0, - 0, 466, 0, -393, 6, 0, -505, 9, -393, -393, + 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, 466, 0, -393, 6, - 14, 0, 9, -393, -393, -393, -393, -393, -393, -393, - -393, -393, -393, -393, -393, 10, 11, 0, 12, 0, - -393, -393, 13, 22, 23, 412, 413, 467, 468, -393, - 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, - 0, -393, 0, 0, 0, 0, 0, 0, 0, 0, - -68, 0, 0, 0, 0, 0, 0, 0, 22, 23, + 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -393, 0, 0, 0, - 466, 0, -393, 6, 0, -90, 9, -393, -393, -393, - -393, -393, -393, -393, -393, -393, -393, -393, -393, 10, - 11, 0, 12, 0, -393, -393, 13, 0, 0, 412, - 413, 467, 468, -393, 0, 0, 0, 0, 0, 14, - 0, 0, 0, 0, 0, 5, 0, 0, 6, 7, - 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 22, 23, 10, 11, 0, 12, 0, 0, - 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, - -393, 0, 0, 0, 14, 15, 16, 17, 0, -529, - 0, 0, 0, 18, 19, 0, 0, 20, -2, 5, - 21, 0, 6, 7, 8, 9, 0, 22, 23, 0, - 0, 0, 0, 0, 24, 25, 703, 0, 10, 11, - 0, 12, 0, 0, 0, 13, 0, 0, 0, 0, - 26, 0, 0, 0, -53, 0, 0, 0, 14, 15, - 16, 17, 0, 0, 0, 0, 0, 18, 19, 0, - 0, 20, 5, 0, 21, 6, 7, 8, 9, 0, - 0, 22, 23, 0, 0, 0, 0, 0, 24, 25, 0, 10, 11, 0, 12, 0, 0, 5, 13, 0, - 6, 7, 8, 9, 26, -210, 0, 0, 0, 0, + 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, 0, 21, 0, 0, - 0, 0, 0, 0, 22, 23, 14, 15, 16, 17, - 0, 24, 25, 0, 0, 18, 19, 0, 0, 20, - 5, 0, 21, 6, 7, 8, 9, 26, -210, 22, - 23, 0, 0, 0, 0, 0, 24, 25, 703, 10, - 11, 0, 12, 0, 0, 0, 13, 0, 0, 0, - 0, 0, 26, 0, 0, 0, 0, 0, 0, 14, - 15, 16, 17, 0, 0, 0, 0, 0, 18, 19, - 0, 0, 20, 0, 0, 21, 0, 0, 0, 0, - 0, 0, 22, 23, 0, 0, 106, 0, 0, 24, - 25, 127, 128, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 138, 10, 11, 26, 12, 139, 140, 141, - 591, 0, 106, 0, 0, 0, 0, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 10, - 11, 106, 12, 139, 140, 141, 127, 128, 129, 130, - 131, 132, 133, 134, 135, 136, 137, 138, 10, 11, - 0, 12, 139, 140, 141, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 107, 0, 106, 0, 0, 0, - 174, 127, 128, 129, 130, 131, 132, 133, 134, 135, - 195, 137, 138, 0, 0, 0, 0, 0, 140, 141, - 107, 0, 0, 0, 0, 0, 0, 566, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 107, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 107 + 0, 0, 0, 0, 0, 0, 107 }; static const yytype_int16 yycheck[] = { 22, 23, 43, 43, 14, 43, 14, 83, 2, 19, - 20, 43, 83, 43, 339, 43, 26, 244, 2, 2, - 83, 43, 2, 633, 2, 352, 111, 112, 83, 83, - 395, 83, 523, 118, 222, 476, 341, 342, 343, 278, - 83, 83, 231, 3, 409, 86, 86, 49, 86, 680, - 362, 53, 3, 3, 86, 49, 86, 3, 86, 1, - 3, 83, 84, 3, 86, 49, 49, 3, 3, 49, - 352, 49, 3, 82, 83, 85, 6, 87, 88, 89, - 90, 408, 523, 648, 19, 95, 28, 29, 648, 99, - 317, 8, 102, 3, 11, 105, 3, 92, 410, 94, - 3, 8, 9, 10, 735, 293, 13, 14, 15, 16, - 30, 31, 75, 0, 352, 1, 23, 88, 81, 49, - 88, 81, 93, 53, 36, 364, 408, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 87, 87, 84, 85, - 60, 87, 28, 29, 87, 65, 81, 87, 90, 3, - 81, 87, 174, 99, 100, 231, 521, 3, 104, 105, - 231, 88, 74, 6, 741, 91, 78, 732, 231, 396, - 408, 81, 732, 87, 81, 402, 231, 231, 81, 231, - 87, 370, 94, 88, 96, 30, 31, 22, 231, 231, - 3, 88, 75, 770, 685, 88, 93, 436, 81, 776, - 93, 8, 9, 88, 99, 100, 51, 52, 93, 231, - 787, 93, 822, 89, 402, 60, 61, 101, 102, 103, - 65, 88, 549, 68, 69, 28, 29, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 15, 16, 84, 85, - 30, 31, 16, 17, 685, 387, 388, 389, 858, 383, - 384, 861, 88, 99, 100, 35, 36, 37, 104, 105, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 88, - 60, 84, 85, 89, 284, 65, 385, 386, 68, 69, - 89, 772, 88, 314, 315, 316, 576, 577, 88, 48, - 89, 88, 105, 89, 370, 81, 91, 91, 91, 370, - 88, 88, 87, 3, 88, 3, 89, 370, 89, 91, - 332, 88, 397, 88, 92, 370, 370, 339, 370, 88, - 88, 406, 407, 88, 8, 89, 631, 370, 370, 370, - 557, 772, 88, 88, 88, 88, 93, 89, 526, 47, - 831, 363, 91, 105, 89, 430, 534, 89, 370, 89, - 89, 3, 93, 96, 92, 105, 107, 3, 585, 94, - 97, 94, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 699, 98, 89, 92, 370, 371, 463, 25, - 26, 391, 106, 90, 94, 58, 90, 371, 371, 95, - 831, 371, 414, 371, 416, 417, 107, 94, 88, 587, - 476, 423, 88, 630, 3, 476, 94, 90, 89, 94, - 90, 90, 88, 435, 602, 603, 604, 3, 92, 646, - 92, 92, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 444, 81, 92, 500, 95, 25, - 26, 106, 90, 90, 31, 500, 500, 523, 500, 90, - 90, 88, 523, 88, 476, 88, 88, 29, 499, 500, - 90, 499, 90, 88, 88, 88, 488, 499, 88, 499, - 88, 499, 88, 88, 88, 8, 88, 499, 500, 501, - 502, 503, 88, 88, 88, 88, 88, 88, 88, 66, - 575, 88, 90, 88, 90, 81, 90, 90, 88, 824, - 825, 523, 94, 513, 514, 88, 88, 88, 88, 550, - 550, 90, 550, 88, 35, 106, 105, 90, 550, 88, - 550, 89, 550, 108, 35, 38, 55, 94, 550, 91, - 106, 856, 106, 59, 105, 576, 577, 3, 576, 577, - 106, 94, 105, 62, 576, 577, 576, 577, 576, 577, - 105, 92, 106, 88, 576, 577, 94, 106, 90, 93, - 105, 39, 106, 94, 106, 93, 105, 75, 88, 106, - 3, 94, 657, 75, 49, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 816, - 23, 24, 25, 26, 106, 298, 298, 732, 17, 16, - 411, 630, 50, 665, 380, 587, 550, 488, 381, 685, - 382, 3, 4, 742, 685, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 431, 650, 345, - 4, 23, 6, 25, 26, 819, 370, 723, 723, 821, - 667, 632, 823, 857, 78, 375, 20, 21, 81, 23, - 24, 369, 423, 27, 648, 88, 828, 557, -1, -1, - 93, 408, 699, 685, 648, 648, -1, -1, 648, -1, - 648, -1, -1, -1, -1, 49, 686, -1, 686, 53, - -1, 703, -1, -1, -1, -1, -1, -1, -1, 81, - -1, -1, -1, 67, -1, -1, 772, 1, 90, 3, - -1, 772, 724, -1, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, - 24, 25, 26, 4, -1, 6, -1, -1, -1, -1, - -1, -1, 742, -1, 742, 820, -1, -1, 732, 20, - 21, -1, 23, 24, -1, -1, 27, -1, 732, 732, - 772, -1, 732, -1, 732, 831, -1, -1, 780, -1, - 831, -1, -1, -1, -1, -1, -1, -1, 49, 779, - -1, 779, 53, -1, -1, -1, -1, 81, -1, -1, - -1, -1, -1, 87, -1, -1, 67, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 838, 838, -1, - 838, -1, 824, 825, -1, -1, 838, -1, 838, 831, - 838, -1, -1, -1, -1, -1, 838, 827, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, - -1, 3, 4, -1, 856, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - -1, 23, -1, 25, 26, 27, -1, -1, 30, 31, - 32, 33, 34, -1, -1, -1, -1, -1, 40, -1, - -1, -1, 44, 45, 46, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 3, - -1, 63, 64, -1, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, -1, -1, -1, 81, - 24, 25, 26, 1, -1, 3, 4, -1, 90, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, -1, 23, -1, 25, 26, 27, - -1, -1, 30, 31, 32, 33, 34, -1, -1, -1, - -1, -1, 40, -1, -1, -1, 44, 45, 46, -1, - -1, -1, -1, -1, -1, -1, -1, 81, -1, -1, - -1, -1, -1, 87, -1, 63, 64, -1, -1, -1, + 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, + 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, -1, 81, -1, -1, -1, 1, -1, 3, - 4, -1, 90, 7, 8, 9, 10, 11, 12, 13, + 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, + 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, 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, - -1, 25, 26, 27, -1, -1, 30, 31, 32, 33, + -1, 25, 26, 27, 63, 64, 30, 31, 32, 33, 34, -1, -1, -1, -1, -1, 40, -1, -1, -1, - 44, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 54, -1, -1, -1, -1, -1, -1, -1, -1, 63, - 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 81, -1, -1, + -1, -1, 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, 1, -1, 3, 4, -1, 90, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, -1, 25, 26, 27, -1, -1, - 30, 31, 32, 33, 34, -1, 1, -1, 3, 4, - 40, -1, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, -1, 23, -1, - 25, 26, 27, 63, 64, 30, 31, 32, 33, 34, - -1, -1, -1, -1, -1, 40, -1, -1, -1, -1, - -1, 81, -1, -1, -1, -1, -1, -1, -1, -1, - 90, -1, -1, -1, -1, -1, -1, -1, 63, 64, + 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, -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, -1, -1, 40, - -1, -1, -1, -1, -1, 1, -1, -1, 4, 5, - 6, 7, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 63, 64, 20, 21, -1, 23, -1, -1, - -1, 27, -1, -1, -1, -1, -1, -1, -1, -1, - 81, -1, -1, -1, 40, 41, 42, 43, -1, 90, - -1, -1, -1, 49, 50, -1, -1, 53, 0, 1, - 56, -1, 4, 5, 6, 7, -1, 63, 64, -1, - -1, -1, -1, -1, 70, 71, 72, -1, 20, 21, - -1, 23, -1, -1, -1, 27, -1, -1, -1, -1, - 86, -1, -1, -1, 90, -1, -1, -1, 40, 41, - 42, 43, -1, -1, -1, -1, -1, 49, 50, -1, - -1, 53, 1, -1, 56, 4, 5, 6, 7, -1, - -1, 63, 64, -1, -1, -1, -1, -1, 70, 71, -1, 20, 21, -1, 23, -1, -1, 1, 27, -1, - 4, 5, 6, 7, 86, 87, -1, -1, -1, -1, + 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, -1, 56, -1, -1, - -1, -1, -1, -1, 63, 64, 40, 41, 42, 43, - -1, 70, 71, -1, -1, 49, 50, -1, -1, 53, - 1, -1, 56, 4, 5, 6, 7, 86, 87, 63, - 64, -1, -1, -1, -1, -1, 70, 71, 72, 20, - 21, -1, 23, -1, -1, -1, 27, -1, -1, -1, - -1, -1, 86, -1, -1, -1, -1, -1, -1, 40, - 41, 42, 43, -1, -1, -1, -1, -1, 49, 50, - -1, -1, 53, -1, -1, 56, -1, -1, -1, -1, - -1, -1, 63, 64, -1, -1, 3, -1, -1, 70, - 71, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 86, 23, 24, 25, 26, - 1, -1, 3, -1, -1, -1, -1, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 3, 23, 24, 25, 26, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - -1, 23, 24, 25, 26, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 81, -1, 3, -1, -1, -1, - 87, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, -1, -1, -1, -1, -1, 25, 26, - 81, -1, -1, -1, -1, -1, -1, 34, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 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, -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, 81 + -1, -1, -1, -1, -1, -1, 81 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1534,41 +1516,41 @@ static const yytype_uint16 yystos[] = 231, 51, 52, 61, 339, 408, 415, 423, 425, 428, 429, 430, 492, 44, 54, 186, 445, 447, 450, 453, 185, 180, 341, 346, 19, 198, 424, 58, 427, 198, - 198, 507, 505, 506, 424, 508, 90, 95, 107, 334, - 336, 94, 231, 313, 316, 275, 171, 198, 177, 484, - 226, 88, 202, 88, 90, 3, 89, 231, 94, 194, - 90, 190, 187, 192, 191, 193, 34, 198, 245, 324, - 328, 361, 384, 188, 189, 363, 184, 183, 90, 88, - 92, 244, 92, 92, 92, 95, 106, 94, 237, 90, - 276, 1, 243, 278, 8, 198, 258, 263, 264, 265, - 291, 308, 198, 198, 198, 421, 90, 416, 417, 418, - 419, 420, 422, 202, 202, 90, 448, 449, 463, 472, - 31, 384, 201, 3, 3, 88, 88, 88, 201, 88, - 208, 337, 335, 251, 3, 312, 314, 354, 90, 437, - 339, 423, 425, 486, 488, 241, 29, 229, 141, 495, - 197, 88, 88, 88, 88, 88, 88, 356, 88, 88, - 231, 278, 278, 211, 201, 238, 281, 279, 287, 201, - 201, 201, 88, 88, 88, 88, 88, 88, 88, 451, - 454, 88, 88, 90, 90, 342, 347, 210, 221, 336, - 252, 90, 94, 90, 66, 491, 489, 490, 485, 487, - 88, 211, 88, 72, 114, 130, 143, 145, 146, 198, - 231, 3, 237, 88, 249, 106, 105, 366, 366, 384, - 253, 256, 338, 315, 438, 88, 88, 88, 90, 488, + 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, 108, 316, 198, 147, 90, + 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, 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 + 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 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ @@ -1675,7 +1657,7 @@ static const yytype_uint8 yyr2[] = 3, 1, 1, 0, 0, 0, 0, 9, 2, 0, 4, 0, 2, 0, 0, 6, 2, 0, 0, 6, 6, 0, 0, 6, 1, 1, 0, 0, 6, 1, - 1, 0, 3, 2, 2, 0, 0, 0, 5, 1, + 1, 0, 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, @@ -2389,14 +2371,14 @@ yyreduce: "Annotating this type of definition is not supported"); } } -#line 2393 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2375 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 6: #line 412 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 2400 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2382 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 7: @@ -2404,7 +2386,7 @@ yyreduce: { (yyval.dcval) = (yyvsp[0].dcval); } -#line 2408 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2390 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 8: @@ -2412,7 +2394,7 @@ yyreduce: { (yyval.dcval) = 0; } -#line 2416 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2398 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 9: @@ -2420,7 +2402,7 @@ yyreduce: { (yyval.dcval) = 0; } -#line 2424 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2406 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 10: @@ -2428,7 +2410,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_AnnotationDeclSeen); } -#line 2432 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2414 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 11: @@ -2437,7 +2419,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2441 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2423 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 12: @@ -2445,7 +2427,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 2449 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2431 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 13: @@ -2454,7 +2436,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 2458 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2440 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 14: @@ -2462,7 +2444,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 2466 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2448 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 15: @@ -2471,7 +2453,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2475 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2457 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 16: @@ -2479,7 +2461,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 2483 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2465 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 17: @@ -2488,7 +2470,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2492 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2474 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 18: @@ -2496,7 +2478,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 2500 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2482 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 19: @@ -2505,7 +2487,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 2509 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2491 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 20: @@ -2513,7 +2495,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 2517 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2499 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 21: @@ -2522,7 +2504,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2526 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2508 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 22: @@ -2530,7 +2512,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen); } -#line 2534 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2516 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 23: @@ -2539,7 +2521,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2543 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2525 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 24: @@ -2547,7 +2529,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen); } -#line 2551 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2533 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 25: @@ -2556,7 +2538,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 2560 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2542 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 26: @@ -2564,7 +2546,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeDeclSeen); } -#line 2568 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2550 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 27: @@ -2573,7 +2555,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2577 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2559 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 28: @@ -2581,7 +2563,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentDeclSeen); } -#line 2585 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2567 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 29: @@ -2590,7 +2572,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2594 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2576 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 30: @@ -2598,7 +2580,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_HomeDeclSeen); } -#line 2602 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2584 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 31: @@ -2607,7 +2589,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2611 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2593 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 32: @@ -2615,7 +2597,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_EventDeclSeen); } -#line 2619 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2601 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 33: @@ -2624,7 +2606,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2628 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2610 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 34: @@ -2632,7 +2614,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeDeclSeen); } -#line 2636 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2618 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 35: @@ -2641,7 +2623,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2645 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2627 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 36: @@ -2649,7 +2631,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorDeclSeen); } -#line 2653 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2635 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 37: @@ -2658,7 +2640,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2662 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2644 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 38: @@ -2666,7 +2648,7 @@ yyreduce: { idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 2670 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2652 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 39: @@ -2676,7 +2658,7 @@ yyreduce: yyerrok; (yyval.dcval) = 0; } -#line 2680 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2662 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 40: @@ -2684,7 +2666,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSeen); } -#line 2688 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2670 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 41: @@ -2692,7 +2674,7 @@ yyreduce: { (yyval.idlist) = (yyvsp[0].idlist); } -#line 2696 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2678 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 42: @@ -2735,7 +2717,7 @@ yyreduce: (yyval.dcval) = m; } -#line 2739 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2721 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 43: @@ -2743,7 +2725,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSqSeen); } -#line 2747 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2729 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 44: @@ -2751,7 +2733,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen); } -#line 2755 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2737 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 45: @@ -2765,7 +2747,7 @@ yyreduce: idl_global->scopes ().pop (); (yyval.dcval) = (yyvsp[-5].dcval); } -#line 2769 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2751 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 46: @@ -2773,7 +2755,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleIDSeen); } -#line 2777 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2759 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 47: @@ -2791,7 +2773,7 @@ yyreduce: IDL_GlobalData::PS_ModuleIDSeen); } } -#line 2795 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2777 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 48: @@ -2805,7 +2787,7 @@ yyreduce: return 1; } } -#line 2809 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2791 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 49: @@ -2839,7 +2821,7 @@ yyreduce: // of the template module. idl_global->current_params ((yyvsp[-2].plval)); } -#line 2843 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2825 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 50: @@ -2847,7 +2829,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleSqSeen); } -#line 2851 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2833 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 51: @@ -2855,7 +2837,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleBodySeen); } -#line 2859 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2841 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 52: @@ -2876,7 +2858,7 @@ yyreduce: // that we are no longer in a template module scope. idl_global->current_params (0); } -#line 2880 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2862 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 58: @@ -2885,7 +2867,7 @@ yyreduce: idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefSeen); } -#line 2889 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2871 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 59: @@ -2894,7 +2876,7 @@ yyreduce: idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefParamsSeen); } -#line 2898 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2880 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 60: @@ -2976,7 +2958,7 @@ yyreduce: idl_global->in_tmpl_mod_no_alias (itmna_flag); idl_global->in_tmpl_mod_alias (false); } -#line 2980 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2962 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 61: @@ -2985,7 +2967,7 @@ yyreduce: idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleSeen); } -#line 2989 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2971 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 62: @@ -2994,7 +2976,7 @@ yyreduce: idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleArgsSeen); } -#line 2998 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2980 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 63: @@ -3060,7 +3042,7 @@ yyreduce: idl_global->set_err_count (idl_global->err_count () + 1); } } -#line 3064 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3046 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 66: @@ -3102,7 +3084,7 @@ yyreduce: */ idl_global->scopes ().push (i); } -#line 3106 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3088 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 67: @@ -3110,7 +3092,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSqSeen); } -#line 3114 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3096 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 68: @@ -3118,7 +3100,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen); } -#line 3122 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3104 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 69: @@ -3131,7 +3113,7 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3135 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3117 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 70: @@ -3139,7 +3121,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSeen); } -#line 3143 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3125 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 71: @@ -3148,7 +3130,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3152 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3134 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 72: @@ -3188,7 +3170,7 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3192 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3174 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 73: @@ -3221,7 +3203,7 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3225 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3207 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 74: @@ -3254,7 +3236,7 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3258 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3240 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 75: @@ -3262,7 +3244,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 3266 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3248 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 76: @@ -3271,7 +3253,7 @@ yyreduce: (yyvsp[0].nlval)->truncatable ((yyvsp[-2].bval)); (yyval.nlval) = (yyvsp[0].nlval); } -#line 3275 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3257 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 77: @@ -3279,7 +3261,7 @@ yyreduce: { (yyval.nlval) = 0; } -#line 3283 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3265 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 82: @@ -3287,7 +3269,7 @@ yyreduce: { idl_global->err ()->unsupported_error ("custom is not supported"); } -#line 3291 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3273 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 84: @@ -3334,7 +3316,7 @@ yyreduce: */ idl_global->scopes ().push (v); } -#line 3338 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3320 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 85: @@ -3342,7 +3324,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3346 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3328 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 86: @@ -3350,7 +3332,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3354 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3336 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 87: @@ -3373,7 +3355,7 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3377 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3359 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 88: @@ -3420,7 +3402,7 @@ yyreduce: */ idl_global->scopes ().push (v); } -#line 3424 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3406 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 89: @@ -3428,7 +3410,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3432 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3414 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 90: @@ -3436,7 +3418,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3440 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3422 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 91: @@ -3449,7 +3431,7 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3453 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3435 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 92: @@ -3457,7 +3439,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 3461 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3443 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 93: @@ -3492,7 +3474,7 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 3496 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3478 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 94: @@ -3500,7 +3482,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSeen); } -#line 3504 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3486 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 95: @@ -3509,7 +3491,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3513 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3495 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 96: @@ -3517,7 +3499,7 @@ yyreduce: { (yyval.bval) = true; } -#line 3521 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3503 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 97: @@ -3525,7 +3507,7 @@ yyreduce: { (yyval.bval) = false; } -#line 3529 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3511 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 98: @@ -3533,7 +3515,7 @@ yyreduce: { (yyval.nlval) = (yyvsp[0].nlval); } -#line 3537 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3519 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 99: @@ -3542,7 +3524,7 @@ yyreduce: /* | EMPTY */ (yyval.nlval) = 0; } -#line 3546 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3528 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 100: @@ -3569,7 +3551,7 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3573 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3555 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 101: @@ -3596,7 +3578,7 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3600 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3582 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 102: @@ -3661,7 +3643,7 @@ yyreduce: delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 3665 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3647 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 108: @@ -3670,14 +3652,14 @@ yyreduce: /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_PUBLIC; } -#line 3674 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3656 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 109: #line 1461 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 3681 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3663 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 110: @@ -3686,14 +3668,14 @@ yyreduce: /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_PRIVATE; } -#line 3690 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3672 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 111: #line 1469 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 3697 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3679 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 114: @@ -3701,7 +3683,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 3705 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3687 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 115: @@ -3709,7 +3691,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3713 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3695 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 116: @@ -3717,7 +3699,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 3721 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3703 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 117: @@ -3725,7 +3707,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3729 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3711 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 118: @@ -3733,7 +3715,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 3737 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3719 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 119: @@ -3741,7 +3723,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3745 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3727 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 120: @@ -3749,7 +3731,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 3753 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3735 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 121: @@ -3757,7 +3739,7 @@ yyreduce: { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } -#line 3761 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3743 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 122: @@ -3765,7 +3747,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 3769 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3751 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 123: @@ -3773,7 +3755,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3777 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3759 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 124: @@ -3781,7 +3763,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 3785 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3767 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 125: @@ -3789,7 +3771,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3793 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3775 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 126: @@ -3797,7 +3779,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen); } -#line 3801 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3783 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 127: @@ -3805,7 +3787,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3809 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3791 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 128: @@ -3813,7 +3795,7 @@ yyreduce: { idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 3817 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3799 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 129: @@ -3822,7 +3804,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 3826 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3808 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 130: @@ -3833,7 +3815,7 @@ yyreduce: (yyvsp[0].nlval)), 1); } -#line 3837 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3819 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 131: @@ -3841,7 +3823,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_SNListCommaSeen); } -#line 3845 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3827 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 132: @@ -3865,7 +3847,7 @@ yyreduce: (yyval.nlval) = (yyvsp[-3].nlval); } } -#line 3869 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3851 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 133: @@ -3873,7 +3855,7 @@ yyreduce: { (yyval.nlval) = 0; } -#line 3877 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3859 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 134: @@ -3886,7 +3868,7 @@ yyreduce: 0), 1); } -#line 3890 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3872 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 135: @@ -3894,7 +3876,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); } -#line 3898 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3880 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 136: @@ -3918,7 +3900,7 @@ yyreduce: sn), 1); } -#line 3922 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3904 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 137: @@ -3932,7 +3914,7 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3936 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3918 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 138: @@ -3948,7 +3930,7 @@ yyreduce: (yyvsp[-3].idlist)->nconc (sn); (yyval.idlist) = (yyvsp[-3].idlist); } -#line 3952 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3934 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 139: @@ -3960,7 +3942,7 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3964 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3946 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 140: @@ -3972,7 +3954,7 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3976 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3958 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 141: @@ -4019,7 +4001,7 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4023 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4005 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 142: @@ -4049,7 +4031,7 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4053 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4035 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 143: @@ -4079,7 +4061,7 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4083 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4065 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 144: @@ -4087,7 +4069,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ConstSeen); } -#line 4091 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4073 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 145: @@ -4095,7 +4077,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ConstTypeSeen); } -#line 4099 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4081 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 146: @@ -4103,7 +4085,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ConstIDSeen); } -#line 4107 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4089 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 147: @@ -4111,7 +4093,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ConstAssignSeen); } -#line 4115 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4097 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 148: @@ -4171,7 +4153,7 @@ yyreduce: delete (yyvsp[-4].idval); (yyvsp[-4].idval) = 0; } -#line 4175 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4157 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 155: @@ -4179,7 +4161,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_string; } -#line 4183 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4165 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 156: @@ -4187,7 +4169,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_wstring; } -#line 4191 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4173 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 157: @@ -4257,7 +4239,7 @@ yyreduce: sn = 0; (yyvsp[0].idlist) = 0; } -#line 4261 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4243 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 161: @@ -4270,7 +4252,7 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4274 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4256 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 163: @@ -4283,7 +4265,7 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4287 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4269 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 165: @@ -4296,7 +4278,7 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4300 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4282 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 167: @@ -4309,7 +4291,7 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4313 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4295 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 168: @@ -4322,7 +4304,7 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4326 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4308 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 170: @@ -4335,7 +4317,7 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4339 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4321 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 171: @@ -4348,7 +4330,7 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4352 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4334 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 173: @@ -4361,7 +4343,7 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4365 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4347 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 174: @@ -4374,7 +4356,7 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4378 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4360 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 175: @@ -4387,7 +4369,7 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4391 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4373 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 177: @@ -4400,7 +4382,7 @@ yyreduce: 0 ); } -#line 4404 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4386 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 178: @@ -4413,7 +4395,7 @@ yyreduce: 0 ); } -#line 4417 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4399 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 179: @@ -4426,7 +4408,7 @@ yyreduce: 0 ); } -#line 4430 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4412 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 180: @@ -4483,7 +4465,7 @@ yyreduce: delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 4487 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4469 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 182: @@ -4491,7 +4473,7 @@ yyreduce: { (yyval.exval) = (yyvsp[-1].exval); } -#line 4495 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4477 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 183: @@ -4499,7 +4481,7 @@ yyreduce: { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].ival)); } -#line 4503 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4485 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 184: @@ -4508,7 +4490,7 @@ yyreduce: (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].uival)); } -#line 4512 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4494 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 185: @@ -4519,7 +4501,7 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 4523 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4505 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 186: @@ -4527,7 +4509,7 @@ yyreduce: { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].wsval)); } -#line 4531 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4513 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 187: @@ -4535,7 +4517,7 @@ yyreduce: { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].cval)); } -#line 4539 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4521 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 188: @@ -4544,7 +4526,7 @@ yyreduce: ACE_OutputCDR::from_wchar wc ((yyvsp[0].wcval)); (yyval.exval) = idl_global->gen ()->create_expr (wc); } -#line 4548 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4530 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 189: @@ -4552,7 +4534,7 @@ yyreduce: { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].fixval)); } -#line 4556 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4538 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 190: @@ -4560,7 +4542,7 @@ yyreduce: { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].dval)); } -#line 4564 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4546 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 191: @@ -4568,7 +4550,7 @@ yyreduce: { (yyval.exval) = idl_global->gen ()->create_expr (true); } -#line 4572 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4554 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 192: @@ -4576,7 +4558,7 @@ yyreduce: { (yyval.exval) = idl_global->gen ()->create_expr (false); } -#line 4580 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4562 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 193: @@ -4645,7 +4627,7 @@ yyreduce: idl_global->err ()->syntax_error (idl_global->parse_state ()); } } -#line 4649 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4631 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 194: @@ -4666,7 +4648,7 @@ yyreduce: fe_add_annotation_decl (annotation_decl); idl_global->scopes ().push (annotation_decl); } -#line 4670 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4652 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 195: @@ -4677,7 +4659,7 @@ yyreduce: id->destroy (); delete id; } -#line 4681 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4663 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 201: @@ -4686,7 +4668,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 4690 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4672 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 205: @@ -4738,7 +4720,7 @@ yyreduce: delete result; } } -#line 4742 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4724 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 206: @@ -4746,7 +4728,7 @@ yyreduce: { (yyval.exval) = (yyvsp[0].exval); } -#line 4750 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4732 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 207: @@ -4754,7 +4736,7 @@ yyreduce: { (yyval.exval) = 0; } -#line 4758 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4740 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 208: @@ -4768,7 +4750,7 @@ yyreduce: } (yyval.annotations_val) = annotations; } -#line 4772 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4754 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 209: @@ -4782,7 +4764,7 @@ yyreduce: } (yyval.annotations_val) = annotations; } -#line 4786 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4768 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 210: @@ -4790,7 +4772,7 @@ yyreduce: { (yyval.annotations_val) = new AST_Annotation_Appls (); } -#line 4794 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4776 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 211: @@ -4847,7 +4829,7 @@ yyreduce: (yyval.annotation_decl_val) = decl; } -#line 4851 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4833 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 212: @@ -4868,7 +4850,7 @@ yyreduce: (yyval.annotation_val) = appl; } -#line 4872 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4854 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 213: @@ -4876,7 +4858,7 @@ yyreduce: { (yyval.annotation_params_val) = (yyvsp[-1].annotation_params_val); } -#line 4880 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4862 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 214: @@ -4884,7 +4866,7 @@ yyreduce: { (yyval.annotation_params_val) = 0; } -#line 4888 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4870 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 215: @@ -4897,7 +4879,7 @@ yyreduce: params->push (param); (yyval.annotation_params_val) = params; } -#line 4901 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4883 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 216: @@ -4905,7 +4887,7 @@ yyreduce: { (yyval.annotation_params_val) = (yyvsp[0].annotation_params_val); } -#line 4909 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4891 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 217: @@ -4915,7 +4897,7 @@ yyreduce: params->push ((yyvsp[-1].annotation_param_val)); (yyval.annotation_params_val) = params; } -#line 4919 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4901 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 218: @@ -4925,7 +4907,7 @@ yyreduce: params->push ((yyvsp[-1].annotation_param_val)); (yyval.annotation_params_val) = params; } -#line 4929 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4911 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 219: @@ -4933,7 +4915,7 @@ yyreduce: { (yyval.annotation_params_val) = new AST_Annotation_Appl::Params; } -#line 4937 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4919 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 220: @@ -4944,7 +4926,7 @@ yyreduce: param->expr = (yyvsp[0].exval); (yyval.annotation_param_val) = param; } -#line 4948 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4930 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 221: @@ -4953,7 +4935,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 4957 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4939 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 222: @@ -4961,7 +4943,7 @@ yyreduce: { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4965 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4947 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 223: @@ -4969,7 +4951,7 @@ yyreduce: { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4973 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4955 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 224: @@ -4977,7 +4959,7 @@ yyreduce: { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4981 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4963 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 225: @@ -4985,7 +4967,7 @@ yyreduce: { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4989 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4971 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 226: @@ -5015,7 +4997,7 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 5019 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5001 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 227: @@ -5023,7 +5005,7 @@ yyreduce: { (yyval.dcval) = 0; } -#line 5027 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5009 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 228: @@ -5031,7 +5013,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_TypeSpecSeen); } -#line 5035 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5017 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 229: @@ -5100,7 +5082,7 @@ yyreduce: (yyval.dcval) = t; } -#line 5104 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5086 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 232: @@ -5111,7 +5093,7 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5115 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5097 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 234: @@ -5138,7 +5120,7 @@ yyreduce: (yyval.dcval) = d; } -#line 5142 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5124 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 252: @@ -5149,7 +5131,7 @@ yyreduce: (yyvsp[0].dlval)), 1); } -#line 5153 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5135 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 253: @@ -5157,7 +5139,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5161 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5143 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 254: @@ -5181,7 +5163,7 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5185 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5167 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 255: @@ -5189,7 +5171,7 @@ yyreduce: { (yyval.dlval) = 0; } -#line 5193 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5175 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 258: @@ -5200,7 +5182,7 @@ yyreduce: (yyvsp[0].dlval)), 1); } -#line 5204 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5186 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 259: @@ -5208,7 +5190,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5212 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5194 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 260: @@ -5232,7 +5214,7 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5236 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5218 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 261: @@ -5240,7 +5222,7 @@ yyreduce: { (yyval.dlval) = 0; } -#line 5244 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5226 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 262: @@ -5257,7 +5239,7 @@ yyreduce: 0), 1); } -#line 5261 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5243 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 263: @@ -5276,7 +5258,7 @@ yyreduce: (yyvsp[0].dcval)), 1); } -#line 5280 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5262 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 266: @@ -5284,7 +5266,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_long; } -#line 5288 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5270 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 267: @@ -5292,7 +5274,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_longlong; } -#line 5296 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5278 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 268: @@ -5300,7 +5282,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_short; } -#line 5304 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5286 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 269: @@ -5308,7 +5290,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_ulong; } -#line 5312 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5294 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 270: @@ -5316,7 +5298,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_ulonglong; } -#line 5320 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5302 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 271: @@ -5324,7 +5306,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_ushort; } -#line 5328 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5310 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 272: @@ -5332,7 +5314,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_double; } -#line 5336 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5318 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 273: @@ -5340,7 +5322,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_float; } -#line 5344 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5326 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 274: @@ -5348,7 +5330,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_longdouble; } -#line 5352 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5334 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 275: @@ -5356,7 +5338,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_fixed; } -#line 5360 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5342 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 276: @@ -5364,7 +5346,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_char; } -#line 5368 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5350 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 277: @@ -5372,7 +5354,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_wchar; } -#line 5376 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5358 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 278: @@ -5380,7 +5362,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_octet; } -#line 5384 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5366 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 279: @@ -5388,7 +5370,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_bool; } -#line 5392 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5374 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 280: @@ -5396,7 +5378,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_any; } -#line 5400 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5382 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 281: @@ -5404,7 +5386,7 @@ yyreduce: { (yyval.etval) = AST_Expression::EV_object; } -#line 5408 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5390 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 282: @@ -5412,7 +5394,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen); } -#line 5416 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5398 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 283: @@ -5421,7 +5403,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5425 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5407 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 284: @@ -5456,7 +5438,7 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5460 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5442 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 285: @@ -5464,7 +5446,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen); } -#line 5468 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5450 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 286: @@ -5472,7 +5454,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); } -#line 5476 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5458 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 287: @@ -5488,7 +5470,7 @@ yyreduce: ); idl_global->scopes ().pop (); } -#line 5492 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5474 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 291: @@ -5497,7 +5479,7 @@ yyreduce: /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_NA; } -#line 5501 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5483 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 292: @@ -5512,7 +5494,7 @@ yyreduce: } } } -#line 5516 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5498 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 293: @@ -5520,7 +5502,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_MemberTypeSeen); } -#line 5524 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5506 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 294: @@ -5528,7 +5510,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsSeen); } -#line 5532 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5514 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 295: @@ -5592,7 +5574,7 @@ yyreduce: (yyval.decls_val) = members; } -#line 5596 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5578 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 296: @@ -5600,7 +5582,7 @@ yyreduce: { idl_global->err()->syntax_error (idl_global->parse_state ()); } -#line 5604 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5586 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 297: @@ -5609,7 +5591,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 5613 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5595 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 298: @@ -5617,7 +5599,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen); } -#line 5621 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5603 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 299: @@ -5626,7 +5608,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5630 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5612 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 300: @@ -5634,7 +5616,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchSeen); } -#line 5638 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5620 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 301: @@ -5671,7 +5653,7 @@ yyreduce: * Don't delete $1 yet; we'll need it a bit later. */ } -#line 5675 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5657 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 302: @@ -5679,7 +5661,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchTypeSeen); } -#line 5683 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5665 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 303: @@ -5739,7 +5721,7 @@ yyreduce: delete (yyvsp[-8].idval); (yyvsp[-8].idval) = 0; } -#line 5743 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5725 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 304: @@ -5747,7 +5729,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSqSeen); } -#line 5751 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5733 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 305: @@ -5755,7 +5737,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_UnionBodySeen); } -#line 5759 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5741 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 306: @@ -5775,7 +5757,7 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 5779 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5761 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 307: @@ -5786,7 +5768,7 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5790 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5772 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 308: @@ -5803,7 +5785,7 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5807 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5789 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 309: @@ -5816,7 +5798,7 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5820 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5802 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 310: @@ -5827,7 +5809,7 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5831 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5813 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 312: @@ -5938,7 +5920,7 @@ yyreduce: delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 5942 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5924 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 316: @@ -5946,7 +5928,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen); } -#line 5950 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5932 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 317: @@ -5954,7 +5936,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen); } -#line 5958 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5940 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 318: @@ -5987,7 +5969,7 @@ yyreduce: f = 0; } } -#line 5991 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5973 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 319: @@ -5995,7 +5977,7 @@ yyreduce: { idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 5999 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5981 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 320: @@ -6004,7 +5986,7 @@ yyreduce: idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 6008 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5990 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 321: @@ -6015,7 +5997,7 @@ yyreduce: (yyvsp[0].llval)), 1); } -#line 6019 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6001 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 322: @@ -6037,7 +6019,7 @@ yyreduce: (yyval.llval) = (yyvsp[-1].llval); } } -#line 6041 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6023 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 323: @@ -6045,7 +6027,7 @@ yyreduce: { (yyval.llval) = 0; } -#line 6049 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6031 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 324: @@ -6053,7 +6035,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_DefaultSeen); } -#line 6057 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6039 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 325: @@ -6066,7 +6048,7 @@ yyreduce: 0 ); } -#line 6070 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6052 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 326: @@ -6074,7 +6056,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_CaseSeen); } -#line 6078 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6060 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 327: @@ -6082,7 +6064,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen); } -#line 6086 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6068 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 328: @@ -6095,7 +6077,7 @@ yyreduce: (yyvsp[-2].exval) ); } -#line 6099 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6081 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 329: @@ -6103,7 +6085,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemTypeSeen); } -#line 6107 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6089 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 330: @@ -6151,7 +6133,7 @@ yyreduce: (yyvsp[0].deval) = 0; } } -#line 6155 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6137 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 331: @@ -6177,7 +6159,7 @@ yyreduce: (yyval.dcval) = d; } -#line 6181 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6163 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 332: @@ -6201,7 +6183,7 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6205 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6187 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 333: @@ -6209,7 +6191,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen); } -#line 6213 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6195 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 334: @@ -6244,7 +6226,7 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6248 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6230 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 335: @@ -6252,7 +6234,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSqSeen); } -#line 6256 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6238 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 336: @@ -6260,7 +6242,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_EnumBodySeen); } -#line 6264 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6246 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 337: @@ -6283,7 +6265,7 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 6287 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6269 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 339: @@ -6291,7 +6273,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_EnumCommaSeen); } -#line 6295 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6277 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 342: @@ -6326,7 +6308,7 @@ yyreduce: (void) s->fe_add_enum_val (e); } } -#line 6330 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6312 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 343: @@ -6334,7 +6316,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceCommaSeen); } -#line 6338 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6320 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 344: @@ -6342,7 +6324,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceExprSeen); } -#line 6346 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6328 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 345: @@ -6430,7 +6412,7 @@ yyreduce: ev = 0; (yyval.dcval) = seq; } -#line 6434 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6416 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 346: @@ -6499,7 +6481,7 @@ yyreduce: (yyval.dcval) = seq; } -#line 6503 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6485 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 347: @@ -6512,7 +6494,7 @@ yyreduce: */ idl_global->scopes ().push (0); } -#line 6516 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6498 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 348: @@ -6520,7 +6502,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSqSeen); } -#line 6524 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6506 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 349: @@ -6532,7 +6514,7 @@ yyreduce: seq_head->annotations = (yyvsp[-1].annotations_val); (yyval.decl_annotations_pair_val) = seq_head; } -#line 6536 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6518 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 350: @@ -6541,7 +6523,7 @@ yyreduce: (yyvsp[-1].exval)->evaluate (AST_Expression::EK_positive_int); (yyval.dcval) = idl_global->gen ()->create_fixed ((yyvsp[-3].exval), (yyvsp[-1].exval)); } -#line 6545 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6527 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 351: @@ -6549,7 +6531,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6553 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6535 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 352: @@ -6557,7 +6539,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6561 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6543 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 353: @@ -6603,7 +6585,7 @@ yyreduce: delete ev; ev = 0; } -#line 6607 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6589 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 354: @@ -6630,7 +6612,7 @@ yyreduce: (yyval.dcval) = tao_string_decl; } -#line 6634 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6616 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 355: @@ -6638,7 +6620,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6642 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6624 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 356: @@ -6646,7 +6628,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6650 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6632 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 357: @@ -6654,7 +6636,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6658 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6640 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 358: @@ -6691,7 +6673,7 @@ yyreduce: (yyval.dcval) = string; } } -#line 6695 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6677 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 359: @@ -6718,7 +6700,7 @@ yyreduce: (yyval.dcval) = string; } -#line 6722 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6704 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 360: @@ -6726,7 +6708,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6730 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6712 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 361: @@ -6734,7 +6716,7 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen); } -#line 6738 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6720 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 362: @@ -6742,26 +6724,26 @@ yyreduce: { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted); + AST_Array *array = 0; + AST_Annotation_Appls *base_type_annotations = (yyvsp[-1].annotations_val); + UTL_ExprList *array_dims = (yyvsp[0].elval); + /* * Create a node representing an array. */ - if ((yyvsp[0].elval) != 0) + if (array_dims) { - UTL_ScopedName sn ((yyvsp[-2].idval), + UTL_ScopedName sn ((yyvsp[-3].idval), 0); - (yyval.dcval) = + array = idl_global->gen ()->create_array ( &sn, - (yyvsp[0].elval)->length (), - (yyvsp[0].elval), + array_dims->length (), + array_dims, 0, 0 ); - - (yyvsp[0].elval)->destroy (); - delete (yyvsp[0].elval); - (yyvsp[0].elval) = 0; - + array->base_type_annotations (base_type_annotations); sn.destroy (); if (!idl_global->in_typedef () @@ -6770,23 +6752,28 @@ yyreduce: idl_global->err ()->anonymous_type_diagnostic (); } } + + array_dims->destroy (); + delete array_dims; + + (yyval.dcval) = array; } -#line 6775 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6762 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 363: -#line 4119 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4124 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.elval), UTL_ExprList ((yyvsp[-1].exval), (yyvsp[0].elval)), 1); } -#line 6786 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6773 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 364: -#line 4129 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4134 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_ExprList *el = 0; ACE_NEW_RETURN (el, @@ -6804,35 +6791,35 @@ yyreduce: (yyval.elval) = (yyvsp[-1].elval); } } -#line 6808 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6795 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 365: -#line 4147 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4152 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.elval) = 0; } -#line 6816 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6803 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 366: -#line 4154 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4159 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen); } -#line 6824 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6811 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 367: -#line 4158 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4163 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen); } -#line 6832 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6819 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 368: -#line 4162 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4167 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen); @@ -6886,43 +6873,43 @@ yyreduce: delete ev; ev = 0; } -#line 6890 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6877 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 371: -#line 4224 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4229 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen); } -#line 6898 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6885 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 372: -#line 4228 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4233 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 6906 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6893 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 373: -#line 4232 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4237 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 6914 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6901 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 374: -#line 4236 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4241 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 6922 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6909 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 375: -#line 4240 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4245 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; @@ -6982,43 +6969,43 @@ yyreduce: delete (yyvsp[-2].dlval); (yyvsp[-2].dlval) = 0; } -#line 6986 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6973 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 376: -#line 4303 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4308 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 6994 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6981 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 377: -#line 4307 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4312 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 7002 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6989 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 378: -#line 4311 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4316 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 7010 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6997 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 379: -#line 4315 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4320 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted); } -#line 7018 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7005 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 380: -#line 4319 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4324 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; @@ -7087,19 +7074,19 @@ yyreduce: delete (yyvsp[-4].dlval); (yyvsp[-4].dlval) = 0; } -#line 7091 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7078 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 381: -#line 4391 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4396 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen); } -#line 7099 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7086 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 382: -#line 4395 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4400 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -7128,27 +7115,27 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 7132 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7119 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 383: -#line 4424 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4429 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen); } -#line 7140 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7127 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 384: -#line 4428 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4433 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen); } -#line 7148 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7135 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 385: -#line 4432 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4437 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen); /* @@ -7156,19 +7143,19 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 7160 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7147 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 386: -#line 4444 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4449 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7168 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7155 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 387: -#line 4448 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4453 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); Identifier id ((yyvsp[0].strval)); @@ -7232,27 +7219,27 @@ yyreduce: */ idl_global->scopes ().push (o); } -#line 7236 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7223 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 388: -#line 4512 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4517 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7244 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7231 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 389: -#line 4516 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4521 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); } -#line 7252 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7239 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 390: -#line 4520 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4525 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Operation *o = 0; @@ -7281,57 +7268,57 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 7285 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7272 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 391: -#line 4552 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4557 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_oneway; } -#line 7294 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7281 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 392: -#line 4557 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4562 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_idempotent; } -#line 7303 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7290 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 393: -#line 4562 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4567 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ofval) = AST_Operation::OP_noflags; } -#line 7311 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7298 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 395: -#line 4570 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4575 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( AST_Expression::EV_void ); } -#line 7322 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7309 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 396: -#line 4580 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4585 "fe/idl.ypp" /* yacc.c:1651 */ { //@@ PS_FactorySeen? idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7331 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7318 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 397: -#line 4585 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4590 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7372,19 +7359,19 @@ yyreduce: */ idl_global->scopes ().push (factory); } -#line 7376 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7363 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 398: -#line 4626 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4631 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7384 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7371 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 399: -#line 4630 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4635 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -7397,67 +7384,67 @@ yyreduce: idl_global->scopes ().pop (); } -#line 7401 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7388 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 400: -#line 4646 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4651 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7409 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7396 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 401: -#line 4650 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4655 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7417 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7404 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 402: -#line 4654 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4659 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7425 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7412 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 403: -#line 4659 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4664 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7433 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7420 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 405: -#line 4669 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4674 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7441 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7428 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 408: -#line 4678 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4683 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7449 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7436 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 409: -#line 4682 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4687 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7457 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7444 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 410: -#line 4686 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4691 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; @@ -7489,67 +7476,67 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7493 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7480 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 411: -#line 4721 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4726 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7501 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7488 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 412: -#line 4725 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4730 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7509 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7496 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 413: -#line 4729 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4734 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7517 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7504 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 414: -#line 4734 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4739 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7525 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7512 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 416: -#line 4744 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4749 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7533 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7520 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 419: -#line 4753 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4758 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7541 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7528 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 420: -#line 4757 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4762 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7549 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7536 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 421: -#line 4761 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4766 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; @@ -7588,22 +7575,22 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7592 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7579 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 422: -#line 4803 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4808 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 7603 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7590 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 425: -#line 4812 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4817 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -7707,186 +7694,186 @@ yyreduce: (yyval.dcval) = d; } -#line 7711 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7698 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 426: -#line 4919 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4924 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dival) = AST_Argument::dir_IN; } -#line 7719 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7706 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 427: -#line 4923 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4928 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dival) = AST_Argument::dir_OUT; } -#line 7727 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7714 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 428: -#line 4927 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4932 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dival) = AST_Argument::dir_INOUT; } -#line 7735 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7722 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 429: -#line 4934 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4939 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen); } -#line 7743 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7730 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 430: -#line 4938 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4943 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen); } -#line 7751 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7738 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 431: -#line 4943 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4948 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7760 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7747 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 432: -#line 4948 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4953 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 7768 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7755 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 433: -#line 4955 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4960 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen); } -#line 7776 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7763 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 434: -#line 4959 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4964 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen); } -#line 7784 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7771 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 435: -#line 4964 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4969 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7793 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7780 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 436: -#line 4969 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4974 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 7801 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7788 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 437: -#line 4976 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4981 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen); } -#line 7809 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7796 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 438: -#line 4980 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4985 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen); } -#line 7817 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7804 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 439: -#line 4985 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4990 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7826 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7813 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 440: -#line 4990 "fe/idl.ypp" /* yacc.c:1651 */ +#line 4995 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 7834 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7821 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 441: -#line 4997 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5002 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen); } -#line 7842 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7829 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 442: -#line 5001 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5006 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen); } -#line 7850 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7837 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 443: -#line 5006 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5011 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen); (yyval.slval) = (yyvsp[-1].slval); } -#line 7859 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7846 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 444: -#line 5011 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5016 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.slval) = 0; } -#line 7867 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7854 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 445: -#line 5018 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5023 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 7878 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7865 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 446: -#line 5029 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5034 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen); } -#line 7886 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7873 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 447: -#line 5033 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5038 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, @@ -7904,19 +7891,19 @@ yyreduce: (yyval.slval) = (yyvsp[-3].slval); } } -#line 7908 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7895 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 448: -#line 5051 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5056 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.slval) = 0; } -#line 7916 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7903 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 449: -#line 5058 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5063 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = @@ -7941,11 +7928,11 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 7945 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7932 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 450: -#line 5086 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5091 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = ScopeAsDecl (s); @@ -7979,11 +7966,11 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 7983 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7970 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 453: -#line 5129 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5134 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -8007,11 +7994,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8011 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7998 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 454: -#line 5156 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5161 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Component *c = 0; @@ -8050,27 +8037,27 @@ yyreduce: */ idl_global->scopes ().push (c); } -#line 8054 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8041 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 455: -#line 5195 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5200 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen); } -#line 8062 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8049 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 456: -#line 5199 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5204 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen); } -#line 8070 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8057 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 457: -#line 5203 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5208 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen); @@ -8079,27 +8066,27 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 8083 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8070 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 458: -#line 5216 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5221 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen); } -#line 8091 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8078 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 459: -#line 5220 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5225 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8099 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8086 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 460: -#line 5224 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5229 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -8133,147 +8120,147 @@ yyreduce: (yyvsp[-2].idlist) = 0; } } -#line 8137 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8124 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 461: -#line 5261 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5266 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8145 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8132 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 462: -#line 5265 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5270 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8153 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8140 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 463: -#line 5269 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5274 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = 0; } -#line 8161 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8148 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 466: -#line 5281 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5286 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 8169 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8156 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 467: -#line 5285 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5290 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8177 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8164 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 468: -#line 5289 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5294 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 8185 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8172 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 469: -#line 5293 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5298 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8193 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8180 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 470: -#line 5297 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5302 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen); } -#line 8201 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8188 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 471: -#line 5301 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5306 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8209 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8196 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 472: -#line 5305 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5310 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen); } -#line 8217 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8204 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 473: -#line 5309 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5314 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8225 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8212 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 474: -#line 5313 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5318 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen); } -#line 8233 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8220 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 475: -#line 5317 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5322 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8241 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8228 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 476: -#line 5321 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5326 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 8249 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8236 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 477: -#line 5325 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5330 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8257 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8244 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 478: -#line 5329 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5334 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 8265 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8252 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 479: -#line 5333 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5338 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8273 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8260 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 480: -#line 5339 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5344 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8360,21 +8347,21 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8364 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8351 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 481: -#line 5429 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5434 "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 8374 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8361 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 482: -#line 5435 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5440 "fe/idl.ypp" /* yacc.c:1651 */ { Identifier *corba_id = 0; @@ -8397,11 +8384,11 @@ yyreduce: conc_name), 1); } -#line 8401 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8388 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 483: -#line 5460 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5465 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8504,37 +8491,37 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8508 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8495 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 484: -#line 5566 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5571 "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 8518 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8505 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 485: -#line 5575 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5580 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.bval) = true; } -#line 8526 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8513 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 486: -#line 5579 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5584 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.bval) = false; } -#line 8534 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8521 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 487: -#line 5585 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5590 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8604,11 +8591,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8608 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8595 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 488: -#line 5657 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5662 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8678,11 +8665,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8682 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8669 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 489: -#line 5729 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5734 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8752,11 +8739,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8756 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8743 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 490: -#line 5802 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5807 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Home *h = 0; @@ -8793,70 +8780,70 @@ yyreduce: */ idl_global->scopes ().push (h); } -#line 8797 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8784 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 491: -#line 5839 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5844 "fe/idl.ypp" /* yacc.c:1651 */ { /* * Done with this component - pop it off the scopes stack. */ idl_global->scopes ().pop (); } -#line 8808 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8795 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 492: -#line 5849 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5854 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen); } -#line 8816 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8803 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 493: -#line 5853 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5858 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen); } -#line 8824 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8811 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 494: -#line 5857 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5862 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8832 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8819 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 495: -#line 5861 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5866 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); } -#line 8840 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8827 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 496: -#line 5865 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5870 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen); } -#line 8848 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8835 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 497: -#line 5869 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5874 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen); } -#line 8856 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8843 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 498: -#line 5873 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5878 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen); @@ -8902,107 +8889,107 @@ yyreduce: (yyvsp[-6].nlval) = 0; } } -#line 8906 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8893 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 499: -#line 5922 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5927 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8914 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8901 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 500: -#line 5926 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5931 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8922 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8909 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 501: -#line 5930 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5935 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = 0; } -#line 8930 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8917 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 502: -#line 5938 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5943 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8938 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8925 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 503: -#line 5942 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5947 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = 0; } -#line 8946 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8933 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 504: -#line 5949 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5954 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen); } -#line 8954 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8941 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 505: -#line 5953 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5958 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen); } -#line 8962 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8949 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 506: -#line 5957 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5962 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen); } -#line 8970 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8957 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 510: -#line 5970 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5975 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen); } -#line 8978 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8965 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 511: -#line 5974 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5979 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8986 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8973 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 512: -#line 5978 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5983 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen); } -#line 8994 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8981 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 513: -#line 5982 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5987 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 9002 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8989 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 514: -#line 5990 "fe/idl.ypp" /* yacc.c:1651 */ +#line 5995 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9025,19 +9012,19 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 9029 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9016 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 515: -#line 6013 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6018 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 9037 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9024 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 516: -#line 6017 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6022 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -9055,11 +9042,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9059 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9046 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 517: -#line 6039 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6044 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9086,19 +9073,19 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 9090 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9077 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 518: -#line 6066 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6071 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 9098 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9085 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 519: -#line 6070 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6075 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -9116,11 +9103,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9120 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9107 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 525: -#line 6103 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6108 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9143,11 +9130,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 9147 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9134 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 526: -#line 6131 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6136 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9170,11 +9157,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 9174 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9161 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 527: -#line 6158 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6163 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_EventType *e = 0; @@ -9218,27 +9205,27 @@ yyreduce: delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 9222 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9209 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 528: -#line 6202 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6207 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9230 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9217 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 529: -#line 6206 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6211 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9238 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9225 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 530: -#line 6210 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6215 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9247,19 +9234,19 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9251 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9238 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 531: -#line 6224 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6229 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idval) = (yyvsp[0].idval); } -#line 9259 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9246 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 532: -#line 6233 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6238 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); @@ -9272,29 +9259,29 @@ yyreduce: ACE_TEXT (" custom yet\n"))); (yyval.idval) = 0; } -#line 9276 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9263 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 533: -#line 6250 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6255 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 9286 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9273 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 534: -#line 6259 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6264 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 9294 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9281 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 535: -#line 6263 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6268 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -9323,11 +9310,11 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 9327 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9314 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 536: -#line 6296 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6301 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_EventType *e = 0; @@ -9376,27 +9363,27 @@ yyreduce: */ idl_global->scopes ().push (e); } -#line 9380 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9367 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 537: -#line 6345 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6350 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9388 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9375 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 538: -#line 6349 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6354 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9396 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9383 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 539: -#line 6353 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6358 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9405,108 +9392,108 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9409 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9396 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 540: -#line 6365 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6370 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idval) = (yyvsp[0].idval); } -#line 9417 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9404 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 541: -#line 6369 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6374 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idval) = (yyvsp[0].idval); } -#line 9425 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9412 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 542: -#line 6376 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6381 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_type; } -#line 9433 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9420 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 543: -#line 6380 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6385 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_struct; } -#line 9441 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9428 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 544: -#line 6384 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6389 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_union; } -#line 9449 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9436 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 545: -#line 6388 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6393 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_eventtype; } -#line 9457 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9444 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 546: -#line 6392 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6397 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_sequence; } -#line 9465 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9452 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 547: -#line 6396 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6401 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_interface; } -#line 9473 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9460 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 548: -#line 6400 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6405 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_valuetype; } -#line 9481 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9468 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 549: -#line 6404 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6409 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_enum; } -#line 9489 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9476 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 550: -#line 6408 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6413 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_except; } -#line 9497 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9484 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 551: -#line 6412 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6417 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_const; t_param_const_type = (yyvsp[0].etval); } -#line 9506 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9493 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 552: -#line 6420 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6425 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[0].plval) == 0) { @@ -9534,11 +9521,11 @@ yyreduce: (yyval.plval) = (yyvsp[0].plval); } -#line 9538 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9525 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 553: -#line 6451 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6456 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[-2].plval) == 0) { @@ -9551,19 +9538,19 @@ yyreduce: delete (yyvsp[0].pival); (yyvsp[0].pival) = 0; } -#line 9555 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9542 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 554: -#line 6464 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6469 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.plval) = 0; } -#line 9563 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9550 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 555: -#line 6471 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6476 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.pival), @@ -9588,11 +9575,11 @@ yyreduce: tao_enum_constant_decl = 0; } } -#line 9592 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9579 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 556: -#line 6496 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6501 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.pival), FE_Utils::T_Param_Info, @@ -9607,19 +9594,19 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 9611 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9598 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 557: -#line 6514 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6519 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 9619 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9606 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 558: -#line 6521 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6526 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), 0), 1); @@ -9634,37 +9621,37 @@ yyreduce: (yyval.slval) = (yyvsp[-2].slval); } } -#line 9638 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9625 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 559: -#line 6536 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6541 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.slval) = 0; } -#line 9646 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9633 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 560: -#line 6543 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6548 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.sval), UTL_String ((yyvsp[0].strval), true), 1); } -#line 9656 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9643 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 561: -#line 6552 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6557 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen); } -#line 9664 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9651 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 562: -#line 6556 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6561 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9682,102 +9669,102 @@ yyreduce: // Push it on the scopes stack. idl_global->scopes ().push (p); } -#line 9686 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9673 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 563: -#line 6574 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6579 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen); } -#line 9694 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9681 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 564: -#line 6578 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6583 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen); } -#line 9702 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9689 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 565: -#line 6582 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6587 "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 9713 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9700 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 566: -#line 6592 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6597 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9720 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9707 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 567: -#line 6598 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6603 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9727 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9714 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 568: -#line 6601 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6606 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9734 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9721 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 569: -#line 6607 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6612 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9741 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9728 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 570: -#line 6610 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6615 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9748 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9735 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 571: -#line 6613 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6618 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9755 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9742 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 572: -#line 6616 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6621 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9762 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9749 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 573: -#line 6619 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6624 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 9770 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9757 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 574: -#line 6623 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6628 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9777 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9764 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 575: -#line 6629 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6634 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9846,11 +9833,11 @@ yyreduce: delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; } -#line 9850 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9837 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 576: -#line 6698 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6703 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9897,11 +9884,11 @@ yyreduce: delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; } -#line 9901 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9888 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 577: -#line 6748 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6753 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[0].alval) == 0) { @@ -9913,11 +9900,11 @@ yyreduce: (yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval)); (yyval.alval) = (yyvsp[0].alval); } -#line 9917 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9904 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 578: -#line 6763 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6768 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[-3].alval) == 0) { @@ -9929,19 +9916,19 @@ yyreduce: (yyvsp[-3].alval)->enqueue_tail ((yyvsp[0].dcval)); (yyval.alval) = (yyvsp[-3].alval); } -#line 9933 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9920 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 579: -#line 6775 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6780 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.alval) = 0; } -#line 9941 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9928 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 580: -#line 6782 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6787 "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 @@ -9997,27 +9984,27 @@ yyreduce: 0); } } -#line 10001 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9988 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 582: -#line 6845 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6850 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen); } -#line 10009 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9996 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 583: -#line 6849 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6854 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen); } -#line 10017 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10004 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 584: -#line 6853 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6858 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Connector *parent = 0; @@ -10069,102 +10056,102 @@ yyreduce: idl_global->scopes ().push (c); } } -#line 10073 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10060 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 585: -#line 6908 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6913 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen); } -#line 10081 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10068 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 586: -#line 6912 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6917 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen); } -#line 10089 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10076 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 587: -#line 6916 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6921 "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 10100 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10087 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 590: -#line 6931 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6936 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 10108 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10095 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 591: -#line 6935 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6940 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10116 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10103 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 592: -#line 6939 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6944 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 10124 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10111 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 593: -#line 6943 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6948 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10132 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10119 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 594: -#line 6947 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6952 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 10140 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10127 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 595: -#line 6951 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6956 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10148 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10135 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 596: -#line 6955 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6960 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 10156 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10143 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 597: -#line 6959 "fe/idl.ypp" /* yacc.c:1651 */ +#line 6964 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10164 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10151 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; -#line 10168 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10155 "fe/idl.tab.cpp" /* yacc.c:1651 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -10392,7 +10379,7 @@ yyreturn: #endif return yyresult; } -#line 6964 "fe/idl.ypp" /* yacc.c:1910 */ +#line 6969 "fe/idl.ypp" /* yacc.c:1910 */ /* programs */ diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp index 910eae33754..a3f260db3c8 100644 --- a/TAO/TAO_IDL/fe/idl.ypp +++ b/TAO/TAO_IDL/fe/idl.ypp @@ -4079,30 +4079,30 @@ array_declarator : { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen); } - at_least_one_array_dim + annotations_maybe at_least_one_array_dim { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted); + AST_Array *array = 0; + AST_Annotation_Appls *base_type_annotations = $3; + UTL_ExprList *array_dims = $4; + /* * Create a node representing an array. */ - if ($3 != 0) + if (array_dims) { UTL_ScopedName sn ($1, 0); - $$ = + array = idl_global->gen ()->create_array ( &sn, - $3->length (), - $3, + array_dims->length (), + array_dims, 0, 0 ); - - $3->destroy (); - delete $3; - $3 = 0; - + array->base_type_annotations (base_type_annotations); sn.destroy (); if (!idl_global->in_typedef () @@ -4111,13 +4111,18 @@ array_declarator : idl_global->err ()->anonymous_type_diagnostic (); } } + + array_dims->destroy (); + delete array_dims; + + $$ = array; } ; at_least_one_array_dim : array_dim array_dims { - ACE_NEW_RETURN ($<elval>$, + ACE_NEW_RETURN ($$, UTL_ExprList ($1, $2), 1); @@ -4135,17 +4140,17 @@ array_dims if ($1 == 0) { - $<elval>$ = el; + $$ = el; } else { $1->nconc (el); - $<elval>$ = $1; + $$ = $1; } } | %empty { - $<elval>$ = 0; + $$ = 0; } ; diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h index 8f657fe0b96..affd6681d5c 100644 --- a/TAO/TAO_IDL/include/ast_array.h +++ b/TAO/TAO_IDL/include/ast_array.h @@ -120,6 +120,14 @@ public: static AST_Decl::NodeType const NT; + /** + * Get and Set Annotations on the base type + */ + ///{ + AST_Annotation_Appls *base_type_annotations (); + void base_type_annotations (AST_Annotation_Appls *annotations); + ///} + protected: virtual int compute_size_type (void); // Compute the size type if it is unknown. @@ -140,11 +148,14 @@ private: // If our base type is anonymous array or sequence, we're // responsible for destroying it. -private: - // Compute how many dimensions. AST_Expression **compute_dims (UTL_ExprList *dims, ACE_CDR::ULong ndims); + + /** + * Annotations on the base type + */ + AST_Annotation_Appls *base_type_annotations_; }; #endif // _AST_ARRAY_AST_ARRAY_HH diff --git a/TAO/tests/IDLv4/annotations/be_init.cpp b/TAO/tests/IDLv4/annotations/be_init.cpp index 2758a77ae35..4c0f555e600 100644 --- a/TAO/tests/IDLv4/annotations/be_init.cpp +++ b/TAO/tests/IDLv4/annotations/be_init.cpp @@ -23,6 +23,7 @@ #include "ast_union.h" #include "ast_enum_val.h" #include "utl_string.h" +#include "ast_array.h" void BE_version () @@ -1127,6 +1128,52 @@ BE_post_init (char *[], long) t.assert_annotation_member_value<short, ACE_CDR::Short> (member, 100); } catch (Failed &f) {} + try { + Annotation_Test t("Annotate Array Base Type"); + AST_Typedef *thetypedef = AST_Typedef::narrow_from_decl (t.run ( + "typedef struct12 struct12Array @test_annotation_1 [12];\n" + ).assert_node ("::struct12Array")); + AST_Array *struct12Array = + dynamic_cast<AST_Array*> (thetypedef->base_type ()); + + // Verify Annotation on Base Type + AST_Annotation_Appls *annotations = + struct12Array->base_type_annotations (); + if (!annotations) + { + t.failed ("base_type_annotations() for struct12Array returned null!"); + } + size_t count = annotations->size (); + if (count != 1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") + ACE_TEXT ("expected one annotation on struct12Array base type, ") + ACE_TEXT ("it has %d annotations!\n"), + t.name_, count)); + t.failed (); + } + AST_Annotation_Appl *annotation = (*annotations)[0]; + if (!annotation) + { + t.failed ("annotation for struct12Array base type is null!"); + } + if (annotation->annotation_decl () != test_annotation_1) + { + UTL_ScopedName *scopedname = annotation->name (); + const char *name = scopedname ? + scopedname-> get_string_copy () : "UNKNOWN"; + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Annotation Test Error: %C:\n") + ACE_TEXT ("expected annotation for struct12Array base type to be ") + ACE_TEXT ("test_annotation_1, but it was %C\n"), + t.name_, name)); + if (scopedname) + { + delete [] name; + } + t.failed (); + } + } catch (Failed &f) {} + /* ------------------------------------------------------------------------- * Annotation Names * ------------------------------------------------------------------------- |