summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-11-24 18:36:21 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-11-24 18:36:21 +0000
commit431610b726411f4a54eeeb5fe235a61651111c82 (patch)
treef74b710ab490a94b5a4c7d68ee9cdab650d72612
parentc74fb1e68329a4e03b65d329379330d5c662da09 (diff)
downloadATCD-431610b726411f4a54eeeb5fe235a61651111c82.tar.gz
ChangeLogTag: Tue Nov 24 18:32:54 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat
-rw-r--r--modules/TAO/ChangeLog21
-rw-r--r--modules/TAO/TAO_IDL/ast/ast_param_holder.cpp4
-rw-r--r--modules/TAO/TAO_IDL/ast/ast_template_module.cpp6
-rw-r--r--modules/TAO/TAO_IDL/ast/ast_template_module_inst.cpp4
-rw-r--r--modules/TAO/TAO_IDL/ast/ast_template_module_ref.cpp4
-rw-r--r--modules/TAO/TAO_IDL/be/be_visitor.cpp6
-rw-r--r--modules/TAO/TAO_IDL/fe/idl.yy44
-rw-r--r--modules/TAO/TAO_IDL/fe/y.tab.cpp1378
-rw-r--r--modules/TAO/TAO_IDL/include/ast_param_holder.h10
-rw-r--r--modules/TAO/TAO_IDL/include/ast_template_module.h8
-rw-r--r--modules/TAO/TAO_IDL/include/ast_template_module_inst.h2
-rw-r--r--modules/TAO/TAO_IDL/include/ast_template_module_ref.h10
-rw-r--r--modules/TAO/TAO_IDL/include/idl_global.h6
-rw-r--r--modules/TAO/TAO_IDL/util/utl_global.cpp12
14 files changed, 805 insertions, 710 deletions
diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog
index 1c66c9b8355..f54094bdb9a 100644
--- a/modules/TAO/ChangeLog
+++ b/modules/TAO/ChangeLog
@@ -1,3 +1,22 @@
+Tue Nov 24 18:32:54 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * TAO_IDL/ast/ast_param_holder.cpp:
+ * TAO_IDL/ast/ast_template_module.cpp:
+ * TAO_IDL/ast/ast_template_module_inst.cpp:
+ * TAO_IDL/ast/ast_template_module_ref.cpp:
+ * TAO_IDL/be/be_visitor.cpp:
+ * TAO_IDL/fe/idl.yy:
+ * TAO_IDL/fe/y.tab.cpp:
+ * TAO_IDL/include/ast_param_holder.h:
+ * TAO_IDL/include/ast_template_module.h:
+ * TAO_IDL/include/ast_template_module_inst.h:
+ * TAO_IDL/include/ast_template_module_ref.h:
+ * TAO_IDL/include/idl_global.h:
+ * TAO_IDL/util/utl_global.cpp:
+
+ Fixed compile warnings and added semantic actions for
+ formal template parameters.
+
Mon Nov 23 20:37:29 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/include/ast_template_module_ref.h:
@@ -41,7 +60,7 @@ Fri Nov 20 20:22:23 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/ast/ast_module.cpp:
* TAO_IDL/fe/y.tab.cpp:
* TAO_IDL/fe/idl.yy:
-
+
Removed more operations and includes that were caught
by a build from scratch.
diff --git a/modules/TAO/TAO_IDL/ast/ast_param_holder.cpp b/modules/TAO/TAO_IDL/ast/ast_param_holder.cpp
index 1f0be762763..a21b32f300f 100644
--- a/modules/TAO/TAO_IDL/ast/ast_param_holder.cpp
+++ b/modules/TAO/TAO_IDL/ast/ast_param_holder.cpp
@@ -17,7 +17,7 @@ AST_Param_Holder::~AST_Param_Holder (void)
{
}
-Identifier const * const
+Identifier const *
AST_Param_Holder::param_name (void) const
{
return this->param_name_;
@@ -29,7 +29,7 @@ AST_Param_Holder::destroy (void)
this->param_name_->destroy ();
delete this->param_name_;
this->param_name_ = 0;
-
+
this->AST_Decl::destroy ();
}
diff --git a/modules/TAO/TAO_IDL/ast/ast_template_module.cpp b/modules/TAO/TAO_IDL/ast/ast_template_module.cpp
index 4f4a496604d..bf463c545d7 100644
--- a/modules/TAO/TAO_IDL/ast/ast_template_module.cpp
+++ b/modules/TAO/TAO_IDL/ast/ast_template_module.cpp
@@ -22,7 +22,7 @@ AST_Template_Module::~AST_Template_Module (void)
{
}
-FE_Utils::T_PARAMLIST_INFO const * const
+FE_Utils::T_PARAMLIST_INFO const *
AST_Template_Module::template_params (void) const
{
return this->template_params_;
@@ -33,12 +33,12 @@ AST_Template_Module::destroy (void)
{
delete this->template_params_;
this->template_params_ = 0;
-
+
this->AST_Module::destroy ();
}
int
-AST_Template_Module::ast_accept (ast_visitor *visitor)
+AST_Template_Module::ast_accept (ast_visitor *)
{
return 0;//visitor->visit_template_module (this);
}
diff --git a/modules/TAO/TAO_IDL/ast/ast_template_module_inst.cpp b/modules/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
index 6b2bfa15e25..6dab2e18cdf 100644
--- a/modules/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
+++ b/modules/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
@@ -29,7 +29,7 @@ AST_Template_Module_Inst::ref (void) const
AST_Template_Module::narrow_from_decl (this->field_type ());
}
-FE_Utils::T_ARGLIST const * const
+FE_Utils::T_ARGLIST const *
AST_Template_Module_Inst::template_args (void) const
{
return this->template_args_;
@@ -52,7 +52,7 @@ AST_Template_Module_Inst::destroy (void)
}
int
-AST_Template_Module_Inst::ast_accept (ast_visitor *visitor)
+AST_Template_Module_Inst::ast_accept (ast_visitor *)
{
return 0;//visitor->visit_template_module_inst (this);
}
diff --git a/modules/TAO/TAO_IDL/ast/ast_template_module_ref.cpp b/modules/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
index 33c66bdba33..5aaa725fb17 100644
--- a/modules/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
+++ b/modules/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
@@ -31,7 +31,7 @@ AST_Template_Module_Ref::ref (void) const
AST_Template_Module::narrow_from_decl (this->field_type ());
}
-UTL_StrList const * const
+UTL_StrList const *
AST_Template_Module_Ref::param_refs (void) const
{
return this->param_refs_;
@@ -54,7 +54,7 @@ AST_Template_Module_Ref::destroy (void)
}
int
-AST_Template_Module_Ref::ast_accept (ast_visitor *visitor)
+AST_Template_Module_Ref::ast_accept (ast_visitor *)
{
return 0;//visitor->visit_template_module_ref (this);
}
diff --git a/modules/TAO/TAO_IDL/be/be_visitor.cpp b/modules/TAO/TAO_IDL/be/be_visitor.cpp
index 4c9c4720424..37fd76238d3 100644
--- a/modules/TAO/TAO_IDL/be/be_visitor.cpp
+++ b/modules/TAO/TAO_IDL/be/be_visitor.cpp
@@ -116,19 +116,19 @@ be_visitor::visit_component_fwd (be_component_fwd *)
}
int
-be_visitor::visit_template_module (be_template_module *node)
+be_visitor::visit_template_module (be_template_module *)
{
return 0;
}
int
-be_visitor::visit_template_module_inst (be_template_module_inst *node)
+be_visitor::visit_template_module_inst (be_template_module_inst *)
{
return 0;
}
int
-be_visitor::visit_template_module_ref (be_template_module_ref *node)
+be_visitor::visit_template_module_ref (be_template_module_ref *)
{
return 0;
}
diff --git a/modules/TAO/TAO_IDL/fe/idl.yy b/modules/TAO/TAO_IDL/fe/idl.yy
index b85632e542d..237fa414460 100644
--- a/modules/TAO/TAO_IDL/fe/idl.yy
+++ b/modules/TAO/TAO_IDL/fe/idl.yy
@@ -5950,13 +5950,6 @@ formal_parameter_type
// IDL_CONST const_type
$<ntval>$ = AST_Decl::NT_const;
}
- | sequence_param
- {
- }
- ;
-
-sequence_param
- : IDL_SEQUENCE '<' IDENTIFIER '>'
;
at_least_one_formal_parameter
@@ -5992,11 +5985,33 @@ formal_parameters
1);
}
- $1->enqueue_tail (*$4);
+ bool so_far_so_good =
+ idl_global->check_for_seq_of_param ($1,
+ $4);
+
+ if (so_far_so_good)
+ {
+ $1->enqueue_tail (*$4);
+ $<plval>$ = $1;
+ }
+ else
+ {
+ delete $1;
+ $1 = 0;
+
+ // TODO - create a specific utl_err msg.
+ ACE_ERROR ((LM_ERROR,
+ ACE_TEXT ("bad param\n")));
+ }
+
delete $4;
$4 = 0;
- $$ = $1;
+ if (!so_far_so_good)
+ {
+ return 1;
+ }
+
}
| /* EMPTY */
{
@@ -6017,6 +6032,17 @@ formal_parameter
$<pival>$->type_ = $1;
$<pival>$->name_ = $2;
}
+ | IDL_SEQUENCE '<' IDENTIFIER '>'
+ {
+ ACE_NEW_RETURN ($<pival>$,
+ FE_Utils::T_Param_Info,
+ 1);
+
+ $<pival>$->type_ = AST_Decl::NT_sequence;
+ $<pival>$->name_ = "sequence<";
+ $<pival>$->name_ += $3;
+ $<pival>$->name_ += '>';
+ }
;
at_least_one_formal_parameter_name
diff --git a/modules/TAO/TAO_IDL/fe/y.tab.cpp b/modules/TAO/TAO_IDL/fe/y.tab.cpp
index e71d7ecd4ac..8a6f8f0370a 100644
--- a/modules/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/modules/TAO/TAO_IDL/fe/y.tab.cpp
@@ -598,16 +598,16 @@ union tao_yyalloc
/* TAO_YYFINAL -- State number of the termination state. */
#define TAO_YYFINAL 3
/* TAO_YYLAST -- Last index in TAO_YYTABLE. */
-#define TAO_YYLAST 1232
+#define TAO_YYLAST 1286
/* TAO_YYNTOKENS -- Number of terminals. */
#define TAO_YYNTOKENS 106
/* TAO_YYNNTS -- Number of nonterminals. */
-#define TAO_YYNNTS 384
+#define TAO_YYNNTS 383
/* TAO_YYNRULES -- Number of rules. */
-#define TAO_YYNRULES 566
+#define TAO_YYNRULES 565
/* TAO_YYNRULES -- Number of states. */
-#define TAO_YYNSTATES 808
+#define TAO_YYNSTATES 807
/* TAO_YYTRANSLATE(TAO_YYLEX) -- Bison symbol number corresponding to TAO_YYLEX. */
#define TAO_YYUNDEFTOK 2
@@ -712,11 +712,11 @@ static const tao_yytype_uint16 tao_yyprhs[] =
1233, 1235, 1237, 1239, 1241, 1244, 1248, 1249, 1250, 1251,
1260, 1264, 1268, 1271, 1272, 1276, 1277, 1278, 1279, 1288,
1290, 1292, 1294, 1296, 1298, 1300, 1302, 1304, 1306, 1308,
- 1311, 1313, 1318, 1321, 1322, 1327, 1328, 1331, 1334, 1338,
- 1339, 1341, 1342, 1343, 1344, 1345, 1355, 1358, 1361, 1362,
- 1363, 1367, 1368, 1372, 1376, 1380, 1383, 1387, 1388, 1390,
- 1393, 1394, 1395, 1401, 1402, 1403, 1409, 1412, 1415, 1416,
- 1417, 1421, 1422, 1426, 1427, 1431, 1432
+ 1311, 1314, 1315, 1320, 1321, 1324, 1329, 1332, 1336, 1337,
+ 1339, 1340, 1341, 1342, 1343, 1353, 1356, 1359, 1360, 1361,
+ 1365, 1366, 1370, 1374, 1378, 1381, 1385, 1386, 1388, 1391,
+ 1392, 1393, 1399, 1400, 1401, 1407, 1410, 1413, 1414, 1415,
+ 1419, 1420, 1424, 1425, 1429, 1430
};
/* TAO_YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -730,14 +730,14 @@ static const tao_yytype_int16 tao_yyrhs[] =
150, 118, 85, -1, -1, 129, 119, 85, -1, -1,
160, 120, 85, -1, -1, 382, 121, 85, -1, -1,
410, 122, 85, -1, -1, 435, 123, 85, -1, -1,
- 462, 124, 85, -1, -1, 476, 125, 85, -1, -1,
+ 461, 124, 85, -1, -1, 475, 125, 85, -1, -1,
1, 126, 85, -1, -1, 5, 128, 196, -1, -1,
-1, -1, 127, 130, 86, 131, 110, 132, 87, -1,
127, 88, -1, -1, -1, -1, -1, -1, 133, 135,
- 455, 136, 89, 137, 86, 138, 140, 139, 87, -1,
+ 454, 136, 89, 137, 86, 138, 140, 139, 87, -1,
142, 141, -1, 141, 142, -1, -1, 112, -1, 143,
85, -1, -1, -1, -1, 72, 144, 196, 145, 88,
- 459, 89, 146, 3, -1, -1, -1, 133, 148, 473,
+ 458, 89, 146, 3, -1, -1, -1, 133, 148, 472,
89, 149, 199, -1, 151, -1, 200, -1, -1, -1,
-1, 157, 152, 86, 153, 183, 154, 87, -1, -1,
6, 156, 199, -1, 155, 158, -1, 41, 155, 158,
@@ -834,7 +834,7 @@ static const tao_yytype_int16 tao_yyrhs[] =
402, 395, 85, -1, -1, 404, 396, 85, -1, -1,
407, 397, 85, -1, -1, 408, 398, 85, -1, -1,
409, 399, 85, -1, -1, 318, 400, 85, -1, -1,
- 472, 401, 85, -1, 60, 403, 199, -1, 196, -1,
+ 471, 401, 85, -1, 60, 403, 199, -1, 196, -1,
19, -1, 405, 403, 199, -1, 65, 406, -1, 58,
-1, -1, 52, 196, 199, -1, 61, 196, 199, -1,
51, 196, 199, -1, -1, 412, 411, 422, -1, -1,
@@ -853,81 +853,81 @@ static const tao_yytype_int16 tao_yyrhs[] =
446, 449, 86, 450, 178, 451, 87, -1, 444, -1,
445, -1, 67, -1, 20, -1, 21, -1, 53, -1,
24, -1, 6, -1, 49, -1, 27, -1, 4, 206,
- -1, 454, -1, 24, 88, 3, 89, -1, 458, 456,
- -1, -1, 456, 91, 457, 458, -1, -1, 453, 3,
- -1, 461, 460, -1, 460, 91, 461, -1, -1, 3,
- -1, -1, -1, -1, -1, 70, 463, 3, 464, 86,
- 465, 467, 466, 87, -1, 469, 468, -1, 468, 469,
- -1, -1, -1, 402, 470, 85, -1, -1, 404, 471,
- 85, -1, 68, 196, 3, -1, 69, 196, 3, -1,
- 475, 474, -1, 474, 91, 475, -1, -1, 207, -1,
- 477, 480, -1, -1, -1, 71, 478, 3, 479, 391,
- -1, -1, -1, 86, 481, 483, 482, 87, -1, 485,
- 484, -1, 484, 485, -1, -1, -1, 402, 486, 85,
- -1, -1, 404, 487, 85, -1, -1, 318, 488, 85,
- -1, -1, 472, 489, 85, -1
+ -1, 457, 455, -1, -1, 455, 91, 456, 457, -1,
+ -1, 453, 3, -1, 24, 88, 3, 89, -1, 460,
+ 459, -1, 459, 91, 460, -1, -1, 3, -1, -1,
+ -1, -1, -1, 70, 462, 3, 463, 86, 464, 466,
+ 465, 87, -1, 468, 467, -1, 467, 468, -1, -1,
+ -1, 402, 469, 85, -1, -1, 404, 470, 85, -1,
+ 68, 196, 3, -1, 69, 196, 3, -1, 474, 473,
+ -1, 473, 91, 474, -1, -1, 207, -1, 476, 479,
+ -1, -1, -1, 71, 477, 3, 478, 391, -1, -1,
+ -1, 86, 480, 482, 481, 87, -1, 484, 483, -1,
+ 483, 484, -1, -1, -1, 402, 485, 85, -1, -1,
+ 404, 486, 85, -1, -1, 318, 487, 85, -1, -1,
+ 471, 488, 85, -1
};
/* TAO_YYRLINE[TAO_YYN] -- source line where rule number TAO_YYN was defined. */
static const tao_yytype_uint16 tao_yyrline[] =
{
- 0, 353, 353, 356, 357, 361, 364, 367, 373, 377,
- 378, 383, 382, 393, 392, 403, 402, 413, 412, 423,
- 422, 433, 432, 443, 442, 453, 452, 463, 462, 473,
- 472, 483, 482, 493, 492, 503, 502, 513, 512, 527,
- 526, 558, 563, 568, 557, 584, 589, 594, 597, 603,
- 606, 588, 614, 618, 619, 623, 624, 629, 632, 635,
- 628, 644, 647, 643, 655, 656, 661, 700, 705, 660,
- 723, 722, 736, 774, 805, 839, 838, 850, 857, 858,
- 859, 860, 864, 875, 880, 924, 929, 879, 958, 997,
- 1002, 956, 1021, 1019, 1059, 1058, 1072, 1078, 1085, 1092,
- 1099, 1125, 1152, 1217, 1218, 1222, 1223, 1224, 1230, 1229,
- 1237, 1236, 1246, 1247, 1252, 1251, 1262, 1261, 1272, 1271,
- 1282, 1281, 1292, 1291, 1302, 1301, 1312, 1311, 1322, 1321,
- 1335, 1348, 1346, 1376, 1383, 1394, 1393, 1421, 1419, 1446,
- 1458, 1504, 1532, 1563, 1568, 1573, 1578, 1562, 1631, 1632,
- 1633, 1634, 1635, 1636, 1637, 1649, 1654, 1729, 1731, 1733,
- 1734, 1748, 1749, 1763, 1764, 1777, 1778, 1788, 1801, 1802,
- 1812, 1825, 1826, 1836, 1846, 1859, 1860, 1870, 1880, 1893,
- 1928, 1929, 1938, 1943, 1950, 1958, 1963, 1968, 1974, 1979,
- 1984, 1992, 2064, 2063, 2073, 2078, 2083, 2088, 2115, 2124,
- 2123, 2194, 2195, 2199, 2207, 2208, 2236, 2237, 2238, 2239,
- 2240, 2241, 2242, 2243, 2247, 2248, 2249, 2253, 2254, 2255,
- 2259, 2260, 2264, 2277, 2275, 2305, 2312, 2313, 2317, 2330,
- 2328, 2358, 2365, 2382, 2401, 2402, 2406, 2411, 2416, 2424,
- 2429, 2434, 2442, 2447, 2452, 2460, 2474, 2479, 2487, 2495,
- 2503, 2511, 2520, 2519, 2535, 2569, 2574, 2534, 2593, 2596,
- 2597, 2601, 2601, 2611, 2616, 2610, 2679, 2678, 2693, 2692,
- 2707, 2712, 2717, 2722, 2769, 2774, 2706, 2798, 2806, 2820,
- 2830, 2838, 2839, 2947, 2950, 2951, 2956, 2961, 2955, 2997,
- 2996, 3010, 3021, 3043, 3051, 3050, 3066, 3071, 3065, 3088,
- 3087, 3140, 3164, 3189, 3194, 3227, 3232, 3188, 3258, 3263,
- 3261, 3268, 3272, 3309, 3314, 3307, 3381, 3436, 3446, 3435,
- 3461, 3466, 3459, 3507, 3533, 3543, 3548, 3541, 3578, 3603,
- 3612, 3611, 3647, 3658, 3680, 3688, 3693, 3687, 3730, 3731,
- 3736, 3741, 3746, 3751, 3735, 3820, 3825, 3830, 3835, 3819,
- 3913, 3918, 3948, 3953, 3912, 3971, 3976, 4029, 4034, 3969,
- 4071, 4077, 4084, 4091, 4092, 4104, 4110, 4152, 4103, 4174,
- 4173, 4184, 4183, 4196, 4201, 4199, 4206, 4211, 4216, 4210,
- 4257, 4256, 4267, 4266, 4279, 4284, 4282, 4289, 4294, 4299,
- 4293, 4346, 4354, 4355, 4356, 4476, 4481, 4486, 4495, 4500,
- 4494, 4512, 4520, 4525, 4519, 4537, 4545, 4550, 4544, 4562,
- 4570, 4575, 4569, 4587, 4594, 4607, 4605, 4633, 4640, 4669,
- 4707, 4708, 4712, 4742, 4782, 4787, 4741, 4806, 4811, 4804,
- 4853, 4852, 4863, 4870, 4871, 4876, 4875, 4886, 4885, 4896,
- 4895, 4906, 4905, 4916, 4915, 4926, 4925, 4936, 4935, 4947,
- 5006, 5013, 5037, 5111, 5121, 5127, 5133, 5180, 5227, 5276,
- 5275, 5325, 5330, 5335, 5340, 5345, 5350, 5324, 5404, 5403,
- 5414, 5421, 5428, 5436, 5441, 5435, 5453, 5454, 5458, 5460,
- 5459, 5470, 5469, 5484, 5520, 5482, 5554, 5590, 5552, 5622,
- 5623, 5624, 5628, 5629, 5633, 5661, 5692, 5737, 5742, 5690,
- 5759, 5769, 5788, 5800, 5799, 5839, 5889, 5894, 5837, 5911,
- 5916, 5924, 5929, 5934, 5939, 5944, 5949, 5954, 5959, 5964,
- 5969, 5975, 5979, 5997, 5996, 6018, 6025, 6039, 6046, 6070,
- 6077, 6088, 6093, 6098, 6103, 6087, 6118, 6125, 6130, 6137,
- 6136, 6145, 6144, 6155, 6237, 6300, 6304, 6305, 6309, 6323,
- 6328, 6333, 6327, 6393, 6398, 6392, 6413, 6417, 6418, 6423,
- 6422, 6433, 6432, 6443, 6442, 6453, 6452
+ 0, 352, 352, 355, 356, 360, 363, 366, 372, 376,
+ 377, 382, 381, 392, 391, 402, 401, 412, 411, 422,
+ 421, 432, 431, 442, 441, 452, 451, 462, 461, 472,
+ 471, 482, 481, 492, 491, 502, 501, 512, 511, 526,
+ 525, 557, 562, 567, 556, 583, 588, 593, 596, 602,
+ 605, 587, 613, 617, 618, 622, 623, 628, 631, 634,
+ 627, 643, 646, 642, 654, 655, 660, 699, 704, 659,
+ 722, 721, 735, 773, 804, 838, 837, 849, 856, 857,
+ 858, 859, 863, 874, 879, 923, 928, 878, 957, 996,
+ 1001, 955, 1020, 1018, 1058, 1057, 1071, 1077, 1084, 1091,
+ 1098, 1124, 1151, 1216, 1217, 1221, 1222, 1223, 1229, 1228,
+ 1236, 1235, 1245, 1246, 1251, 1250, 1261, 1260, 1271, 1270,
+ 1281, 1280, 1291, 1290, 1301, 1300, 1311, 1310, 1321, 1320,
+ 1334, 1347, 1345, 1375, 1382, 1393, 1392, 1420, 1418, 1445,
+ 1457, 1503, 1531, 1562, 1567, 1572, 1577, 1561, 1630, 1631,
+ 1632, 1633, 1634, 1635, 1636, 1648, 1653, 1728, 1730, 1732,
+ 1733, 1747, 1748, 1762, 1763, 1776, 1777, 1787, 1800, 1801,
+ 1811, 1824, 1825, 1835, 1845, 1858, 1859, 1869, 1879, 1892,
+ 1927, 1928, 1937, 1942, 1949, 1957, 1962, 1967, 1973, 1978,
+ 1983, 1991, 2063, 2062, 2072, 2077, 2082, 2087, 2114, 2123,
+ 2122, 2193, 2194, 2198, 2206, 2207, 2235, 2236, 2237, 2238,
+ 2239, 2240, 2241, 2242, 2246, 2247, 2248, 2252, 2253, 2254,
+ 2258, 2259, 2263, 2276, 2274, 2304, 2311, 2312, 2316, 2329,
+ 2327, 2357, 2364, 2381, 2400, 2401, 2405, 2410, 2415, 2423,
+ 2428, 2433, 2441, 2446, 2451, 2459, 2473, 2478, 2486, 2494,
+ 2502, 2510, 2519, 2518, 2534, 2568, 2573, 2533, 2592, 2595,
+ 2596, 2600, 2600, 2610, 2615, 2609, 2678, 2677, 2692, 2691,
+ 2706, 2711, 2716, 2721, 2768, 2773, 2705, 2797, 2805, 2819,
+ 2829, 2837, 2838, 2946, 2949, 2950, 2955, 2960, 2954, 2996,
+ 2995, 3009, 3020, 3042, 3050, 3049, 3065, 3070, 3064, 3087,
+ 3086, 3139, 3163, 3188, 3193, 3226, 3231, 3187, 3257, 3262,
+ 3260, 3267, 3271, 3308, 3313, 3306, 3380, 3435, 3445, 3434,
+ 3460, 3465, 3458, 3506, 3532, 3542, 3547, 3540, 3577, 3602,
+ 3611, 3610, 3646, 3657, 3679, 3687, 3692, 3686, 3729, 3730,
+ 3735, 3740, 3745, 3750, 3734, 3819, 3824, 3829, 3834, 3818,
+ 3912, 3917, 3947, 3952, 3911, 3970, 3975, 4028, 4033, 3968,
+ 4070, 4076, 4083, 4090, 4091, 4103, 4109, 4151, 4102, 4173,
+ 4172, 4183, 4182, 4195, 4200, 4198, 4205, 4210, 4215, 4209,
+ 4256, 4255, 4266, 4265, 4278, 4283, 4281, 4288, 4293, 4298,
+ 4292, 4345, 4353, 4354, 4355, 4460, 4465, 4470, 4479, 4484,
+ 4478, 4496, 4504, 4509, 4503, 4521, 4529, 4534, 4528, 4546,
+ 4554, 4559, 4553, 4571, 4578, 4591, 4589, 4617, 4624, 4653,
+ 4691, 4692, 4696, 4726, 4766, 4771, 4725, 4790, 4795, 4788,
+ 4837, 4836, 4847, 4854, 4855, 4860, 4859, 4870, 4869, 4880,
+ 4879, 4890, 4889, 4900, 4899, 4910, 4909, 4920, 4919, 4931,
+ 4990, 4997, 5021, 5095, 5105, 5111, 5117, 5164, 5211, 5260,
+ 5259, 5309, 5314, 5319, 5324, 5329, 5334, 5308, 5388, 5387,
+ 5398, 5405, 5412, 5420, 5425, 5419, 5437, 5438, 5442, 5444,
+ 5443, 5454, 5453, 5468, 5504, 5466, 5538, 5574, 5536, 5606,
+ 5607, 5608, 5612, 5613, 5617, 5645, 5676, 5721, 5726, 5674,
+ 5743, 5753, 5772, 5784, 5783, 5823, 5873, 5878, 5821, 5895,
+ 5900, 5908, 5913, 5918, 5923, 5928, 5933, 5938, 5943, 5948,
+ 5956, 5974, 5973, 6017, 6024, 6035, 6049, 6056, 6080, 6087,
+ 6098, 6103, 6108, 6113, 6097, 6128, 6135, 6140, 6147, 6146,
+ 6155, 6154, 6165, 6234, 6284, 6288, 6289, 6293, 6307, 6312,
+ 6317, 6311, 6377, 6382, 6376, 6397, 6401, 6402, 6407, 6406,
+ 6417, 6416, 6427, 6426, 6437, 6436
};
#endif
@@ -1024,16 +1024,16 @@ static const char *const tao_yytname[] =
"event_abs_decl", "@168", "@169", "@170", "event_abs_header",
"event_custom_header", "event_plain_header", "event_rest_of_header",
"@171", "event_decl", "@172", "@173", "@174", "event_header",
- "formal_parameter_type", "sequence_param",
- "at_least_one_formal_parameter", "formal_parameters", "@175",
- "formal_parameter", "at_least_one_formal_parameter_name",
- "formal_parameter_names", "formal_parameter_name", "porttype_decl",
- "@176", "@177", "@178", "@179", "at_least_one_port_export",
- "port_exports", "port_export", "@180", "@181", "extended_port_decl",
- "at_least_one_actual_parameter", "actual_parameters", "actual_parameter",
- "connector_decl", "connector_header", "@182", "@183", "connector_body",
- "@184", "@185", "at_least_one_connector_export", "connector_exports",
- "connector_export", "@186", "@187", "@188", "@189", 0
+ "formal_parameter_type", "at_least_one_formal_parameter",
+ "formal_parameters", "@175", "formal_parameter",
+ "at_least_one_formal_parameter_name", "formal_parameter_names",
+ "formal_parameter_name", "porttype_decl", "@176", "@177", "@178", "@179",
+ "at_least_one_port_export", "port_exports", "port_export", "@180",
+ "@181", "extended_port_decl", "at_least_one_actual_parameter",
+ "actual_parameters", "actual_parameter", "connector_decl",
+ "connector_header", "@182", "@183", "connector_body", "@184", "@185",
+ "at_least_one_connector_export", "connector_exports", "connector_export",
+ "@186", "@187", "@188", "@189", 0
};
#endif
@@ -1111,11 +1111,11 @@ static const tao_yytype_uint16 tao_yyr1[] =
435, 435, 436, 436, 437, 438, 440, 441, 442, 439,
443, 444, 445, 447, 446, 449, 450, 451, 448, 452,
452, 453, 453, 453, 453, 453, 453, 453, 453, 453,
- 453, 454, 455, 457, 456, 456, 458, 459, 460, 460,
- 461, 463, 464, 465, 466, 462, 467, 468, 468, 470,
- 469, 471, 469, 472, 472, 473, 474, 474, 475, 476,
- 478, 479, 477, 481, 482, 480, 483, 484, 484, 486,
- 485, 487, 485, 488, 485, 489, 485
+ 454, 456, 455, 455, 457, 457, 458, 459, 459, 460,
+ 462, 463, 464, 465, 461, 466, 467, 467, 469, 468,
+ 470, 468, 471, 471, 472, 473, 473, 474, 475, 477,
+ 478, 476, 480, 481, 479, 482, 483, 483, 485, 484,
+ 486, 484, 487, 484, 488, 484
};
/* TAO_YYR2[TAO_YYN] -- Number of symbols composing right hand side of rule TAO_YYN. */
@@ -1173,11 +1173,11 @@ static const tao_yytype_uint8 tao_yyr2[] =
1, 1, 1, 1, 2, 3, 0, 0, 0, 8,
3, 3, 2, 0, 3, 0, 0, 0, 8, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
- 1, 4, 2, 0, 4, 0, 2, 2, 3, 0,
- 1, 0, 0, 0, 0, 9, 2, 2, 0, 0,
- 3, 0, 3, 3, 3, 2, 3, 0, 1, 2,
- 0, 0, 5, 0, 0, 5, 2, 2, 0, 0,
- 3, 0, 3, 0, 3, 0, 3
+ 2, 0, 4, 0, 2, 4, 2, 3, 0, 1,
+ 0, 0, 0, 0, 9, 2, 2, 0, 0, 3,
+ 0, 3, 3, 3, 2, 3, 0, 1, 2, 0,
+ 0, 5, 0, 0, 5, 2, 2, 0, 0, 3,
+ 0, 3, 0, 3, 0, 3
};
/* TAO_YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1187,7 +1187,7 @@ static const tao_yytype_uint16 tao_yydefact[] =
{
4, 0, 0, 1, 37, 143, 39, 70, 192, 252,
268, 303, 350, 0, 0, 0, 0, 94, 0, 0,
- 461, 0, 0, 531, 550, 3, 5, 41, 23, 61,
+ 461, 0, 0, 530, 549, 3, 5, 41, 23, 61,
0, 0, 21, 64, 77, 66, 25, 78, 83, 79,
84, 77, 80, 81, 65, 17, 11, 198, 254, 194,
302, 195, 220, 221, 196, 19, 13, 15, 27, 421,
@@ -1203,245 +1203,245 @@ static const tao_yytype_uint16 tao_yydefact[] =
212, 213, 254, 217, 0, 218, 219, 214, 0, 215,
323, 216, 328, 0, 0, 0, 270, 0, 0, 0,
0, 0, 0, 0, 0, 503, 496, 505, 0, 0,
- 553, 549, 38, 156, 144, 148, 152, 153, 149, 150,
+ 552, 548, 38, 156, 144, 148, 152, 153, 149, 150,
151, 154, 155, 40, 71, 193, 199, 253, 269, 304,
351, 73, 500, 74, 0, 501, 95, 432, 462, 0,
- 418, 137, 419, 532, 551, 42, 24, 0, 516, 512,
- 513, 515, 518, 517, 514, 511, 0, 520, 47, 525,
- 182, 183, 184, 186, 188, 189, 190, 187, 185, 0,
- 0, 0, 0, 179, 548, 157, 158, 159, 161, 163,
- 165, 168, 171, 175, 180, 0, 547, 22, 96, 75,
- 67, 26, 85, 237, 244, 239, 241, 0, 99, 316,
- 313, 320, 325, 18, 12, 255, 0, 20, 14, 16,
- 28, 424, 30, 473, 460, 32, 99, 0, 0, 34,
- 36, 0, 0, 0, 0, 0, 89, 430, 428, 470,
- 136, 0, 0, 432, 10, 519, 0, 526, 0, 522,
- 176, 177, 178, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 62, 545, 0, 113, 104, 240,
- 318, 0, 93, 0, 0, 0, 261, 271, 434, 477,
- 504, 497, 506, 340, 345, 0, 455, 0, 0, 563,
- 338, 339, 559, 561, 0, 565, 554, 558, 145, 232,
- 200, 225, 226, 227, 233, 305, 352, 113, 0, 99,
- 468, 463, 138, 533, 552, 43, 0, 0, 48, 523,
- 181, 160, 162, 164, 166, 167, 169, 170, 172, 173,
- 174, 0, 0, 76, 133, 0, 0, 0, 98, 191,
- 314, 321, 326, 256, 260, 0, 0, 425, 0, 113,
- 104, 0, 0, 451, 450, 0, 454, 453, 0, 0,
- 0, 0, 0, 0, 0, 0, 556, 0, 0, 222,
- 0, 260, 0, 431, 429, 0, 99, 0, 0, 9,
- 41, 521, 0, 0, 63, 546, 130, 128, 360, 361,
- 0, 112, 120, 114, 124, 122, 126, 0, 116, 118,
- 365, 110, 108, 0, 103, 105, 106, 0, 319, 0,
- 0, 0, 0, 261, 266, 263, 262, 236, 282, 277,
- 278, 279, 280, 272, 281, 0, 0, 0, 445, 0,
- 433, 435, 437, 439, 441, 443, 447, 0, 0, 478,
- 0, 476, 479, 481, 0, 0, 341, 394, 391, 392,
- 393, 346, 449, 543, 544, 564, 560, 562, 452, 566,
- 555, 557, 146, 335, 331, 334, 223, 312, 306, 311,
- 261, 0, 469, 464, 539, 541, 534, 538, 44, 49,
- 524, 131, 0, 69, 0, 0, 0, 0, 0, 364,
- 355, 363, 0, 0, 0, 0, 0, 87, 107, 315,
- 322, 327, 257, 259, 0, 0, 0, 0, 0, 0,
- 0, 426, 0, 0, 0, 0, 0, 0, 483, 486,
- 475, 0, 0, 0, 0, 0, 0, 0, 0, 332,
- 0, 0, 308, 0, 91, 0, 0, 0, 0, 536,
- 0, 0, 129, 121, 115, 125, 123, 127, 0, 117,
- 119, 366, 111, 109, 267, 264, 273, 458, 456, 457,
- 446, 436, 438, 440, 442, 444, 448, 0, 0, 480,
- 482, 499, 508, 342, 347, 231, 147, 336, 333, 224,
- 307, 309, 354, 465, 540, 542, 535, 537, 57, 55,
- 50, 54, 0, 132, 356, 0, 0, 0, 369, 484,
- 487, 0, 405, 228, 0, 0, 0, 0, 0, 0,
- 56, 0, 367, 265, 274, 0, 0, 401, 401, 343,
- 402, 348, 229, 337, 310, 466, 58, 51, 53, 382,
- 357, 401, 0, 370, 377, 0, 376, 398, 485, 488,
- 401, 0, 409, 0, 472, 0, 0, 0, 401, 368,
- 289, 296, 294, 275, 285, 286, 293, 0, 372, 373,
- 0, 344, 403, 406, 349, 230, 0, 467, 0, 381,
- 395, 396, 397, 0, 387, 388, 358, 0, 0, 0,
- 0, 0, 0, 291, 378, 374, 399, 0, 0, 471,
- 530, 0, 529, 383, 384, 0, 413, 290, 297, 295,
- 276, 284, 299, 287, 292, 0, 0, 0, 0, 407,
- 59, 527, 385, 389, 410, 359, 0, 0, 0, 379,
- 375, 0, 404, 0, 0, 0, 0, 0, 0, 298,
- 300, 288, 400, 0, 60, 528, 386, 390, 411, 408,
- 0, 417, 0, 414, 412, 415, 0, 416
+ 418, 137, 419, 531, 550, 42, 24, 0, 516, 512,
+ 513, 515, 518, 517, 514, 511, 0, 47, 523, 182,
+ 183, 184, 186, 188, 189, 190, 187, 185, 0, 0,
+ 0, 0, 179, 547, 157, 158, 159, 161, 163, 165,
+ 168, 171, 175, 180, 0, 546, 22, 96, 75, 67,
+ 26, 85, 237, 244, 239, 241, 0, 99, 316, 313,
+ 320, 325, 18, 12, 255, 0, 20, 14, 16, 28,
+ 424, 30, 473, 460, 32, 99, 0, 0, 34, 36,
+ 0, 0, 0, 0, 0, 89, 430, 428, 470, 136,
+ 0, 0, 432, 10, 519, 0, 524, 0, 520, 176,
+ 177, 178, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 62, 544, 0, 113, 104, 240, 318,
+ 0, 93, 0, 0, 0, 261, 271, 434, 477, 504,
+ 497, 506, 340, 345, 0, 455, 0, 0, 562, 338,
+ 339, 558, 560, 0, 564, 553, 557, 145, 232, 200,
+ 225, 226, 227, 233, 305, 352, 113, 0, 99, 468,
+ 463, 138, 532, 551, 43, 0, 0, 48, 521, 181,
+ 160, 162, 164, 166, 167, 169, 170, 172, 173, 174,
+ 0, 0, 76, 133, 0, 0, 0, 98, 191, 314,
+ 321, 326, 256, 260, 0, 0, 425, 0, 113, 104,
+ 0, 0, 451, 450, 0, 454, 453, 0, 0, 0,
+ 0, 0, 0, 0, 0, 555, 0, 0, 222, 0,
+ 260, 0, 431, 429, 0, 99, 0, 0, 9, 41,
+ 525, 0, 0, 63, 545, 130, 128, 360, 361, 0,
+ 112, 120, 114, 124, 122, 126, 0, 116, 118, 365,
+ 110, 108, 0, 103, 105, 106, 0, 319, 0, 0,
+ 0, 0, 261, 266, 263, 262, 236, 282, 277, 278,
+ 279, 280, 272, 281, 0, 0, 0, 445, 0, 433,
+ 435, 437, 439, 441, 443, 447, 0, 0, 478, 0,
+ 476, 479, 481, 0, 0, 341, 394, 391, 392, 393,
+ 346, 449, 542, 543, 563, 559, 561, 452, 565, 554,
+ 556, 146, 335, 331, 334, 223, 312, 306, 311, 261,
+ 0, 469, 464, 538, 540, 533, 537, 44, 49, 522,
+ 131, 0, 69, 0, 0, 0, 0, 0, 364, 355,
+ 363, 0, 0, 0, 0, 0, 87, 107, 315, 322,
+ 327, 257, 259, 0, 0, 0, 0, 0, 0, 0,
+ 426, 0, 0, 0, 0, 0, 0, 483, 486, 475,
+ 0, 0, 0, 0, 0, 0, 0, 0, 332, 0,
+ 0, 308, 0, 91, 0, 0, 0, 0, 535, 0,
+ 0, 129, 121, 115, 125, 123, 127, 0, 117, 119,
+ 366, 111, 109, 267, 264, 273, 458, 456, 457, 446,
+ 436, 438, 440, 442, 444, 448, 0, 0, 480, 482,
+ 499, 508, 342, 347, 231, 147, 336, 333, 224, 307,
+ 309, 354, 465, 539, 541, 534, 536, 57, 55, 50,
+ 54, 0, 132, 356, 0, 0, 0, 369, 484, 487,
+ 0, 405, 228, 0, 0, 0, 0, 0, 0, 56,
+ 0, 367, 265, 274, 0, 0, 401, 401, 343, 402,
+ 348, 229, 337, 310, 466, 58, 51, 53, 382, 357,
+ 401, 0, 370, 377, 0, 376, 398, 485, 488, 401,
+ 0, 409, 0, 472, 0, 0, 0, 401, 368, 289,
+ 296, 294, 275, 285, 286, 293, 0, 372, 373, 0,
+ 344, 403, 406, 349, 230, 0, 467, 0, 381, 395,
+ 396, 397, 0, 387, 388, 358, 0, 0, 0, 0,
+ 0, 0, 291, 378, 374, 399, 0, 0, 471, 529,
+ 0, 528, 383, 384, 0, 413, 290, 297, 295, 276,
+ 284, 299, 287, 292, 0, 0, 0, 0, 407, 59,
+ 526, 385, 389, 410, 359, 0, 0, 0, 379, 375,
+ 0, 404, 0, 0, 0, 0, 0, 0, 298, 300,
+ 288, 400, 0, 60, 527, 386, 390, 411, 408, 0,
+ 417, 0, 414, 412, 415, 0, 416
};
/* TAO_YYDEFGOTO[NTERM-NUM]. */
static const tao_yytype_int16 tao_yydefgoto[] =
{
- -1, 1, 2, 25, 375, 376, 649, 164, 168, 169,
+ -1, 1, 2, 25, 374, 375, 648, 164, 168, 169,
163, 167, 114, 109, 118, 170, 172, 174, 178, 179,
- 77, 440, 79, 28, 108, 304, 438, 29, 30, 110,
- 308, 442, 600, 668, 650, 669, 651, 652, 667, 705,
- 784, 31, 111, 391, 32, 33, 117, 327, 450, 34,
- 80, 35, 135, 326, 36, 37, 38, 119, 328, 463,
- 39, 204, 367, 531, 40, 268, 41, 97, 259, 332,
- 42, 43, 396, 464, 465, 556, 555, 395, 451, 545,
- 552, 553, 544, 547, 546, 548, 542, 393, 446, 601,
- 243, 209, 301, 103, 44, 452, 78, 292, 427, 587,
- 184, 244, 399, 246, 247, 248, 249, 250, 251, 252,
- 253, 254, 400, 453, 81, 195, 293, 475, 138, 139,
- 140, 141, 47, 360, 429, 590, 361, 634, 663, 703,
- 362, 363, 142, 143, 144, 145, 146, 147, 148, 149,
- 150, 151, 48, 82, 49, 165, 336, 472, 403, 473,
- 563, 405, 476, 565, 656, 564, 50, 83, 51, 276,
- 406, 566, 657, 692, 740, 483, 713, 741, 714, 742,
- 778, 737, 715, 743, 716, 739, 738, 776, 763, 777,
- 52, 53, 54, 84, 294, 430, 591, 528, 592, 665,
- 529, 157, 333, 469, 158, 267, 397, 159, 334, 470,
- 160, 161, 335, 471, 162, 364, 428, 524, 589, 525,
- 588, 664, 454, 350, 411, 585, 661, 700, 351, 412,
- 586, 662, 702, 455, 85, 295, 431, 593, 456, 608,
- 671, 708, 756, 457, 550, 467, 554, 655, 691, 659,
- 675, 676, 695, 719, 766, 696, 717, 765, 690, 706,
- 707, 733, 754, 786, 734, 755, 787, 511, 735, 698,
- 720, 767, 681, 701, 747, 724, 748, 783, 775, 788,
- 800, 802, 803, 806, 458, 459, 58, 59, 60, 171,
- 338, 489, 61, 207, 369, 298, 368, 407, 490, 572,
- 573, 574, 575, 576, 570, 577, 352, 415, 353, 354,
- 417, 493, 494, 495, 62, 173, 63, 100, 299, 436,
- 595, 666, 704, 371, 435, 727, 284, 339, 500, 408,
- 501, 581, 582, 502, 627, 677, 503, 628, 678, 64,
- 65, 66, 67, 68, 287, 409, 583, 69, 70, 71,
- 176, 286, 72, 288, 410, 584, 73, 226, 227, 228,
- 309, 443, 229, 751, 771, 752, 74, 105, 302, 437,
- 598, 536, 599, 537, 596, 597, 355, 255, 325, 256,
- 75, 76, 106, 303, 181, 291, 425, 356, 426, 357,
- 421, 422, 420, 424
+ 77, 439, 79, 28, 108, 303, 437, 29, 30, 110,
+ 307, 441, 599, 667, 649, 668, 650, 651, 666, 704,
+ 783, 31, 111, 390, 32, 33, 117, 326, 449, 34,
+ 80, 35, 135, 325, 36, 37, 38, 119, 327, 462,
+ 39, 204, 366, 530, 40, 267, 41, 97, 258, 331,
+ 42, 43, 395, 463, 464, 555, 554, 394, 450, 544,
+ 551, 552, 543, 546, 545, 547, 541, 392, 445, 600,
+ 242, 209, 300, 103, 44, 451, 78, 291, 426, 586,
+ 184, 243, 398, 245, 246, 247, 248, 249, 250, 251,
+ 252, 253, 399, 452, 81, 195, 292, 474, 138, 139,
+ 140, 141, 47, 359, 428, 589, 360, 633, 662, 702,
+ 361, 362, 142, 143, 144, 145, 146, 147, 148, 149,
+ 150, 151, 48, 82, 49, 165, 335, 471, 402, 472,
+ 562, 404, 475, 564, 655, 563, 50, 83, 51, 275,
+ 405, 565, 656, 691, 739, 482, 712, 740, 713, 741,
+ 777, 736, 714, 742, 715, 738, 737, 775, 762, 776,
+ 52, 53, 54, 84, 293, 429, 590, 527, 591, 664,
+ 528, 157, 332, 468, 158, 266, 396, 159, 333, 469,
+ 160, 161, 334, 470, 162, 363, 427, 523, 588, 524,
+ 587, 663, 453, 349, 410, 584, 660, 699, 350, 411,
+ 585, 661, 701, 454, 85, 294, 430, 592, 455, 607,
+ 670, 707, 755, 456, 549, 466, 553, 654, 690, 658,
+ 674, 675, 694, 718, 765, 695, 716, 764, 689, 705,
+ 706, 732, 753, 785, 733, 754, 786, 510, 734, 697,
+ 719, 766, 680, 700, 746, 723, 747, 782, 774, 787,
+ 799, 801, 802, 805, 457, 458, 58, 59, 60, 171,
+ 337, 488, 61, 207, 368, 297, 367, 406, 489, 571,
+ 572, 573, 574, 575, 569, 576, 351, 414, 352, 353,
+ 416, 492, 493, 494, 62, 173, 63, 100, 298, 435,
+ 594, 665, 703, 370, 434, 726, 283, 338, 499, 407,
+ 500, 580, 581, 501, 626, 676, 502, 627, 677, 64,
+ 65, 66, 67, 68, 286, 408, 582, 69, 70, 71,
+ 176, 285, 72, 287, 409, 583, 73, 226, 227, 308,
+ 442, 228, 750, 770, 751, 74, 105, 301, 436, 597,
+ 535, 598, 536, 595, 596, 354, 254, 324, 255, 75,
+ 76, 106, 302, 181, 290, 424, 355, 425, 356, 420,
+ 421, 419, 423
};
/* TAO_YYPACT[STATE-NUM] -- Index in TAO_YYTABLE of the portion describing
STATE-NUM. */
-#define TAO_YYPACT_NINF -581
+#define TAO_YYPACT_NINF -561
static const tao_yytype_int16 tao_yypact[] =
{
- -581, 56, 1083, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, 86, 103, 33, 159, -581, 86, 86,
- -581, 49, 49, -581, -581, -581, -581, 23, -581, 317,
- -17, 39, -581, -581, -11, -581, -581, -581, -581, -581,
- -581, 220, -581, -581, -581, -581, -581, -581, 92, -581,
- 181, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, 110,
- -581, -581, -581, 110, -581, -581, 123, 126, 729, 49,
- 86, 576, 86, 86, 86, 86, -581, -581, -581, -5,
- 86, 5, -581, 64, 86, -581, 110, 86, 131, 139,
- 86, -581, 91, -581, 98, 239, 245, -581, 182, 167,
- 646, 42, -581, -581, 191, 237, -581, 207, 214, 217,
- 46, -581, 119, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, 233, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, -581, 181, -581, -581, -581, -49, -581,
- 226, -581, 229, 234, 235, 232, -581, 244, 248, 250,
- 254, 238, 255, 256, 258, -581, -581, -581, 260, 262,
- -581, -581, -581, 233, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, 233, -581, -581, -581, -581, -581, -581,
- -581, -581, 264, -581, 266, -581, -581, 241, -581, 86,
- -581, -581, -581, -581, -581, -581, -581, 729, -581, -581,
- -581, 268, -581, -581, -581, -581, 319, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, 57,
- 57, 57, 42, 233, -581, -581, 269, 261, 265, 140,
- 73, 58, -581, -581, -581, 243, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, 349, -581, 271, 316, -581,
- -581, -581, -581, -581, -581, -581, 263, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, 316, 278, 283, -581,
- -581, 247, 86, 86, 286, 290, -581, -581, -581, 291,
- -581, 86, 294, 241, -581, -581, 380, -581, 300, 304,
- -581, -581, -581, 293, 42, 42, 42, 42, 42, 42,
- 42, 42, 42, 42, -581, 308, 49, -581, -581, -581,
- -581, 49, -581, 42, 42, 42, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, 43, 342, 49, 49, -581,
- -581, -581, -581, -581, 43, -581, -581, -581, -581, 297,
- -581, -581, -581, -581, -581, -581, -581, -581, 49, 316,
- -581, -581, -581, -581, -581, -581, 1161, 315, -581, -581,
- -581, 261, 265, 140, 73, 73, 58, 58, -581, -581,
- -581, 86, 42, -581, 233, 942, 768, 612, -581, -581,
- -581, -581, -581, -581, -581, 246, 281, 367, 884, -581,
- -581, 374, 88, -581, 233, 86, -581, -581, 62, 70,
- 321, 322, 323, 86, 324, 325, 247, 329, 307, 326,
- 410, -581, 977, 233, -581, 49, 316, 141, 327, 335,
- -581, -581, 330, 646, -581, -581, 338, -581, -581, -581,
- 343, -581, -581, -581, -581, -581, -581, 173, -581, -581,
- -581, -581, -581, 344, -581, -581, -581, 348, -581, 352,
- 354, 355, 351, 358, -581, -581, -581, 439, 233, -581,
- -581, -581, -581, -581, -581, 49, 49, 49, -581, 361,
- -581, -581, -581, -581, -581, -581, -581, 86, 86, -581,
- 362, -581, -581, -581, 1035, 826, -581, 233, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- 363, 364, 233, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, 368, -581, 370, 371, 372, 373, 378, -581,
- -581, -581, 379, 386, 449, 246, 246, -581, -581, -581,
- -581, -581, -581, -581, 388, 86, 375, 75, 75, 75,
- 389, -581, 391, 392, 394, 395, 396, 401, -581, -581,
- -581, 402, 403, 405, 407, 88, 86, 42, 42, 307,
- 86, 408, 406, 409, -581, 432, 414, 415, 416, 141,
- 1136, 49, -581, -581, -581, -581, -581, -581, 498, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, 400, 400, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, 420, 233, -581, 400, 422, 418, 473, -581,
- -581, 86, 454, 421, 411, 410, 49, 49, 423, 419,
- -581, 412, -581, -581, -581, 417, 476, 475, 475, -581,
- -581, -581, -581, -581, -581, 233, 233, -581, -581, 424,
- -581, 475, 166, -581, -581, 425, -581, -581, -581, -581,
- 475, 413, 470, 86, 474, 446, 434, 178, 475, -581,
- -581, -581, -581, -581, -581, -581, -581, 88, -581, 447,
- 437, -581, -581, -581, -581, -581, 49, -581, 537, -581,
- -581, -581, -581, 438, -581, -581, -581, 457, 42, 453,
- 458, 65, 576, 117, -581, -581, -581, 49, 442, 233,
- -581, 459, -581, -581, 455, 88, 508, -581, -581, -581,
- -581, -581, -581, -581, -581, 86, 476, 49, 448, -581,
- -581, 462, -581, -581, -581, -581, 460, 86, 464, -581,
- -581, 456, -581, 49, 554, 537, 178, 86, 461, -581,
- -581, -581, -581, 463, -581, -581, -581, -581, -581, -581,
- 483, -581, 465, 469, -581, -581, 486, -581
+ -561, 48, 1137, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, 98, 60, 33, 1, -561, 98, 98,
+ -561, 42, 42, -561, -561, -561, -561, -12, -561, 269,
+ 53, 55, -561, -561, -5, -561, -561, -561, -561, -561,
+ -561, 219, -561, -561, -561, -561, -561, -561, 69, -561,
+ 113, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, 58,
+ -561, -561, -561, 58, -561, -561, 72, 82, 728, 42,
+ 98, 575, 98, 98, 98, 98, -561, -561, -561, 54,
+ 98, 56, -561, 81, 98, -561, 58, 98, 91, 94,
+ 98, -561, 22, -561, 24, 180, 182, -561, 104, 114,
+ 426, 35, -561, -561, 132, 175, -561, 155, 162, 181,
+ 49, -561, 112, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, 196, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, 113, -561, -561, -561, 16, -561,
+ 186, -561, 189, 195, 201, 202, -561, 207, 210, 213,
+ 218, 220, 222, 225, 223, -561, -561, -561, 227, 228,
+ -561, -561, -561, 196, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, 196, -561, -561, -561, -561, -561, -561,
+ -561, -561, 229, -561, 230, -561, -561, 231, -561, 98,
+ -561, -561, -561, -561, -561, -561, -561, 728, -561, -561,
+ -561, 232, -561, -561, -561, -561, 312, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, 50, 50,
+ 50, 35, 196, -561, -561, 224, 234, 235, -40, 73,
+ 89, -561, -561, -561, 242, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, 311, -561, 244, 276, -561, -561,
+ -561, -561, -561, -561, -561, 236, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, 276, 248, 251, -561, -561,
+ 126, 98, 98, 253, 254, -561, -561, -561, 252, -561,
+ 98, 255, 231, -561, -561, 340, -561, 257, 260, -561,
+ -561, -561, 241, 35, 35, 35, 35, 35, 35, 35,
+ 35, 35, 35, -561, 263, 42, -561, -561, -561, -561,
+ 42, -561, 35, 35, 35, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, 97, 290, 42, 42, -561, -561,
+ -561, -561, -561, 97, -561, -561, -561, -561, 256, -561,
+ -561, -561, -561, -561, -561, -561, -561, 42, 276, -561,
+ -561, -561, -561, -561, -561, 1215, 266, -561, -561, -561,
+ 234, 235, -40, 73, 73, 89, 89, -561, -561, -561,
+ 98, 35, -561, 196, 941, 767, 611, -561, -561, -561,
+ -561, -561, -561, -561, 245, 80, 150, 883, -561, -561,
+ 325, 1114, -561, 196, 98, -561, -561, 62, 65, 273,
+ 274, 277, 98, 278, 281, 126, 272, 261, 270, 366,
+ -561, 976, 196, -561, 42, 276, 108, 284, 288, -561,
+ -561, 293, 426, -561, -561, 289, -561, -561, -561, 295,
+ -561, -561, -561, -561, -561, -561, 1067, -561, -561, -561,
+ -561, -561, 296, -561, -561, -561, 303, -561, 305, 306,
+ 307, 310, 313, -561, -561, -561, 390, 196, -561, -561,
+ -561, -561, -561, -561, 42, 42, 42, -561, 316, -561,
+ -561, -561, -561, -561, -561, -561, 98, 98, -561, 317,
+ -561, -561, -561, 1034, 825, -561, 196, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, 318,
+ 319, 196, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, 314, -561, 322, 323, 326, 327, 328, -561, -561,
+ -561, 330, 331, 407, 245, 245, -561, -561, -561, -561,
+ -561, -561, -561, 332, 98, 315, 75, 75, 75, 335,
+ -561, 336, 341, 342, 343, 344, 346, -561, -561, -561,
+ 348, 350, 353, 355, 1114, 98, 35, 35, 261, 98,
+ 356, 357, 362, -561, 371, 359, 367, 364, 108, 1162,
+ 42, -561, -561, -561, -561, -561, -561, 452, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, 354, 354, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, 372, 196, -561, 354, 377, 383, 428, -561, -561,
+ 98, 417, 382, 373, 366, 42, 42, 389, 418, -561,
+ 375, -561, -561, -561, 384, 445, 447, 447, -561, -561,
+ -561, -561, -561, -561, 196, 196, -561, -561, 388, -561,
+ 447, 45, -561, -561, 391, -561, -561, -561, -561, 447,
+ 393, 424, 98, 437, 409, 395, 170, 447, -561, -561,
+ -561, -561, -561, -561, -561, -561, 1114, -561, 408, 398,
+ -561, -561, -561, -561, -561, 42, -561, 498, -561, -561,
+ -561, -561, 399, -561, -561, -561, 419, 35, 413, 420,
+ 63, 575, 164, -561, -561, -561, 42, 404, 196, -561,
+ 421, -561, -561, 422, 1114, 469, -561, -561, -561, -561,
+ -561, -561, -561, -561, 98, 445, 42, 406, -561, -561,
+ 423, -561, -561, -561, -561, 425, 98, 427, -561, -561,
+ 416, -561, 42, 508, 498, 170, 98, 429, -561, -561,
+ -561, -561, 430, -561, -561, -561, -561, -561, -561, 451,
+ -561, 433, 436, -561, -561, 457, -561
};
/* TAO_YYPGOTO[NTERM-NUM]. */
static const tao_yytype_int16 tao_yypgoto[] =
{
- -581, -581, -581, -581, -581, -581, 18, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, 560, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -105, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, 236,
- -581, -581, 19, -581, -581, -581, 551, -581, -581, -581,
- -581, -581, -581, -581, 555, -581, 267, -581, -581, -257,
- -581, -581, 161, -581, -581, -581, -581, -326, -358, -581,
- -581, -581, -581, -581, -581, -581, -581, -313, -581, -581,
- -20, -581, -581, -13, -581, 6, -581, -581, -581, -581,
- 357, -15, -94, -581, 284, 288, 253, -31, -18, -103,
- 34, -581, -307, 11, -581, -581, -581, -37, 179, -381,
- -581, -581, -581, 10, -581, -581, -560, -83, -581, -581,
- -3, -581, -56, -581, -581, -43, -42, -55, -53, -52,
- -581, -581, -34, -581, -32, -581, -581, -581, -581, 149,
- 272, -581, -247, -581, -581, -581, -30, -581, -26, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -159, -581,
- -581, -581, -581, -581, -139, -581, -581, -581, -581, -581,
- -581, -581, -38, -581, -581, -581, -581, -581, -581, -581,
- -60, -581, -581, -581, -581, -581, -581, -66, -581, -581,
- -581, -54, -581, -581, -581, -581, -581, -581, -581, 20,
- -581, -581, -254, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, 12, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -580,
- -581, -581, -581, -581, -581, -156, -581, -581, -581, -581,
- -581, -581, -581, -581, -179, -581, -581, -425, -581, -498,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, -581, 14, 17, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, 310, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -374, 279, -373, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- 543, -581, -581, -581, -581, -581, -581, -581, -581, -581,
- -581, -581, 175, -581, -581, -166, -581, -581, -581, -581,
- -581, -581, -581, 35, -581, -581, 225, -581, -581, 249,
- -581, -581, -581, -581, -581, -581, -581, -581, -581, 209,
- -581, -581, -581, -581
+ -561, -561, -561, -561, -561, -561, 18, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, 535, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -130, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, 194,
+ -561, -561, 109, -561, -561, -561, 523, -561, -561, -561,
+ -561, -561, -561, -561, 525, -561, 205, -561, -561, -251,
+ -561, -561, 133, -561, -561, -561, -561, -310, -355, -561,
+ -561, -561, -561, -561, -561, -561, -561, -312, -561, -561,
+ -20, -561, -561, -13, -561, 6, -561, -561, -561, -561,
+ 324, -41, -94, -561, 233, 238, 243, -67, -18, -108,
+ 44, -561, -306, 11, -561, -561, -561, -37, 147, -381,
+ -561, -561, -561, -17, -561, -561, -560, -116, -561, -561,
+ -3, -561, -56, -561, -561, -43, -42, -55, -53, -52,
+ -561, -561, -34, -561, -32, -561, -561, -561, -561, 118,
+ 214, -561, -303, -561, -561, -561, -30, -561, -26, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -190, -561,
+ -561, -561, -561, -561, -186, -561, -561, -561, -561, -561,
+ -561, -561, -38, -561, -561, -561, -561, -561, -561, -561,
+ -107, -561, -561, -561, -561, -561, -561, -66, -561, -561,
+ -561, -54, -561, -561, -561, -561, -561, -561, -561, -29,
+ -561, -561, -253, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, 12, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, -548,
+ -561, -561, -561, -561, -561, -205, -561, -561, -561, -561,
+ -561, -561, -561, -561, -224, -561, -561, -425, -561, -405,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, 14, 17, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, 264, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -374, 209, -373, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ 490, -561, -561, -561, -561, -561, -561, -561, -561, -561,
+ -561, 123, -561, -561, -217, -561, -561, -561, -561, -561,
+ -561, -561, -28, -561, -561, 163, -561, -561, 177, -561,
+ -561, -561, -561, -561, -561, -561, -561, -561, 146, -561,
+ -561, -561, -561
};
/* TAO_YYTABLE[TAO_YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -1452,257 +1452,267 @@ static const tao_yytype_int16 tao_yypgoto[] =
static const tao_yytype_int16 tao_yytable[] =
{
87, 102, 104, 156, 137, 98, 99, 152, 45, 153,
- 88, 154, 191, 46, 55, 155, 56, 245, 398, 57,
- 26, 136, 185, 188, 192, 189, 190, 401, 402, 340,
- 639, 508, 551, 491, 492, 186, 187, 349, 466, 7,
- 269, 432, 270, 156, 196, 86, 86, 152, 660, 153,
- 499, 154, 86, 116, 263, 155, 3, 264, 183, 193,
- 86, 136, 413, 534, 535, 513, 710, 194, 112, 197,
- 198, 199, 200, 514, -140, 672, 508, 202, 86, 115,
- -141, 205, 17, 504, 206, 115, 90, 208, 175, 86,
- -142, 86, 175, 711, 712, 115, 120, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 201, 7,
- 203, 107, 434, 133, 134, 230, 231, 232, 233, 234,
- 235, 236, 101, 101, 113, 237, 238, 265, 266, 101,
- 230, 231, 232, 233, 234, 235, 236, 101, 239, 240,
- 237, 238, 211, 241, 242, 711, 712, 466, 313, -100,
- 211, 191, -283, 488, 115, 211, 321, 322, 323, 242,
- 633, 185, 188, 192, 189, 190, 210, 710, 101, 319,
- 320, 211, 349, 212, 186, 187, 86, -301, 211, 533,
- 699, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 709, 711, 712, 300, 183, 133, 134,
- 115, 345, 721, 166, 508, 779, 346, 549, 17, 180,
- 736, 182, 94, 730, 731, 732, -422, 790, 388, 389,
- 390, 317, 318, 86, -494, 534, 535, 797, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 9, 10, 213, 11, 132, 133, 134, 474, 214, 86,
- 89, 91, 216, 101, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 9, 10, 215, 11,
- 132, 133, 134, 310, 311, 312, 257, 343, 344, 358,
- 359, 637, 93, 96, 86, 258, 384, 385, 372, 477,
- 121, 122, 744, 260, 125, 126, 127, 128, 245, 261,
- 101, 386, 387, 262, 11, -101, 394, 345, 612, 613,
- 115, 394, 346, 211, 271, 347, 348, 272, 275, 273,
- 274, -46, 307, -46, 281, 414, 101, 418, 419, 277,
- 773, 297, 324, 278, 414, 279, 508, -46, -46, 280,
- 282, -46, 283, 285, -46, 289, 509, 290, 433, -495,
- 479, 480, 296, 481, 482, 315, 306, 329, 510, 330,
- 316, 101, 314, 331, 341, 337, -46, 156, 484, 342,
- -46, 152, 365, 153, 508, 154, 366, 136, 444, 155,
- 373, 370, 45, 377, -46, 136, 478, 46, 55, 378,
- 56, 509, 507, 57, 439, 379, 380, 343, 344, 392,
- 416, -330, 512, 510, 441, 506, 515, 516, 517, 519,
- 518, 523, 520, 527, 538, 532, 539, 526, 485, 486,
- 4, 522, -8, 5, 6, 7, 8, 345, 487, 541,
- 543, 557, 346, 558, 768, 347, 348, 507, 562, 9,
- 10, 559, 11, 560, 561, -258, 12, 263, 571, 580,
- -353, 594, 611, 602, 781, 603, 604, 605, 606, 13,
- 14, 15, 16, 607, 609, 567, 568, 569, 17, 18,
- 793, 610, 19, 614, 620, 20, 621, 622, 616, 623,
- 624, 625, 21, 22, 578, 579, 626, 629, 630, 23,
- 24, 648, 631, 245, 632, 640, 642, 641, 643, 644,
- 645, 654, 658, 646, 674, 670, -52, 673, -371, 680,
- 687, 694, 682, 697, 689, 722, 683, 156, 156, 509,
- 693, 152, 152, 153, 153, 154, 154, -380, 718, 155,
- 155, 510, 723, 726, 728, 136, 136, 729, 745, 746,
- 750, 753, 757, 759, 769, 760, 772, 774, 770, 791,
- 789, 782, 359, 785, 617, 618, 619, 794, 801, 792,
- 805, 807, 27, 798, 688, 507, 799, 95, 804, 383,
- 92, 505, 636, 87, 305, 615, 468, 359, 679, 86,
- 530, 653, 761, 635, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 9, 10, 381, 11,
- 132, 133, 134, 382, 764, 684, 45, 796, 404, 638,
- 780, 46, 55, 374, 56, 86, 177, 57, 540, 795,
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 130, 131, 496, 423, 647, 521, 132, 133, 134, 0,
- 0, 445, 0, 0, 758, 0, 685, 686, 87, 0,
- 217, 509, 218, 0, 0, 0, 101, 0, 635, 0,
- 0, 0, 0, 510, 0, 0, 219, 220, 0, 0,
- 221, 0, 0, 222, 0, 45, 0, 0, 0, 0,
- 46, 55, 0, 56, 0, 0, 57, 0, 0, 509,
- 87, 0, 101, 0, 0, 223, 0, 507, 0, 224,
- 725, 510, 0, 0, 156, 762, 749, 0, 152, 0,
- 153, 0, 154, 225, 0, 0, 155, 0, 0, 0,
- 0, 0, 136, 0, 0, 0, 0, 394, 0, 0,
- 0, 0, 86, 0, 0, 507, 0, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 394, 0, 0,
- 0, 0, 359, 0, 133, 134, 0, 0, 0, 0,
- 0, 0, 0, 394, 359, 0, 0, 0, 0, 447,
- 0, -362, 5, 0, 359, 8, -362, -362, -362, -362,
- -362, -362, -362, -362, -362, -362, -362, -362, 9, 10,
- 0, 11, 0, -362, -362, 12, 0, 0, 343, 344,
- 448, 449, -362, 0, 0, 0, 0, 0, 13, 101,
- 0, 0, 460, 461, 462, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 447, 0, -362,
- 5, 21, 22, 8, -362, -362, -362, -362, -362, -362,
- -362, -362, -362, -362, -362, -362, 9, 10, -362, 11,
- 0, -362, -362, 12, 0, -86, 343, 344, 448, 449,
- -362, 0, 0, 0, 0, 0, 13, 0, 0, 0,
- 460, 461, 462, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 447, 0, -362, 5, 21,
- 22, 8, -362, -362, -362, -362, -362, -362, -362, -362,
- -362, -362, -362, -362, 9, 10, -362, 11, 0, -362,
- -362, 12, 0, -507, 343, 344, 448, 449, -362, 0,
- 0, 0, 0, 0, 13, 0, 0, 0, 497, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 498, 0,
- 0, 0, 0, 447, 0, -362, 5, 21, 22, 8,
- -362, -362, -362, -362, -362, -362, -362, -362, -362, -362,
- -362, -362, 9, 10, -362, 11, 0, -362, -362, 12,
- 0, -474, 343, 344, 448, 449, -362, 0, 447, 0,
- -362, 5, 13, 0, 8, -362, -362, -362, -362, -362,
+ 88, 154, 191, 46, 55, 155, 56, 244, 397, 57,
+ 26, 136, 185, 188, 192, 189, 190, 400, 401, 638,
+ 507, 550, 490, 491, 339, 186, 187, 348, 86, 7,
+ 465, 316, 317, 156, 196, 86, 709, 152, 3, 153,
+ 17, 154, 498, 86, 94, 155, 431, 262, 183, 193,
+ 263, 136, 533, 534, 709, 512, 7, 194, 513, 197,
+ 198, 199, 200, 710, 711, 507, 107, 202, 86, 659,
+ -140, 205, 17, 86, 206, 115, 90, 208, 476, 121,
+ 122, 710, 711, 125, 126, 127, 128, 210, 503, 212,
+ 86, 86, 211, 11, 211, 268, 671, 269, 229, 230,
+ 231, 232, 233, 234, 235, 101, 412, 433, 236, 237,
+ 264, 265, 101, 229, 230, 231, 232, 233, 234, 235,
+ 101, 238, 239, 236, 237, 166, 240, 241, 112, -141,
+ 113, -142, 211, 116, 115, 211, 115, 312, 115, 465,
+ -283, 191, 241, 487, -301, 211, 342, 343, 180, 632,
+ 101, 185, 188, 192, 189, 190, -100, 182, 344, 318,
+ 319, 115, 348, 345, 186, 187, -422, 101, 175, -494,
+ 342, 343, 175, 213, 532, 214, 344, 320, 321, 322,
+ 215, 345, 710, 711, 346, 347, 299, 183, 201, 216,
+ 203, 484, 485, 507, 778, 729, 730, 731, 89, 91,
+ 344, 486, 387, 388, 389, 345, 789, 256, 346, 347,
+ 93, 96, 86, 257, 533, 534, 796, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 9,
+ 10, 259, 11, 132, 133, 134, 473, 260, 86, 383,
+ 384, 611, 612, 120, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 9, 10, 261, 11, 132,
+ 133, 134, 698, -46, 270, -46, 211, 271, 357, 358,
+ 272, 636, 309, 310, 311, 708, 273, 371, 274, -46,
+ -46, 743, 276, -46, 720, 277, -46, 244, 278, 101,
+ 385, 386, 735, 279, -101, 393, 280, 281, 284, 115,
+ 393, 282, 288, 289, -495, 306, 295, 313, -46, 328,
+ 305, 296, -46, 330, 413, 101, 417, 418, 314, 772,
+ 315, 323, 329, 413, 340, 507, -46, 341, 336, 364,
+ 365, 372, 369, 376, 379, 508, 377, 432, 415, 478,
+ 479, 378, 480, 481, 391, 440, 505, 509, 514, 515,
+ -330, 525, 516, 518, 521, 522, 156, 483, 519, 526,
+ 152, 537, 153, 507, 154, -8, 136, 443, 155, 538,
+ 540, 45, 542, 556, 136, 477, 46, 55, 557, 56,
+ 508, 506, 57, 438, 558, 559, 560, 561, 262, 601,
+ -258, 511, 509, 570, 579, -353, 593, 602, 603, 517,
+ 610, 604, 605, 606, 531, 608, 609, 613, 615, 4,
+ 619, 620, 5, 6, 7, 8, 621, 622, 623, 624,
+ 217, 625, 218, 628, 767, 629, 506, 642, 9, 10,
+ 630, 11, 631, 639, 643, 12, 219, 220, 640, 641,
+ 221, 645, 644, 222, 780, 653, 657, 669, 13, 14,
+ 15, 16, 672, -371, 566, 567, 568, 17, 18, 673,
+ 792, 19, 679, 681, 20, 223, 686, 688, 682, 224,
+ 693, 21, 22, 577, 578, 696, 722, 692, 23, 24,
+ 647, -380, 244, 225, 717, 721, 725, 727, 728, 744,
+ 745, 749, 752, 758, 756, -52, 768, 759, 773, 781,
+ 769, 793, 790, 771, 784, 788, 156, 156, 508, 791,
+ 152, 152, 153, 153, 154, 154, 800, 804, 155, 155,
+ 509, 797, 806, 798, 136, 136, 803, 27, 687, 95,
+ 92, 304, 504, 467, 678, 635, 380, 614, 529, 403,
+ 760, 358, 381, 616, 617, 618, 763, 683, 382, 637,
+ 779, 795, 422, 177, 506, 539, 373, 794, 444, 495,
+ 646, 520, 87, 0, 0, 0, 358, 0, 86, 0,
+ 652, 0, 634, 120, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 9, 10, 0, 11, 132,
+ 133, 134, 0, 0, 0, 45, 0, 0, 0, 0,
+ 46, 55, 0, 56, 86, 0, 57, 0, 0, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+ 131, 0, 0, 0, 0, 132, 133, 134, 0, 0,
+ 0, 0, 0, 757, 0, 684, 685, 87, 0, 0,
+ 508, 0, 0, 0, 0, 101, 0, 634, 0, 0,
+ 0, 0, 509, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 45, 0, 0, 0, 0, 46,
+ 55, 0, 56, 0, 0, 57, 0, 0, 508, 87,
+ 0, 101, 0, 0, 0, 0, 506, 0, 0, 724,
+ 509, 0, 0, 156, 761, 748, 0, 152, 0, 153,
+ 0, 154, 0, 0, 0, 155, 0, 0, 0, 0,
+ 0, 136, 0, 0, 0, 0, 393, 0, 0, 0,
+ 0, 86, 0, 0, 506, 0, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 393, 0, 0, 0,
+ 0, 358, 0, 133, 134, 0, 0, 0, 0, 0,
+ 0, 0, 393, 358, 0, 0, 0, 0, 446, 0,
+ -362, 5, 0, 358, 8, -362, -362, -362, -362, -362,
-362, -362, -362, -362, -362, -362, -362, 9, 10, 0,
- 11, 0, -362, -362, 12, 21, 22, 343, 344, 448,
- 449, -362, 0, 0, 0, 0, 0, 13, 0, 0,
- 0, 0, -362, 0, 0, 0, 0, 0, 0, -68,
- 0, 0, 0, 0, 0, 0, 447, 0, -362, 5,
+ 11, 0, -362, -362, 12, 0, 0, 342, 343, 447,
+ 448, -362, 0, 0, 0, 0, 0, 13, 101, 0,
+ 0, 459, 460, 461, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 446, 0, -362, 5,
21, 22, 8, -362, -362, -362, -362, -362, -362, -362,
-362, -362, -362, -362, -362, 9, 10, -362, 11, 0,
- -362, -362, 12, 0, -90, 343, 344, 448, 449, -362,
- 0, 0, 0, 0, 0, 13, 0, 0, 0, 0,
- 0, 0, 0, -2, 4, 0, 0, 5, 6, 7,
- 8, 0, 0, 0, 0, 0, 0, 0, 21, 22,
- 0, 0, 0, 9, 10, 0, 11, 0, 0, 0,
- 12, 0, 0, 0, 0, -362, 0, 0, 0, 0,
- 0, 0, -498, 13, 14, 15, 16, 0, 0, 0,
- 0, 0, 17, 18, 0, 0, 19, 4, 0, 20,
- 5, 6, 7, 8, 0, 0, 21, 22, 0, 0,
- 0, 0, 0, 23, 24, 0, 9, 10, 0, 11,
- 0, 0, 4, 12, 0, 5, 6, 7, 8, 0,
- 0, 0, 0, 0, 0, 0, 13, 14, 15, 16,
- 0, 9, 10, 0, 11, 17, 18, 0, 12, 19,
- 0, 0, 20, 0, 0, 0, 0, 0, 0, 21,
- 22, 13, 14, 15, 16, 0, 23, 24, 648, 0,
- 17, 18, 0, 0, 19, 0, 0, 20, 0, 0,
- 0, 0, 0, 0, 21, 22, 0, 0, 0, 0,
- 0, 23, 24
+ -362, -362, 12, 0, -86, 342, 343, 447, 448, -362,
+ 0, 0, 0, 0, 0, 13, 0, 0, 0, 459,
+ 460, 461, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 446, 0, -362, 5, 21, 22,
+ 8, -362, -362, -362, -362, -362, -362, -362, -362, -362,
+ -362, -362, -362, 9, 10, -362, 11, 0, -362, -362,
+ 12, 0, -507, 342, 343, 447, 448, -362, 0, 0,
+ 0, 0, 0, 13, 0, 0, 0, 496, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 497, 0, 0,
+ 0, 0, 446, 0, -362, 5, 21, 22, 8, -362,
+ -362, -362, -362, -362, -362, -362, -362, -362, -362, -362,
+ -362, 9, 10, -362, 11, 0, -362, -362, 12, 0,
+ -474, 342, 343, 447, 448, -362, 0, 446, 0, -362,
+ 5, 13, 0, 8, -362, -362, -362, -362, -362, -362,
+ -362, -362, -362, -362, -362, -362, 9, 10, 0, 11,
+ 0, -362, -362, 12, 21, 22, 342, 343, 447, 448,
+ -362, 0, 0, 0, 0, 0, 13, 0, 0, 0,
+ 0, -362, 0, 0, 0, 0, 0, 0, -68, 0,
+ 0, 0, 0, 0, 0, 446, 0, -362, 5, 21,
+ 22, 8, -362, -362, -362, -362, -362, -362, -362, -362,
+ -362, -362, -362, -362, 9, 10, -362, 11, 0, -362,
+ -362, 12, 0, -90, 342, 343, 447, 448, -362, 0,
+ 86, 0, 0, 0, 13, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 0, 0, 0,
+ 0, 0, 133, 134, 0, 0, 0, 21, 22, 0,
+ 0, 548, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, -362, 0, 0, 86, 0, 0,
+ 0, -498, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 0, 0, 0, -2, 4, 133,
+ 134, 5, 6, 7, 8, 0, 0, 101, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 9, 10, 0,
+ 11, 0, 0, 4, 12, 0, 5, 6, 7, 8,
+ 0, 0, 0, 0, 0, 0, 0, 13, 14, 15,
+ 16, 0, 9, 10, 0, 11, 17, 18, 0, 12,
+ 19, 0, 0, 20, 101, 0, 0, 0, 0, 0,
+ 21, 22, 13, 14, 15, 16, 0, 23, 24, 0,
+ 0, 17, 18, 0, 0, 19, 4, 0, 20, 5,
+ 6, 7, 8, 0, 0, 21, 22, 0, 0, 0,
+ 0, 0, 23, 24, 647, 9, 10, 0, 11, 0,
+ 0, 0, 12, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 13, 14, 15, 16, 0,
+ 0, 0, 0, 0, 17, 18, 0, 0, 19, 0,
+ 0, 20, 0, 0, 0, 0, 0, 0, 21, 22,
+ 0, 0, 0, 0, 0, 23, 24
};
static const tao_yytype_int16 tao_yycheck[] =
{
13, 21, 22, 41, 41, 18, 19, 41, 2, 41,
- 13, 41, 78, 2, 2, 41, 2, 111, 331, 2,
- 2, 41, 78, 78, 78, 78, 78, 334, 335, 286,
- 590, 412, 457, 407, 407, 78, 78, 291, 396, 6,
- 89, 367, 91, 81, 81, 3, 3, 81, 628, 81,
- 408, 81, 3, 34, 8, 81, 0, 11, 78, 79,
- 3, 81, 19, 437, 437, 3, 1, 80, 85, 82,
- 83, 84, 85, 3, 85, 655, 457, 90, 3, 90,
- 85, 94, 49, 409, 97, 90, 53, 100, 69, 3,
- 85, 3, 73, 28, 29, 90, 8, 9, 10, 11,
- 12, 13, 14, 15, 16, 17, 18, 19, 89, 6,
- 91, 88, 369, 25, 26, 73, 74, 75, 76, 77,
- 78, 79, 80, 80, 85, 83, 84, 8, 9, 80,
- 73, 74, 75, 76, 77, 78, 79, 80, 96, 97,
- 83, 84, 80, 101, 102, 28, 29, 505, 242, 85,
- 80, 217, 87, 407, 90, 80, 98, 99, 100, 102,
- 585, 217, 217, 217, 217, 217, 75, 1, 80, 96,
- 97, 80, 426, 75, 217, 217, 3, 85, 80, 436,
- 678, 8, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 691, 28, 29, 209, 217, 25, 26,
- 90, 60, 700, 22, 585, 765, 65, 34, 49, 86,
- 708, 85, 53, 35, 36, 37, 85, 777, 321, 322,
- 323, 81, 82, 3, 85, 599, 599, 787, 8, 9,
- 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 3, 23, 24, 25, 26, 1, 3, 3,
- 14, 15, 85, 80, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 86, 23,
- 24, 25, 26, 239, 240, 241, 85, 30, 31, 292,
- 293, 588, 15, 16, 3, 48, 317, 318, 301, 8,
- 9, 10, 717, 86, 13, 14, 15, 16, 392, 85,
- 80, 319, 320, 86, 23, 85, 326, 60, 555, 556,
- 90, 331, 65, 80, 88, 68, 69, 88, 86, 85,
- 85, 4, 3, 6, 86, 345, 80, 347, 348, 85,
- 755, 90, 89, 85, 354, 85, 717, 20, 21, 85,
- 85, 24, 86, 85, 27, 85, 412, 85, 368, 85,
- 406, 406, 86, 406, 406, 94, 88, 8, 412, 88,
- 95, 80, 93, 47, 86, 102, 49, 405, 406, 86,
- 53, 405, 86, 405, 755, 405, 86, 397, 391, 405,
- 86, 90, 376, 3, 67, 405, 406, 376, 376, 89,
- 376, 457, 412, 376, 376, 91, 103, 30, 31, 91,
- 58, 104, 415, 457, 89, 31, 85, 85, 85, 85,
- 423, 104, 87, 3, 87, 435, 86, 91, 51, 52,
- 1, 92, 87, 4, 5, 6, 7, 60, 61, 91,
- 87, 87, 65, 85, 747, 68, 69, 457, 87, 20,
- 21, 89, 23, 89, 89, 87, 27, 8, 87, 87,
- 87, 87, 3, 85, 767, 85, 85, 85, 85, 40,
- 41, 42, 43, 85, 85, 485, 486, 487, 49, 50,
- 783, 85, 53, 85, 85, 56, 85, 85, 103, 85,
- 85, 85, 63, 64, 497, 498, 85, 85, 85, 70,
- 71, 72, 87, 587, 87, 87, 87, 91, 66, 85,
- 85, 3, 102, 87, 86, 85, 87, 85, 35, 55,
- 87, 35, 91, 38, 102, 102, 105, 555, 556, 585,
- 103, 555, 556, 555, 556, 555, 556, 103, 103, 555,
- 556, 585, 62, 59, 88, 555, 556, 103, 91, 102,
- 3, 103, 85, 90, 102, 87, 91, 39, 89, 85,
- 90, 103, 565, 91, 567, 568, 569, 3, 75, 103,
- 91, 75, 2, 102, 669, 585, 103, 16, 103, 316,
- 15, 410, 587, 586, 217, 565, 397, 590, 661, 3,
- 431, 601, 741, 586, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 314, 23,
- 24, 25, 26, 315, 743, 665, 600, 786, 336, 589,
- 766, 600, 600, 303, 600, 3, 73, 600, 443, 785,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 407, 354, 599, 426, 24, 25, 26, -1,
- -1, 392, -1, -1, 738, -1, 666, 667, 661, -1,
- 4, 717, 6, -1, -1, -1, 80, -1, 661, -1,
- -1, -1, -1, 717, -1, -1, 20, 21, -1, -1,
- 24, -1, -1, 27, -1, 669, -1, -1, -1, -1,
- 669, 669, -1, 669, -1, -1, 669, -1, -1, 755,
- 703, -1, 80, -1, -1, 49, -1, 717, -1, 53,
- 703, 755, -1, -1, 742, 742, 726, -1, 742, -1,
- 742, -1, 742, 67, -1, -1, 742, -1, -1, -1,
- -1, -1, 742, -1, -1, -1, -1, 747, -1, -1,
- -1, -1, 3, -1, -1, 755, -1, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, 17, 767, -1, -1,
- -1, -1, 765, -1, 25, 26, -1, -1, -1, -1,
- -1, -1, -1, 783, 777, -1, -1, -1, -1, 1,
- -1, 3, 4, -1, 787, 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, 80,
- -1, -1, 44, 45, 46, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 1, -1, 3,
- 4, 63, 64, 7, 8, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 80, 23,
- -1, 25, 26, 27, -1, 87, 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, 4, 63,
- 64, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 80, 23, -1, 25,
- 26, 27, -1, 87, 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, 3, 4, 63, 64, 7,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 80, 23, -1, 25, 26, 27,
- -1, 87, 30, 31, 32, 33, 34, -1, 1, -1,
- 3, 4, 40, -1, 7, 8, 9, 10, 11, 12,
+ 13, 41, 78, 2, 2, 41, 2, 111, 330, 2,
+ 2, 41, 78, 78, 78, 78, 78, 333, 334, 589,
+ 411, 456, 406, 406, 285, 78, 78, 290, 3, 6,
+ 395, 81, 82, 81, 81, 3, 1, 81, 0, 81,
+ 49, 81, 407, 3, 53, 81, 366, 8, 78, 79,
+ 11, 81, 436, 436, 1, 3, 6, 80, 3, 82,
+ 83, 84, 85, 28, 29, 456, 88, 90, 3, 627,
+ 85, 94, 49, 3, 97, 90, 53, 100, 8, 9,
+ 10, 28, 29, 13, 14, 15, 16, 75, 408, 75,
+ 3, 3, 80, 23, 80, 89, 654, 91, 73, 74,
+ 75, 76, 77, 78, 79, 80, 19, 368, 83, 84,
+ 8, 9, 80, 73, 74, 75, 76, 77, 78, 79,
+ 80, 96, 97, 83, 84, 22, 101, 102, 85, 85,
+ 85, 85, 80, 34, 90, 80, 90, 241, 90, 504,
+ 87, 217, 102, 406, 85, 80, 30, 31, 86, 584,
+ 80, 217, 217, 217, 217, 217, 85, 85, 60, 96,
+ 97, 90, 425, 65, 217, 217, 85, 80, 69, 85,
+ 30, 31, 73, 3, 435, 3, 60, 98, 99, 100,
+ 86, 65, 28, 29, 68, 69, 209, 217, 89, 85,
+ 91, 51, 52, 584, 764, 35, 36, 37, 14, 15,
+ 60, 61, 320, 321, 322, 65, 776, 85, 68, 69,
+ 15, 16, 3, 48, 598, 598, 786, 8, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 86, 23, 24, 25, 26, 1, 85, 3, 316,
+ 317, 554, 555, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 86, 23, 24,
+ 25, 26, 677, 4, 88, 6, 80, 88, 291, 292,
+ 85, 587, 238, 239, 240, 690, 85, 300, 86, 20,
+ 21, 716, 85, 24, 699, 85, 27, 391, 85, 80,
+ 318, 319, 707, 85, 85, 325, 86, 85, 85, 90,
+ 330, 86, 85, 85, 85, 3, 86, 93, 49, 8,
+ 88, 90, 53, 47, 344, 80, 346, 347, 94, 754,
+ 95, 89, 88, 353, 86, 716, 67, 86, 102, 86,
+ 86, 86, 90, 3, 103, 411, 89, 367, 58, 405,
+ 405, 91, 405, 405, 91, 89, 31, 411, 85, 85,
+ 104, 91, 85, 85, 92, 104, 404, 405, 87, 3,
+ 404, 87, 404, 754, 404, 87, 396, 390, 404, 86,
+ 91, 375, 87, 87, 404, 405, 375, 375, 85, 375,
+ 456, 411, 375, 375, 89, 89, 89, 87, 8, 85,
+ 87, 414, 456, 87, 87, 87, 87, 85, 85, 422,
+ 3, 85, 85, 85, 434, 85, 85, 85, 103, 1,
+ 85, 85, 4, 5, 6, 7, 85, 85, 85, 85,
+ 4, 85, 6, 85, 746, 85, 456, 66, 20, 21,
+ 87, 23, 87, 87, 85, 27, 20, 21, 91, 87,
+ 24, 87, 85, 27, 766, 3, 102, 85, 40, 41,
+ 42, 43, 85, 35, 484, 485, 486, 49, 50, 86,
+ 782, 53, 55, 91, 56, 49, 87, 102, 105, 53,
+ 35, 63, 64, 496, 497, 38, 62, 103, 70, 71,
+ 72, 103, 586, 67, 103, 102, 59, 88, 103, 91,
+ 102, 3, 103, 90, 85, 87, 102, 87, 39, 103,
+ 89, 3, 85, 91, 91, 90, 554, 555, 584, 103,
+ 554, 555, 554, 555, 554, 555, 75, 91, 554, 555,
+ 584, 102, 75, 103, 554, 555, 103, 2, 668, 16,
+ 15, 217, 409, 396, 660, 586, 313, 564, 430, 335,
+ 740, 564, 314, 566, 567, 568, 742, 664, 315, 588,
+ 765, 785, 353, 73, 584, 442, 302, 784, 391, 406,
+ 598, 425, 585, -1, -1, -1, 589, -1, 3, -1,
+ 600, -1, 585, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, -1, 23, 24,
+ 25, 26, -1, -1, -1, 599, -1, -1, -1, -1,
+ 599, 599, -1, 599, 3, -1, 599, -1, -1, 8,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, -1, -1, -1, -1, 24, 25, 26, -1, -1,
+ -1, -1, -1, 737, -1, 665, 666, 660, -1, -1,
+ 716, -1, -1, -1, -1, 80, -1, 660, -1, -1,
+ -1, -1, 716, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 668, -1, -1, -1, -1, 668,
+ 668, -1, 668, -1, -1, 668, -1, -1, 754, 702,
+ -1, 80, -1, -1, -1, -1, 716, -1, -1, 702,
+ 754, -1, -1, 741, 741, 725, -1, 741, -1, 741,
+ -1, 741, -1, -1, -1, 741, -1, -1, -1, -1,
+ -1, 741, -1, -1, -1, -1, 746, -1, -1, -1,
+ -1, 3, -1, -1, 754, -1, 8, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 766, -1, -1, -1,
+ -1, 764, -1, 25, 26, -1, -1, -1, -1, -1,
+ -1, -1, 782, 776, -1, -1, -1, -1, 1, -1,
+ 3, 4, -1, 786, 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, 80, -1, -1, -1, -1, -1, -1, 87,
+ 23, -1, 25, 26, 27, -1, -1, 30, 31, 32,
+ 33, 34, -1, -1, -1, -1, -1, 40, 80, -1,
+ -1, 44, 45, 46, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 1, -1, 3, 4,
63, 64, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 80, 23, -1,
25, 26, 27, -1, 87, 30, 31, 32, 33, 34,
- -1, -1, -1, -1, -1, 40, -1, -1, -1, -1,
- -1, -1, -1, 0, 1, -1, -1, 4, 5, 6,
- 7, -1, -1, -1, -1, -1, -1, -1, 63, 64,
- -1, -1, -1, 20, 21, -1, 23, -1, -1, -1,
- 27, -1, -1, -1, -1, 80, -1, -1, -1, -1,
- -1, -1, 87, 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, -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, 72, -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, 40, -1, -1, -1, 44,
+ 45, 46, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 1, -1, 3, 4, 63, 64,
+ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 80, 23, -1, 25, 26,
+ 27, -1, 87, 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, 3, 4, 63, 64, 7, 8,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 80, 23, -1, 25, 26, 27, -1,
+ 87, 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, 80, -1, -1, -1, -1, -1, -1, 87, -1,
+ -1, -1, -1, -1, -1, 1, -1, 3, 4, 63,
+ 64, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 80, 23, -1, 25,
+ 26, 27, -1, 87, 30, 31, 32, 33, 34, -1,
+ 3, -1, -1, -1, 40, 8, 9, 10, 11, 12,
+ 13, 14, 15, 16, 17, 18, 19, -1, -1, -1,
+ -1, -1, 25, 26, -1, -1, -1, 63, 64, -1,
+ -1, 34, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 80, -1, -1, 3, -1, -1,
+ -1, 87, 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, -1, -1, -1, 0, 1, 25,
+ 26, 4, 5, 6, 7, -1, -1, 80, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 20, 21, -1,
+ 23, -1, -1, 1, 27, -1, 4, 5, 6, 7,
+ -1, -1, -1, -1, -1, -1, -1, 40, 41, 42,
+ 43, -1, 20, 21, -1, 23, 49, 50, -1, 27,
+ 53, -1, -1, 56, 80, -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, -1, -1, 63, 64, -1, -1, -1,
+ -1, -1, 70, 71, 72, 20, 21, -1, 23, -1,
+ -1, -1, 27, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 40, 41, 42, 43, -1,
+ -1, -1, -1, -1, 49, 50, -1, -1, 53, -1,
+ -1, 56, -1, -1, -1, -1, -1, -1, 63, 64,
+ -1, -1, -1, -1, -1, 70, 71
};
/* TAO_YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1716,10 +1726,10 @@ static const tao_yytype_uint16 tao_yystos[] =
170, 172, 176, 177, 200, 201, 219, 228, 248, 250,
262, 264, 286, 287, 288, 329, 380, 381, 382, 383,
384, 388, 410, 412, 435, 436, 437, 438, 439, 443,
- 444, 445, 448, 452, 462, 476, 477, 126, 202, 128,
+ 444, 445, 448, 452, 461, 475, 476, 126, 202, 128,
156, 220, 249, 263, 289, 330, 3, 199, 236, 155,
53, 155, 170, 172, 53, 162, 172, 173, 199, 199,
- 413, 80, 196, 199, 196, 463, 478, 88, 130, 119,
+ 413, 80, 196, 199, 196, 462, 477, 88, 130, 119,
135, 148, 85, 85, 118, 90, 158, 152, 120, 163,
8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 24, 25, 26, 158, 196, 223, 224, 225,
@@ -1727,69 +1737,69 @@ static const tao_yytype_uint16 tao_yystos[] =
246, 247, 248, 250, 262, 264, 288, 297, 300, 303,
306, 307, 310, 116, 113, 251, 22, 117, 114, 115,
121, 385, 122, 411, 123, 158, 446, 446, 124, 125,
- 86, 480, 85, 196, 206, 238, 241, 242, 243, 244,
+ 86, 479, 85, 196, 206, 238, 241, 242, 243, 244,
245, 303, 307, 196, 199, 221, 223, 199, 199, 199,
199, 158, 199, 158, 167, 199, 199, 389, 199, 197,
75, 80, 75, 3, 3, 86, 85, 4, 6, 20,
- 21, 24, 27, 49, 53, 67, 453, 454, 455, 458,
- 73, 74, 75, 76, 77, 78, 79, 83, 84, 96,
- 97, 101, 102, 196, 207, 208, 209, 210, 211, 212,
- 213, 214, 215, 216, 217, 473, 475, 85, 48, 174,
- 86, 85, 86, 8, 11, 8, 9, 301, 171, 89,
- 91, 88, 88, 85, 85, 86, 265, 85, 85, 85,
- 85, 86, 85, 86, 422, 85, 447, 440, 449, 85,
- 85, 481, 203, 222, 290, 331, 86, 90, 391, 414,
- 199, 198, 464, 479, 131, 206, 88, 3, 136, 456,
- 216, 216, 216, 208, 93, 94, 95, 81, 82, 96,
- 97, 98, 99, 100, 89, 474, 159, 153, 164, 8,
- 88, 47, 175, 298, 304, 308, 252, 102, 386, 423,
- 175, 86, 86, 30, 31, 60, 65, 68, 69, 318,
- 319, 324, 402, 404, 405, 472, 483, 485, 199, 199,
- 229, 232, 236, 237, 311, 86, 86, 168, 392, 390,
- 90, 419, 199, 86, 391, 110, 111, 3, 89, 91,
- 103, 210, 211, 212, 213, 213, 214, 214, 215, 215,
- 215, 149, 91, 193, 196, 183, 178, 302, 193, 208,
- 218, 218, 218, 254, 256, 257, 266, 393, 425, 441,
- 450, 320, 325, 19, 196, 403, 58, 406, 196, 196,
- 488, 486, 487, 403, 489, 482, 484, 204, 312, 230,
- 291, 332, 183, 196, 175, 420, 415, 465, 132, 112,
- 127, 89, 137, 457, 199, 475, 194, 1, 32, 33,
- 154, 184, 201, 219, 318, 329, 334, 339, 380, 381,
- 44, 45, 46, 165, 179, 180, 184, 341, 224, 299,
- 305, 309, 253, 255, 1, 223, 258, 8, 196, 238,
- 243, 244, 245, 271, 288, 51, 52, 61, 318, 387,
- 394, 402, 404, 407, 408, 409, 472, 44, 54, 184,
- 424, 426, 429, 432, 183, 178, 31, 196, 225, 303,
- 307, 363, 199, 3, 3, 85, 85, 85, 199, 85,
- 87, 485, 92, 104, 313, 315, 91, 3, 293, 296,
- 255, 169, 196, 175, 402, 404, 467, 469, 87, 86,
- 458, 91, 192, 87, 188, 185, 190, 189, 191, 34,
- 340, 363, 186, 187, 342, 182, 181, 87, 85, 89,
- 89, 89, 87, 256, 261, 259, 267, 196, 196, 196,
- 400, 87, 395, 396, 397, 398, 399, 401, 199, 199,
- 87, 427, 428, 442, 451, 321, 326, 205, 316, 314,
- 231, 292, 294, 333, 87, 416, 470, 471, 466, 468,
- 138, 195, 85, 85, 85, 85, 85, 85, 335, 85,
- 85, 3, 258, 258, 85, 229, 103, 199, 199, 199,
- 85, 85, 85, 85, 85, 85, 85, 430, 433, 85,
- 85, 87, 87, 363, 233, 236, 207, 218, 315, 232,
- 87, 91, 87, 66, 85, 85, 87, 469, 72, 112,
- 140, 142, 143, 196, 3, 343, 260, 268, 102, 345,
- 345, 322, 327, 234, 317, 295, 417, 144, 139, 141,
- 85, 336, 345, 85, 86, 346, 347, 431, 434, 233,
- 55, 368, 91, 105, 296, 196, 196, 87, 142, 102,
- 354, 344, 269, 103, 35, 348, 351, 38, 365, 365,
- 323, 369, 328, 235, 418, 145, 355, 356, 337, 365,
- 1, 28, 29, 272, 274, 278, 280, 352, 103, 349,
- 366, 365, 102, 62, 371, 236, 59, 421, 88, 103,
- 35, 36, 37, 357, 360, 364, 365, 277, 282, 281,
- 270, 273, 275, 279, 363, 91, 102, 370, 372, 196,
- 3, 459, 461, 103, 358, 361, 338, 85, 208, 90,
- 87, 274, 223, 284, 280, 353, 350, 367, 193, 102,
- 89, 460, 91, 363, 39, 374, 283, 285, 276, 232,
- 351, 193, 103, 373, 146, 91, 359, 362, 375, 90,
- 232, 85, 103, 193, 3, 461, 360, 232, 102, 103,
- 376, 75, 377, 378, 103, 91, 379, 75
+ 21, 24, 27, 49, 53, 67, 453, 454, 457, 73,
+ 74, 75, 76, 77, 78, 79, 83, 84, 96, 97,
+ 101, 102, 196, 207, 208, 209, 210, 211, 212, 213,
+ 214, 215, 216, 217, 472, 474, 85, 48, 174, 86,
+ 85, 86, 8, 11, 8, 9, 301, 171, 89, 91,
+ 88, 88, 85, 85, 86, 265, 85, 85, 85, 85,
+ 86, 85, 86, 422, 85, 447, 440, 449, 85, 85,
+ 480, 203, 222, 290, 331, 86, 90, 391, 414, 199,
+ 198, 463, 478, 131, 206, 88, 3, 136, 455, 216,
+ 216, 216, 208, 93, 94, 95, 81, 82, 96, 97,
+ 98, 99, 100, 89, 473, 159, 153, 164, 8, 88,
+ 47, 175, 298, 304, 308, 252, 102, 386, 423, 175,
+ 86, 86, 30, 31, 60, 65, 68, 69, 318, 319,
+ 324, 402, 404, 405, 471, 482, 484, 199, 199, 229,
+ 232, 236, 237, 311, 86, 86, 168, 392, 390, 90,
+ 419, 199, 86, 391, 110, 111, 3, 89, 91, 103,
+ 210, 211, 212, 213, 213, 214, 214, 215, 215, 215,
+ 149, 91, 193, 196, 183, 178, 302, 193, 208, 218,
+ 218, 218, 254, 256, 257, 266, 393, 425, 441, 450,
+ 320, 325, 19, 196, 403, 58, 406, 196, 196, 487,
+ 485, 486, 403, 488, 481, 483, 204, 312, 230, 291,
+ 332, 183, 196, 175, 420, 415, 464, 132, 112, 127,
+ 89, 137, 456, 199, 474, 194, 1, 32, 33, 154,
+ 184, 201, 219, 318, 329, 334, 339, 380, 381, 44,
+ 45, 46, 165, 179, 180, 184, 341, 224, 299, 305,
+ 309, 253, 255, 1, 223, 258, 8, 196, 238, 243,
+ 244, 245, 271, 288, 51, 52, 61, 318, 387, 394,
+ 402, 404, 407, 408, 409, 471, 44, 54, 184, 424,
+ 426, 429, 432, 183, 178, 31, 196, 225, 303, 307,
+ 363, 199, 3, 3, 85, 85, 85, 199, 85, 87,
+ 484, 92, 104, 313, 315, 91, 3, 293, 296, 255,
+ 169, 196, 175, 402, 404, 466, 468, 87, 86, 457,
+ 91, 192, 87, 188, 185, 190, 189, 191, 34, 340,
+ 363, 186, 187, 342, 182, 181, 87, 85, 89, 89,
+ 89, 87, 256, 261, 259, 267, 196, 196, 196, 400,
+ 87, 395, 396, 397, 398, 399, 401, 199, 199, 87,
+ 427, 428, 442, 451, 321, 326, 205, 316, 314, 231,
+ 292, 294, 333, 87, 416, 469, 470, 465, 467, 138,
+ 195, 85, 85, 85, 85, 85, 85, 335, 85, 85,
+ 3, 258, 258, 85, 229, 103, 199, 199, 199, 85,
+ 85, 85, 85, 85, 85, 85, 430, 433, 85, 85,
+ 87, 87, 363, 233, 236, 207, 218, 315, 232, 87,
+ 91, 87, 66, 85, 85, 87, 468, 72, 112, 140,
+ 142, 143, 196, 3, 343, 260, 268, 102, 345, 345,
+ 322, 327, 234, 317, 295, 417, 144, 139, 141, 85,
+ 336, 345, 85, 86, 346, 347, 431, 434, 233, 55,
+ 368, 91, 105, 296, 196, 196, 87, 142, 102, 354,
+ 344, 269, 103, 35, 348, 351, 38, 365, 365, 323,
+ 369, 328, 235, 418, 145, 355, 356, 337, 365, 1,
+ 28, 29, 272, 274, 278, 280, 352, 103, 349, 366,
+ 365, 102, 62, 371, 236, 59, 421, 88, 103, 35,
+ 36, 37, 357, 360, 364, 365, 277, 282, 281, 270,
+ 273, 275, 279, 363, 91, 102, 370, 372, 196, 3,
+ 458, 460, 103, 358, 361, 338, 85, 208, 90, 87,
+ 274, 223, 284, 280, 353, 350, 367, 193, 102, 89,
+ 459, 91, 363, 39, 374, 283, 285, 276, 232, 351,
+ 193, 103, 373, 146, 91, 359, 362, 375, 90, 232,
+ 85, 103, 193, 3, 460, 360, 232, 102, 103, 376,
+ 75, 377, 378, 103, 91, 379, 75
};
#define tao_yyerrok (tao_yyerrstatus = 0)
@@ -8808,12 +8818,6 @@ tao_yyreduce:
case 520:
{
- }
- break;
-
- case 522:
-
- {
// formal_parameter formal_parameters
if ((tao_yyvsp[(2) - (2)].plval) == 0)
{
@@ -8828,7 +8832,7 @@ tao_yyreduce:
}
break;
- case 523:
+ case 521:
{
// formal_parameters : formal_parameters ','
@@ -8836,7 +8840,7 @@ tao_yyreduce:
}
break;
- case 524:
+ case 522:
{
// formal_parameter
@@ -8847,15 +8851,37 @@ tao_yyreduce:
1);
}
- (tao_yyvsp[(1) - (4)].plval)->enqueue_tail (*(tao_yyvsp[(4) - (4)].pival));
+ bool so_far_so_good =
+ idl_global->check_for_seq_of_param ((tao_yyvsp[(1) - (4)].plval),
+ (tao_yyvsp[(4) - (4)].pival));
+
+ if (so_far_so_good)
+ {
+ (tao_yyvsp[(1) - (4)].plval)->enqueue_tail (*(tao_yyvsp[(4) - (4)].pival));
+ (tao_yyval.plval) = (tao_yyvsp[(1) - (4)].plval);
+ }
+ else
+ {
+ delete (tao_yyvsp[(1) - (4)].plval);
+ (tao_yyvsp[(1) - (4)].plval) = 0;
+
+ // TODO - create a specific utl_err msg.
+ ACE_ERROR ((LM_ERROR,
+ ACE_TEXT ("bad param\n")));
+ }
+
delete (tao_yyvsp[(4) - (4)].pival);
(tao_yyvsp[(4) - (4)].pival) = 0;
- (tao_yyval.plval) = (tao_yyvsp[(1) - (4)].plval);
+ if (!so_far_so_good)
+ {
+ return 1;
+ }
+
}
break;
- case 525:
+ case 523:
{
// /* EMPTY */
@@ -8863,7 +8889,7 @@ tao_yyreduce:
}
break;
- case 526:
+ case 524:
{
// formal_parameter : formal_parameter_type IDENTIFIER
@@ -8877,14 +8903,28 @@ tao_yyreduce:
}
break;
- case 527:
+ case 525:
+
+ {
+ ACE_NEW_RETURN ((tao_yyval.pival),
+ FE_Utils::T_Param_Info,
+ 1);
+
+ (tao_yyval.pival)->type_ = AST_Decl::NT_sequence;
+ (tao_yyval.pival)->name_ = "sequence<";
+ (tao_yyval.pival)->name_ += (tao_yyvsp[(3) - (4)].strval);
+ (tao_yyval.pival)->name_ += '>';
+ }
+ break;
+
+ case 526:
{
(tao_yyval.slval) = 0;
}
break;
- case 528:
+ case 527:
{
// formal_parameter_names : formal_parameter_names ',' formal_parameter_name
@@ -8910,7 +8950,7 @@ tao_yyreduce:
}
break;
- case 529:
+ case 528:
{
// /* EMPTY */
@@ -8918,7 +8958,7 @@ tao_yyreduce:
}
break;
- case 530:
+ case 529:
{
// formal_parameter_name : IDENTIFIER
@@ -8928,7 +8968,7 @@ tao_yyreduce:
}
break;
- case 531:
+ case 530:
{
// porttype_decl : IDL_PORTTYPE
@@ -8936,7 +8976,7 @@ tao_yyreduce:
}
break;
- case 532:
+ case 531:
{
// IDENTIFIER
@@ -8944,7 +8984,7 @@ tao_yyreduce:
}
break;
- case 533:
+ case 532:
{
// '{'
@@ -8952,7 +8992,7 @@ tao_yyreduce:
}
break;
- case 534:
+ case 533:
{
// at_least_one_port_export
@@ -8960,7 +9000,7 @@ tao_yyreduce:
}
break;
- case 535:
+ case 534:
{
// '}'
@@ -8971,56 +9011,56 @@ tao_yyreduce:
}
break;
- case 536:
+ case 535:
{
// at_least_one_port_export : port_export port_exports
}
break;
- case 537:
+ case 536:
{
// port_exports : port_exports port_export
}
break;
- case 538:
+ case 537:
{
// | /* EMPTY */
}
break;
- case 539:
+ case 538:
{
// port_export : provides_decl
}
break;
- case 540:
+ case 539:
{
// ';'
}
break;
- case 541:
+ case 540:
{
// | uses_decl
}
break;
- case 542:
+ case 541:
{
// ';'
}
break;
- case 543:
+ case 542:
{
// extended_port_decl : IDL_PORT scoped_name IDENTIFIER
@@ -9092,7 +9132,7 @@ tao_yyreduce:
}
break;
- case 544:
+ case 543:
{
// | IDL_MIRRORPORT scoped_name IDENTIFIER
@@ -9142,7 +9182,7 @@ tao_yyreduce:
}
break;
- case 548:
+ case 547:
{
// actual_parameter : expression
@@ -9156,7 +9196,7 @@ tao_yyreduce:
}
break;
- case 550:
+ case 549:
{
// connector_header : IDL_CONNECTOR
@@ -9164,7 +9204,7 @@ tao_yyreduce:
}
break;
- case 551:
+ case 550:
{
// IDENTIFIER
@@ -9172,7 +9212,7 @@ tao_yyreduce:
}
break;
- case 552:
+ case 551:
{
// component_inheritance_spec
@@ -9227,7 +9267,7 @@ tao_yyreduce:
}
break;
- case 553:
+ case 552:
{
// connector_body " '{'
@@ -9235,7 +9275,7 @@ tao_yyreduce:
}
break;
- case 554:
+ case 553:
{
// at_least_one_connector_export
@@ -9243,7 +9283,7 @@ tao_yyreduce:
}
break;
- case 555:
+ case 554:
{
// '}
@@ -9254,7 +9294,7 @@ tao_yyreduce:
}
break;
- case 559:
+ case 558:
{
// connector_export : provides_decl
@@ -9262,7 +9302,7 @@ tao_yyreduce:
}
break;
- case 560:
+ case 559:
{
// ';'
@@ -9270,7 +9310,7 @@ tao_yyreduce:
}
break;
- case 561:
+ case 560:
{
// | uses_decl
@@ -9278,7 +9318,7 @@ tao_yyreduce:
}
break;
- case 562:
+ case 561:
{
// ';'
@@ -9286,7 +9326,7 @@ tao_yyreduce:
}
break;
- case 563:
+ case 562:
{
// | attribute
@@ -9294,7 +9334,7 @@ tao_yyreduce:
}
break;
- case 564:
+ case 563:
{
// ';'
@@ -9302,7 +9342,7 @@ tao_yyreduce:
}
break;
- case 565:
+ case 564:
{
// | extended_port_decl
@@ -9310,7 +9350,7 @@ tao_yyreduce:
}
break;
- case 566:
+ case 565:
{
// ';'
diff --git a/modules/TAO/TAO_IDL/include/ast_param_holder.h b/modules/TAO/TAO_IDL/include/ast_param_holder.h
index dff0929670c..f30386f2646 100644
--- a/modules/TAO/TAO_IDL/include/ast_param_holder.h
+++ b/modules/TAO/TAO_IDL/include/ast_param_holder.h
@@ -15,21 +15,21 @@ public:
AST_Param_Holder (Identifier *parameter_name);
virtual ~AST_Param_Holder (void);
-
- Identifier const * const param_name (void) const;
-
+
+ Identifier const * param_name (void) const;
+
// Narrowing.
DEF_NARROW_FROM_DECL (AST_Param_Holder);
// AST Dumping.
virtual void dump (ACE_OSTREAM_TYPE &o);
-
+
// Cleanup function.
virtual void destroy (void);
// Visiting.
virtual int ast_accept (ast_visitor *visitor);
-
+
private:
Identifier *param_name_;
};
diff --git a/modules/TAO/TAO_IDL/include/ast_template_module.h b/modules/TAO/TAO_IDL/include/ast_template_module.h
index 9eb2c3859a1..6ce9ed3a74d 100644
--- a/modules/TAO/TAO_IDL/include/ast_template_module.h
+++ b/modules/TAO/TAO_IDL/include/ast_template_module.h
@@ -19,22 +19,22 @@ public:
virtual ~AST_Template_Module (void);
- FE_Utils::T_PARAMLIST_INFO const * const
+ FE_Utils::T_PARAMLIST_INFO const *
template_params (void) const;
-
+
// Narrowing.
DEF_NARROW_FROM_DECL (AST_Template_Module);
DEF_NARROW_FROM_SCOPE (AST_Template_Module);
// AST Dumping.
virtual void dump (ACE_OSTREAM_TYPE &o);
-
+
// Cleanup function.
virtual void destroy (void);
// Visiting.
virtual int ast_accept (ast_visitor *visitor);
-
+
protected:
FE_Utils::T_PARAMLIST_INFO * template_params_;
};
diff --git a/modules/TAO/TAO_IDL/include/ast_template_module_inst.h b/modules/TAO/TAO_IDL/include/ast_template_module_inst.h
index ec3b7fe995a..32ac5293f47 100644
--- a/modules/TAO/TAO_IDL/include/ast_template_module_inst.h
+++ b/modules/TAO/TAO_IDL/include/ast_template_module_inst.h
@@ -21,7 +21,7 @@ public:
AST_Template_Module *ref (void) const;
- FE_Utils::T_ARGLIST const * const
+ FE_Utils::T_ARGLIST const *
template_args (void) const;
// Narrowing.
diff --git a/modules/TAO/TAO_IDL/include/ast_template_module_ref.h b/modules/TAO/TAO_IDL/include/ast_template_module_ref.h
index b8497861a8b..66c21b14391 100644
--- a/modules/TAO/TAO_IDL/include/ast_template_module_ref.h
+++ b/modules/TAO/TAO_IDL/include/ast_template_module_ref.h
@@ -18,23 +18,23 @@ public:
UTL_StrList *param_refs);
virtual ~AST_Template_Module_Ref (void);
-
+
AST_Template_Module *ref (void) const;
- UTL_StrList const * const param_refs (void) const;
-
+ UTL_StrList const * param_refs (void) const;
+
// Narrowing.
DEF_NARROW_FROM_DECL (AST_Template_Module_Ref);
// AST Dumping.
virtual void dump (ACE_OSTREAM_TYPE &o);
-
+
// Cleanup function.
virtual void destroy (void);
// Visiting.
virtual int ast_accept (ast_visitor *visitor);
-
+
private:
UTL_StrList * param_refs_;
};
diff --git a/modules/TAO/TAO_IDL/include/idl_global.h b/modules/TAO/TAO_IDL/include/idl_global.h
index d0e4352694c..7fd398473aa 100644
--- a/modules/TAO/TAO_IDL/include/idl_global.h
+++ b/modules/TAO/TAO_IDL/include/idl_global.h
@@ -78,6 +78,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "ast_predefined_type.h"
#include "ast_component.h"
#include "utl_stack.h"
+#include "fe_utils.h"
class AST_Root;
class AST_Generator;
@@ -647,6 +648,11 @@ public:
UTL_String *utl_string_factory (const char *str);
// Utility function to create UTL_String classes on the FE heap.
+ bool check_for_seq_of_param (FE_Utils::T_PARAMLIST_INFO *list,
+ FE_Utils::T_Param_Info *param);
+ // Check if 'param' is a sequence of a previous param, and if
+ // so, if the previous param exists.
+
#if defined (ACE_OPENVMS)
static char* translateName(const char* name, char *name_buf);
#endif
diff --git a/modules/TAO/TAO_IDL/util/utl_global.cpp b/modules/TAO/TAO_IDL/util/utl_global.cpp
index 59f2d700a29..63effc9899d 100644
--- a/modules/TAO/TAO_IDL/util/utl_global.cpp
+++ b/modules/TAO/TAO_IDL/util/utl_global.cpp
@@ -86,10 +86,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "ace/OS_NS_ctype.h"
#include "ace/Env_Value_T.h"
-ACE_RCSID (util,
- utl_global,
- "$Id$")
-
// Define an increment for the size of the array used to store names of
// included files.
#undef INCREMENT
@@ -1799,6 +1795,14 @@ IDL_GlobalData::utl_string_factory (const char *str)
return new UTL_String (str);
}
+bool
+IDL_GlobalData::check_for_seq_of_param (FE_Utils::T_PARAMLIST_INFO *list,
+ FE_Utils::T_Param_Info *param)
+{
+ // TODO
+ return true;
+}
+
void
IDL_GlobalData::add_dcps_data_type (const char* id)
{
View Lorry Controller Status