diff options
| author | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-11-19 18:58:12 -0600 |
|---|---|---|
| committer | Fred Hornsey <hornseyf@objectcomputing.com> | 2018-11-19 18:58:12 -0600 |
| commit | 0d28bd6b2fd84f863e9c9c650325125865ebe33f (patch) | |
| tree | f889166aab390c1415d5a012bb5833eddd52f12f | |
| parent | cc6c48e0eadb21ca721b5f44147392e549c8f562 (diff) | |
| download | ATCD-0d28bd6b2fd84f863e9c9c650325125865ebe33f.tar.gz | |
tao_idl: annotation declarations
This makes implements annotation declarations and makes it so
Annotations are subclasses of AST_Struct and Annotation Members are
subclasses of AST_Field. Parameters are applied and cause an error if
they don't line up with the declaration or a annotation member does not
have a value after everything is said and done.
29 files changed, 3383 insertions, 2538 deletions
diff --git a/TAO/TAO_IDL/ast/ast_annotation_appl.cpp b/TAO/TAO_IDL/ast/ast_annotation_appl.cpp index fd7068486fd..350e94bcaeb 100644 --- a/TAO/TAO_IDL/ast/ast_annotation_appl.cpp +++ b/TAO/TAO_IDL/ast/ast_annotation_appl.cpp @@ -1,4 +1,10 @@ #include "ast_annotation_appl.h" +#include "ast_annotation_member.h" + +AST_Annotation_Appl::Param::Param () + : used (false) +{ +} AST_Decl::NodeType const AST_Annotation_Appl::NT = AST_Decl::NT_annotation_appl; @@ -22,7 +28,6 @@ AST_Annotation_Appl::~AST_Annotation_Appl () void AST_Annotation_Appl::dump (ACE_OSTREAM_TYPE &o) { - dump_i (o, "@"); dump_i (o, original_name_); if (params_) { @@ -65,3 +70,99 @@ const char *AST_Annotation_Appl::original_name () const IMPL_NARROW_FROM_DECL (AST_Annotation_Appl) IMPL_NARROW_FROM_SCOPE (AST_Annotation_Appl) + +bool +AST_Annotation_Appl::apply_from (AST_Annotation_Decl *decl) +{ + // Apply Each Member From the Annotation Declaration + for (UTL_ScopeActiveIterator si ( + decl, + UTL_Scope::IK_decls); + !si.is_done (); + si.next ()) + { + AST_Annotation_Member *member = + AST_Annotation_Member::narrow_from_decl (si.item ()); + if (member) + { + AST_Annotation_Member *new_member = fe_add_annotation_member ( + new AST_Annotation_Member (member->name (), member)); + + /* + * Check to see if we have a parameter that matches this and if not, + * also make sure the member has a default. + */ + Param *param = find_param (member->local_name ()->get_string ()); + if (param) + { + new_member->value (new AST_Expression (param->expr, member->expr_type())); + if (new_member->invalid_value ()) + { + idl_global->err ()->invalid_annotation_param_type ( + this, member, param->expr); + return false; + } + param->used = true; + } + else if (!new_member->value ()) + { + idl_global->err ()->annotation_param_missing_error ( + this, member); + return false; + } + } + } + + // Make sure all the parameters were used + Params *parameters = params (); + if (parameters) + { + Param **param; + for (Param::Iterator it (*parameters); + !it.done (); it.advance ()) + { + it.next (param); + if ((*param) && !(*param)->used) + { + idl_global->err ()->invalid_annotation_param_error ( + this, decl, (*param)->id); + return false; + } + } + } + + return true; +} + +AST_Annotation_Appl::Params * +AST_Annotation_Appl::params () +{ + return params_; +} + +AST_Annotation_Decl * +AST_Annotation_Appl::annotation_decl () +{ + return annotation_decl_; +} + +AST_Annotation_Appl::Param * +AST_Annotation_Appl::find_param (const char *name) +{ + Params *parameters = params (); + if (parameters) + { + Param **param; + for (Param::Iterator it (*parameters); + !it.done (); it.advance ()) + { + it.next (param); + if ((*param) && (*param)->id && !ACE_OS::strcmp ((*param)->id->get_string (), name)) + { + return (*param); + } + } + } + + return 0; +} diff --git a/TAO/TAO_IDL/ast/ast_annotation_decl.cpp b/TAO/TAO_IDL/ast/ast_annotation_decl.cpp index fa2822b6952..a9efaf7f163 100644 --- a/TAO/TAO_IDL/ast/ast_annotation_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_annotation_decl.cpp @@ -1,5 +1,7 @@ #include "ast_annotation_decl.h" +#include "ast_annotation_member.h" #include "utl_indenter.h" +#include "utl_identifier.h" AST_Decl::NodeType const AST_Annotation_Decl::NT = AST_Decl::NT_annotation_decl; @@ -11,6 +13,11 @@ AST_Annotation_Decl::AST_Annotation_Decl (UTL_ScopedName *name) UTL_Scope (NT), AST_Structure (name, false, false) { + if (!ACE_OS::strcmp(name->last_component ()->get_string (), "@annotation")) + { + idl_global->err ()-> misc_error( + "An Annotation can not be named \"annotation\""); + } } AST_Annotation_Decl::~AST_Annotation_Decl () @@ -34,3 +41,54 @@ void AST_Annotation_Decl::destroy () IMPL_NARROW_FROM_DECL (AST_Annotation_Decl) IMPL_NARROW_FROM_SCOPE (AST_Annotation_Decl) + +void +AST_Annotation_Decl::escape_name (Identifier *name) +{ + char *old_name = name->get_string (); + char *new_name = new char [ACE_OS::strlen (old_name) + 2]; // '@' and '\0' + if (new_name) + { + new_name[0] = '@'; + new_name[1] = '\0'; + ACE_OS::strcat (new_name, old_name); + name->replace_string (new_name); + delete [] new_name; + } +} + +void +AST_Annotation_Decl::escape_name (UTL_ScopedName *name) +{ + escape_name (name->last_component ()); +} + +bool +AST_Annotation_Decl::annotatable () const +{ + return false; +} + +AST_Annotation_Member * +AST_Annotation_Decl::fe_add_annotation_member ( + AST_Annotation_Member *annotation_member) +{ + AST_Decl *d = fe_add_decl (annotation_member); + if (d) + { + AST_Type *ft = annotation_member->field_type (); + UTL_ScopedName *mru = ft->last_referenced_as (); + if (mru) + { + add_to_referenced (ft, false, mru->first_component ()); + } + } + + AST_Annotation_Decl *s = AST_Annotation_Decl::narrow_from_scope (this); + if (s) + { + s->fields ().enqueue_tail (annotation_member); + } + + return AST_Annotation_Member::narrow_from_decl (d); +} diff --git a/TAO/TAO_IDL/ast/ast_annotation_member.cpp b/TAO/TAO_IDL/ast/ast_annotation_member.cpp new file mode 100644 index 00000000000..f966e66da72 --- /dev/null +++ b/TAO/TAO_IDL/ast/ast_annotation_member.cpp @@ -0,0 +1,112 @@ +/** + * Abstract Syntax Tree Node for a Member Value of an Annotation + */ + +#include "ast_annotation_member.h" +#include "ast_type.h" +#include "utl_scope.h" + +#include "ast_enum.h" +#include "ast_enum_val.h" + +AST_Decl::NodeType const AST_Annotation_Member::NT = + AST_Decl::NT_annotation_member; + +AST_Annotation_Member::AST_Annotation_Member ( + AST_Expression::ExprType expr_type, AST_Type *type, UTL_ScopedName *name) + : AST_Decl (NT, name), + AST_Field (type, name, vis_NA), + expr_type_ (expr_type), + value_ (0) +{ +} + +AST_Annotation_Member::AST_Annotation_Member ( + AST_Decl::NodeType nt, + AST_Expression::ExprType expr_type, AST_Type *type, UTL_ScopedName *name) + : AST_Decl (nt, name), + AST_Field (nt, type, name, vis_NA), + expr_type_ (expr_type), + value_ (0) +{ +} + +AST_Annotation_Member::AST_Annotation_Member ( + UTL_ScopedName *name, + AST_Annotation_Member *other) + : AST_Decl (name, dynamic_cast<AST_Decl*>(other)), + AST_Field (name, dynamic_cast<AST_Field*>(other)), + expr_type_ (other->expr_type ()), + value_ (other->value () ? + new AST_Expression (other->value (), other->expr_type ()) : 0) +{ +} + +AST_Annotation_Member::~AST_Annotation_Member () +{ + if (value_) + { + delete value_; + } +} + +void +AST_Annotation_Member::destroy () +{ + if (value_) + { + value_->destroy (); + } +} + +IMPL_NARROW_FROM_DECL (AST_Annotation_Member); +IMPL_NARROW_FROM_SCOPE (AST_Annotation_Member); + +void +AST_Annotation_Member::dump (ACE_OSTREAM_TYPE &o) +{ + AST_Field::dump (o); + if (value_) + { + dump_i (o, " default "); + if (field_type ()->node_type () == AST_Decl::NT_enum) + { + dynamic_cast<AST_Enum*> (field_type ())-> + lookup_by_value (value_)->name ()->dump (o); + } + else + { + value_->dump (o); + } + } +} + +AST_Expression * +AST_Annotation_Member::value () +{ + return value_; +} + +void +AST_Annotation_Member::value (AST_Expression *value) +{ + if (value_) + { + value_->destroy (); + delete value_; + } + + value_ = value; +} + +AST_Expression::ExprType +AST_Annotation_Member::expr_type () +{ + return expr_type_; +} + +bool +AST_Annotation_Member::invalid_value () +{ + return !value () || !value ()->ev (); +} diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index 9c54e291953..6dea30ae484 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -171,6 +171,53 @@ AST_Decl::AST_Decl (NodeType nt, this->compute_repoID (); } +AST_Decl::AST_Decl ( + UTL_ScopedName *name, + AST_Decl *other) + : COMMON_Base (), + repoID_ (0), + flat_name_ (0), + contains_wstring_ (-1), + annotation_appls_ (0), + builtin_ (idl_global->in_eval_), + pd_imported (idl_global->imported ()), + pd_in_main_file (idl_global->in_main_file ()), + pd_defined_in (idl_global->scopes ().depth () > 0 + ? idl_global->scopes ().top () + : 0), + pd_node_type (other->node_type ()), + pd_line (idl_global->lineno ()), + pd_name (0), + pd_local_name (name ? name->last_component ()->copy () : 0), + pd_original_local_name (0), + full_name_ (0), + prefix_ (0), + version_ (0), + anonymous_ (other->anonymous ()), + typeid_set_ (false), + last_referenced_as_ (0), + prefix_scope_ (0), + in_tmpl_mod_not_aliased_ (idl_global->in_tmpl_mod_no_alias ()) +{ + // If this is the root node, the filename won't have been set yet. + UTL_String *fn = idl_global->filename (); + this->pd_file_name = (fn ? fn->get_string () : ""); + + this->compute_full_name (name); + + char *prefix = 0; + idl_global->pragma_prefixes ().top (prefix); + this->prefix_ = ACE::strnew (prefix ? prefix : ""); + + if (name) + { + // The function body creates its own copy. + this->original_local_name (name->last_component ()); + } + + this->compute_repoID (); +} + AST_Decl::~AST_Decl (void) { } diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp index a51326ac196..16e6b22c3c0 100644 --- a/TAO/TAO_IDL/ast/ast_field.cpp +++ b/TAO/TAO_IDL/ast/ast_field.cpp @@ -150,6 +150,19 @@ AST_Field::AST_Field (AST_Decl::NodeType nt, } } +AST_Field::AST_Field ( + UTL_ScopedName *name, + AST_Field *other) + : COMMON_Base (), + AST_Decl (name, dynamic_cast<AST_Decl*>(other)), + ref_type_ (other->field_type ()), + visibility_ (other->visibility ()), + owns_base_type_ (false) +{ + // We definitely don't own the base type and the param holder check shouldn't + // be an issue here. +} + AST_Field::~AST_Field (void) { } diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp index f42bf71d2b0..0c1c673aca6 100644 --- a/TAO/TAO_IDL/ast/ast_generator.cpp +++ b/TAO/TAO_IDL/ast/ast_generator.cpp @@ -104,7 +104,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_factory.h" #include "ast_finder.h" #include "ast_fixed.h" -#include "ast_annotation_decl.h" +#include "ast_annotation_appl.h" +#include "ast_annotation_member.h" #include "utl_identifier.h" @@ -1177,3 +1178,14 @@ AST_Generator::create_annotation_appl ( ACE_NEW_RETURN (retval, AST_Annotation_Appl (name, params), 0); return retval; } + +AST_Annotation_Member * +AST_Generator::create_annotation_member ( + AST_Expression::ExprType expr_type, + AST_Type *type, + UTL_ScopedName *name) +{ + AST_Annotation_Member *retval = 0; + ACE_NEW_RETURN (retval, AST_Annotation_Member (expr_type, type, name), 0); + return retval; +} diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp index 7c6ecc1e7a0..b428d3c5dd6 100644 --- a/TAO/TAO_IDL/ast/ast_module.cpp +++ b/TAO/TAO_IDL/ast/ast_module.cpp @@ -642,3 +642,10 @@ AST_Module::reset_last_in_same_parent_scope (void) this->last_in_same_parent_scope_ = this; } +AST_Annotation_Decl * +AST_Module::fe_add_annotation_decl ( + AST_Annotation_Decl *annotation_decl) +{ + return AST_Annotation_Decl::narrow_from_decl ( + fe_add_decl (annotation_decl)); +} diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index f27e5cbfc36..3d384441756 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -205,7 +205,7 @@ oneway return IDL_ONEWAY; return IDL_SCOPE_DELIMITOR; } -@annotation return IDL_ANNOTATION_DECL; +@annotation[^A-Za-z0-9_] return IDL_ANNOTATION_DECL; // Allow annotation names that start with "annotation" @ return IDL_ANNOTATION_SYMBOL; [a-ij-rs-zA-IJ-RS-Z_][a-ij-rs-zA-IJ-RS-Z0-9_]* { diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index d15ee5295c8..90218b57e3b 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -126,6 +126,7 @@ #include "ast_annotation_appl.h" #include "ast_union_branch.h" #include "ast_enum_val.h" +#include "ast_annotation_member.h" #include "fe_declarator.h" #include "fe_interface_header.h" @@ -145,12 +146,13 @@ extern "C" int tao_yywrap (void); extern char tao_yytext[]; extern int tao_yyleng; AST_Enum *tao_enum_constant_decl = 0; +AST_String *tao_string_decl = 0; AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none; #define TAO_YYDEBUG_LEXER_TEXT (tao_yytext[tao_yyleng] = '\0', tao_yytext) // Compile Optional Tracing Output for Parser, can be enabled with --bison-trace #define YYDEBUG 1 -#line 154 "fe/idl.tab.cpp" /* yacc.c:339 */ +#line 156 "fe/idl.tab.cpp" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -278,7 +280,7 @@ extern int tao_yydebug; union YYSTYPE { -#line 156 "fe/idl.ypp" /* yacc.c:355 */ +#line 158 "fe/idl.ypp" /* yacc.c:355 */ AST_Decl *dcval; /* Decl value */ UTL_StrList *slval; /* String list */ @@ -322,7 +324,7 @@ union YYSTYPE AST_Decls *decls_val; Decl_Annotations_Pair *decl_annotations_pair_val; -#line 326 "fe/idl.tab.cpp" /* yacc.c:355 */ +#line 328 "fe/idl.tab.cpp" /* yacc.c:355 */ }; typedef union YYSTYPE YYSTYPE; @@ -339,7 +341,7 @@ int tao_yyparse (void); /* Copy the second part of user declarations. */ -#line 343 "fe/idl.tab.cpp" /* yacc.c:358 */ +#line 345 "fe/idl.tab.cpp" /* yacc.c:358 */ #ifdef short # undef short @@ -581,16 +583,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 4 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1630 +#define YYLAST 1679 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 109 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 398 +#define YYNNTS 399 /* YYNRULES -- Number of rules. */ -#define YYNRULES 594 +#define YYNRULES 596 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 872 +#define YYNSTATES 877 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ @@ -645,66 +647,66 @@ static const yytype_uint8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 382, 382, 385, 386, 394, 407, 413, 417, 421, - 429, 428, 438, 437, 447, 446, 456, 455, 465, 464, - 474, 473, 483, 482, 492, 491, 501, 500, 510, 509, - 519, 518, 528, 527, 537, 536, 546, 545, 555, 554, - 568, 567, 579, 618, 622, 578, 638, 646, 660, 670, - 700, 704, 645, 727, 731, 732, 736, 737, 742, 747, - 741, 833, 838, 832, 907, 908, 913, 951, 955, 912, - 971, 970, 982, 1019, 1049, 1082, 1081, 1090, 1097, 1098, - 1099, 1100, 1104, 1114, 1119, 1162, 1166, 1118, 1193, 1236, - 1240, 1191, 1257, 1255, 1295, 1294, 1306, 1310, 1317, 1322, - 1330, 1355, 1381, 1445, 1446, 1450, 1451, 1452, 1458, 1457, - 1466, 1465, 1476, 1477, 1482, 1481, 1490, 1489, 1498, 1497, - 1506, 1505, 1514, 1513, 1522, 1521, 1530, 1529, 1538, 1537, - 1549, 1561, 1559, 1584, 1591, 1601, 1600, 1626, 1624, 1649, - 1659, 1670, 1714, 1741, 1771, 1775, 1779, 1783, 1770, 1845, - 1846, 1847, 1848, 1849, 1850, 1851, 1855, 1859, 1927, 1929, - 1931, 1932, 1944, 1945, 1957, 1958, 1970, 1971, 1980, 1992, - 1993, 2002, 2014, 2015, 2024, 2033, 2045, 2046, 2055, 2064, - 2076, 2126, 2127, 2134, 2138, 2143, 2150, 2154, 2158, 2163, - 2167, 2171, 2175, 2182, 2250, 2277, 2278, 2282, 2283, 2284, - 2288, 2292, 2293, 2297, 2301, 2302, 2306, 2315, 2321, 2328, - 2341, 2345, 2352, 2361, 2368, 2376, 2382, 2389, 2400, 2399, - 2408, 2412, 2416, 2420, 2446, 2454, 2453, 2525, 2526, 2530, - 2537, 2538, 2564, 2565, 2566, 2567, 2568, 2569, 2570, 2571, - 2575, 2576, 2577, 2578, 2582, 2583, 2584, 2588, 2589, 2593, - 2605, 2603, 2628, 2635, 2636, 2640, 2652, 2650, 2675, 2682, - 2698, 2716, 2717, 2721, 2725, 2729, 2736, 2740, 2744, 2751, - 2755, 2759, 2766, 2773, 2777, 2784, 2791, 2798, 2805, 2813, - 2812, 2826, 2857, 2861, 2825, 2878, 2881, 2882, 2886, 2886, - 2905, 2909, 2904, 2973, 2972, 2985, 2984, 2997, 3001, 3034, - 3038, 3094, 3098, 2996, 3120, 3127, 3140, 3149, 3156, 3157, - 3263, 3266, 3267, 3272, 3276, 3271, 3309, 3308, 3320, 3330, - 3348, 3356, 3355, 3369, 3373, 3368, 3389, 3388, 3439, 3464, - 3488, 3492, 3523, 3527, 3487, 3551, 3556, 3554, 3560, 3564, - 3600, 3604, 3598, 3691, 3761, 3770, 3760, 3784, 3794, 3798, - 3792, 3843, 3868, 3877, 3881, 3875, 3915, 3939, 3947, 3946, - 3986, 3996, 4014, 4022, 4026, 4021, 4086, 4087, 4092, 4096, - 4100, 4104, 4091, 4171, 4175, 4179, 4183, 4170, 4259, 4263, - 4292, 4296, 4258, 4312, 4316, 4380, 4384, 4310, 4419, 4424, - 4429, 4436, 4437, 4448, 4453, 4494, 4447, 4514, 4513, 4522, - 4521, 4532, 4537, 4535, 4541, 4546, 4550, 4545, 4589, 4588, - 4597, 4596, 4607, 4612, 4610, 4616, 4621, 4625, 4620, 4670, - 4677, 4678, 4679, 4786, 4790, 4794, 4802, 4806, 4801, 4815, - 4823, 4827, 4822, 4836, 4844, 4848, 4843, 4857, 4865, 4869, - 4864, 4878, 4885, 4897, 4895, 4918, 4925, 4953, 4990, 4991, - 4995, 5024, 5063, 5067, 5023, 5084, 5088, 5082, 5129, 5128, - 5136, 5143, 5144, 5149, 5148, 5157, 5156, 5165, 5164, 5173, - 5172, 5181, 5180, 5189, 5188, 5197, 5196, 5206, 5296, 5302, - 5327, 5433, 5442, 5446, 5452, 5524, 5596, 5670, 5669, 5717, - 5721, 5725, 5729, 5733, 5737, 5716, 5790, 5789, 5797, 5804, - 5809, 5817, 5821, 5816, 5831, 5832, 5836, 5838, 5837, 5846, - 5845, 5858, 5881, 5856, 5907, 5934, 5905, 5958, 5959, 5960, - 5964, 5965, 5969, 5996, 6026, 6070, 6074, 6024, 6089, 6098, - 6116, 6127, 6126, 6164, 6213, 6217, 6162, 6232, 6236, 6243, - 6247, 6251, 6255, 6259, 6263, 6267, 6271, 6275, 6279, 6287, - 6318, 6331, 6338, 6363, 6381, 6388, 6403, 6410, 6420, 6424, - 6442, 6446, 6419, 6459, 6465, 6468, 6475, 6474, 6481, 6480, - 6487, 6486, 6496, 6565, 6615, 6630, 6642, 6649, 6708, 6713, - 6717, 6712, 6776, 6780, 6775, 6793, 6794, 6799, 6798, 6807, - 6806, 6815, 6814, 6823, 6822 + 0, 385, 385, 388, 389, 397, 410, 416, 420, 424, + 432, 431, 441, 440, 450, 449, 459, 458, 468, 467, + 477, 476, 486, 485, 495, 494, 504, 503, 513, 512, + 522, 521, 531, 530, 540, 539, 549, 548, 558, 557, + 571, 570, 582, 621, 625, 581, 641, 649, 663, 673, + 703, 707, 648, 730, 734, 735, 739, 740, 745, 750, + 744, 836, 841, 835, 910, 911, 916, 954, 958, 915, + 974, 973, 985, 1022, 1052, 1085, 1084, 1093, 1100, 1101, + 1102, 1103, 1107, 1111, 1116, 1159, 1163, 1115, 1190, 1233, + 1237, 1188, 1254, 1252, 1292, 1291, 1303, 1307, 1314, 1319, + 1327, 1352, 1378, 1442, 1443, 1447, 1448, 1449, 1455, 1454, + 1463, 1462, 1473, 1474, 1479, 1478, 1487, 1486, 1495, 1494, + 1503, 1502, 1511, 1510, 1519, 1518, 1527, 1526, 1535, 1534, + 1546, 1558, 1556, 1581, 1588, 1598, 1597, 1623, 1621, 1646, + 1656, 1667, 1711, 1738, 1768, 1772, 1776, 1780, 1767, 1842, + 1843, 1844, 1845, 1846, 1847, 1848, 1852, 1856, 1924, 1926, + 1928, 1929, 1941, 1942, 1954, 1955, 1967, 1968, 1977, 1989, + 1990, 1999, 2011, 2012, 2021, 2030, 2042, 2043, 2052, 2061, + 2073, 2123, 2124, 2131, 2135, 2140, 2147, 2151, 2155, 2160, + 2164, 2168, 2172, 2179, 2248, 2247, 2274, 2275, 2279, 2280, + 2281, 2283, 2282, 2291, 2292, 2296, 2347, 2351, 2358, 2371, + 2381, 2388, 2420, 2424, 2431, 2440, 2447, 2455, 2461, 2468, + 2479, 2478, 2487, 2491, 2495, 2499, 2525, 2533, 2532, 2604, + 2605, 2609, 2616, 2617, 2643, 2644, 2645, 2646, 2647, 2648, + 2649, 2650, 2654, 2655, 2656, 2657, 2661, 2662, 2663, 2667, + 2668, 2672, 2684, 2682, 2707, 2714, 2715, 2719, 2731, 2729, + 2754, 2761, 2777, 2795, 2796, 2800, 2804, 2808, 2815, 2819, + 2823, 2830, 2834, 2838, 2845, 2852, 2856, 2863, 2870, 2877, + 2884, 2892, 2891, 2905, 2936, 2940, 2904, 2957, 2960, 2961, + 2965, 2965, 2984, 2988, 2983, 3052, 3051, 3064, 3063, 3076, + 3080, 3113, 3117, 3173, 3177, 3075, 3199, 3206, 3219, 3228, + 3235, 3236, 3342, 3345, 3346, 3351, 3355, 3350, 3388, 3387, + 3399, 3409, 3427, 3435, 3434, 3448, 3452, 3447, 3468, 3467, + 3518, 3543, 3567, 3571, 3602, 3606, 3566, 3630, 3635, 3633, + 3639, 3643, 3679, 3683, 3677, 3770, 3840, 3849, 3839, 3863, + 3873, 3877, 3871, 3922, 3946, 3955, 3959, 3953, 3995, 4019, + 4027, 4026, 4066, 4076, 4094, 4102, 4106, 4101, 4166, 4167, + 4172, 4176, 4180, 4184, 4171, 4251, 4255, 4259, 4263, 4250, + 4339, 4343, 4372, 4376, 4338, 4392, 4396, 4460, 4464, 4390, + 4499, 4504, 4509, 4516, 4517, 4528, 4533, 4574, 4527, 4594, + 4593, 4602, 4601, 4612, 4617, 4615, 4621, 4626, 4630, 4625, + 4669, 4668, 4677, 4676, 4687, 4692, 4690, 4696, 4701, 4705, + 4700, 4750, 4757, 4758, 4759, 4866, 4870, 4874, 4882, 4886, + 4881, 4895, 4903, 4907, 4902, 4916, 4924, 4928, 4923, 4937, + 4945, 4949, 4944, 4958, 4965, 4977, 4975, 4998, 5005, 5033, + 5070, 5071, 5075, 5104, 5143, 5147, 5103, 5164, 5168, 5162, + 5209, 5208, 5216, 5223, 5224, 5229, 5228, 5237, 5236, 5245, + 5244, 5253, 5252, 5261, 5260, 5269, 5268, 5277, 5276, 5286, + 5376, 5382, 5407, 5513, 5522, 5526, 5532, 5604, 5676, 5750, + 5749, 5797, 5801, 5805, 5809, 5813, 5817, 5796, 5870, 5869, + 5877, 5884, 5889, 5897, 5901, 5896, 5911, 5912, 5916, 5918, + 5917, 5926, 5925, 5938, 5961, 5936, 5987, 6014, 5985, 6038, + 6039, 6040, 6044, 6045, 6049, 6076, 6106, 6150, 6154, 6104, + 6169, 6178, 6196, 6207, 6206, 6244, 6293, 6297, 6242, 6312, + 6316, 6323, 6327, 6331, 6335, 6339, 6343, 6347, 6351, 6355, + 6359, 6367, 6398, 6411, 6418, 6443, 6461, 6468, 6483, 6490, + 6500, 6504, 6522, 6526, 6499, 6539, 6545, 6548, 6555, 6554, + 6561, 6560, 6567, 6566, 6576, 6645, 6695, 6710, 6722, 6729, + 6788, 6793, 6797, 6792, 6856, 6860, 6855, 6873, 6874, 6879, + 6878, 6887, 6886, 6895, 6894, 6903, 6902 }; #endif @@ -756,70 +758,70 @@ static const char *const yytname[] = "defining_id", "interface_forward", "const_dcl", "$@55", "$@56", "$@57", "$@58", "const_type", "expression", "const_expr", "or_expr", "xor_expr", "and_expr", "shift_expr", "add_expr", "mult_expr", "unary_expr", - "primary_expr", "literal", "positive_int_expr", "annotation_dcl", - "annotation_body", "annotation_statement", "annotation_member_dcl", - "annotation_member_type", "defaulted_annotation_member_dcl", - "annotation_member", "at_least_one_annotation", "annotations_maybe", - "annotation_appl", "annotation_appl_params_maybe", + "primary_expr", "literal", "positive_int_expr", "annotation_dcl", "$@59", + "annotation_body", "annotation_statement", "$@60", + "annotation_member_type", "annotation_member", + "annotation_member_default", "at_least_one_annotation", + "annotations_maybe", "annotation_appl", "annotation_appl_params_maybe", "annotation_appl_params", "named_annotation_appl_params", "more_named_annotation_appl_params", "named_annotation_appl_param", - "type_dcl", "$@59", "type_declarator", "$@60", "type_spec", + "type_dcl", "$@61", "type_declarator", "$@62", "type_spec", "simple_type_spec", "base_type_spec", "template_type_spec", "constructed_type_spec", "constructed_forward_type_spec", - "at_least_one_declarator", "declarators", "$@61", "declarator", - "at_least_one_simple_declarator", "simple_declarators", "$@62", + "at_least_one_declarator", "declarators", "$@63", "declarator", + "at_least_one_simple_declarator", "simple_declarators", "$@64", "simple_declarator", "complex_declarator", "integer_type", "signed_int", "unsigned_int", "floating_pt_type", "fixed_type", "char_type", "octet_type", "boolean_type", "any_type", "object_type", "struct_decl", - "$@63", "struct_type", "$@64", "$@65", "$@66", "at_least_one_member", - "members", "member", "@67", "member_i", "$@68", "$@69", "$@70", - "union_decl", "$@71", "union_type", "$@72", "$@73", "$@74", "$@75", - "$@76", "$@77", "switch_type_spec", "at_least_one_case_branch", - "case_branches", "case_branch", "$@78", "$@79", "$@80", - "at_least_one_case_label", "case_labels", "case_label", "$@81", "$@82", - "$@83", "element_spec", "$@84", "struct_forward_type", - "union_forward_type", "enum_type", "$@85", "$@86", "$@87", "$@88", - "at_least_one_enumerator", "enumerators", "$@89", "enumerator", - "sequence_type_spec", "$@90", "$@91", "seq_head", "$@92", "$@93", - "fixed_type_spec", "string_type_spec", "$@94", "$@95", "string_head", - "wstring_type_spec", "$@96", "$@97", "wstring_head", "array_declarator", - "$@98", "at_least_one_array_dim", "array_dims", "array_dim", "$@99", - "$@100", "attribute", "attribute_readonly", "$@101", "$@102", "$@103", - "$@104", "attribute_readwrite", "$@105", "$@106", "$@107", "$@108", - "exception", "$@109", "$@110", "$@111", "$@112", "operation", "$@113", - "$@114", "$@115", "$@116", "opt_op_attribute", "op_type_spec", - "init_decl", "$@117", "$@118", "$@119", "init_parameter_list", "$@120", - "$@121", "at_least_one_in_parameter", "in_parameters", "$@122", - "in_parameter", "$@123", "$@124", "parameter_list", "$@125", "$@126", - "at_least_one_parameter", "parameters", "$@127", "parameter", "$@128", - "$@129", "param_type_spec", "direction", "opt_raises", "$@130", "$@131", - "opt_getraises", "$@132", "$@133", "opt_setraises", "$@134", "$@135", - "opt_context", "$@136", "$@137", "at_least_one_string_literal", - "string_literals", "$@138", "typeid_dcl", "typeprefix_dcl", "component", - "component_forward_decl", "component_decl", "$@139", "$@140", "$@141", - "component_header", "$@142", "$@143", "component_inheritance_spec", - "$@144", "component_exports", "component_export", "$@145", "$@146", - "$@147", "$@148", "$@149", "$@150", "$@151", "provides_decl", + "$@65", "struct_type", "$@66", "$@67", "$@68", "at_least_one_member", + "members", "member", "@69", "member_i", "$@70", "$@71", "$@72", + "union_decl", "$@73", "union_type", "$@74", "$@75", "$@76", "$@77", + "$@78", "$@79", "switch_type_spec", "at_least_one_case_branch", + "case_branches", "case_branch", "$@80", "$@81", "$@82", + "at_least_one_case_label", "case_labels", "case_label", "$@83", "$@84", + "$@85", "element_spec", "$@86", "struct_forward_type", + "union_forward_type", "enum_type", "$@87", "$@88", "$@89", "$@90", + "at_least_one_enumerator", "enumerators", "$@91", "enumerator", + "sequence_type_spec", "$@92", "$@93", "seq_head", "$@94", "$@95", + "fixed_type_spec", "string_type_spec", "$@96", "$@97", "string_head", + "wstring_type_spec", "$@98", "$@99", "wstring_head", "array_declarator", + "$@100", "at_least_one_array_dim", "array_dims", "array_dim", "$@101", + "$@102", "attribute", "attribute_readonly", "$@103", "$@104", "$@105", + "$@106", "attribute_readwrite", "$@107", "$@108", "$@109", "$@110", + "exception", "$@111", "$@112", "$@113", "$@114", "operation", "$@115", + "$@116", "$@117", "$@118", "opt_op_attribute", "op_type_spec", + "init_decl", "$@119", "$@120", "$@121", "init_parameter_list", "$@122", + "$@123", "at_least_one_in_parameter", "in_parameters", "$@124", + "in_parameter", "$@125", "$@126", "parameter_list", "$@127", "$@128", + "at_least_one_parameter", "parameters", "$@129", "parameter", "$@130", + "$@131", "param_type_spec", "direction", "opt_raises", "$@132", "$@133", + "opt_getraises", "$@134", "$@135", "opt_setraises", "$@136", "$@137", + "opt_context", "$@138", "$@139", "at_least_one_string_literal", + "string_literals", "$@140", "typeid_dcl", "typeprefix_dcl", "component", + "component_forward_decl", "component_decl", "$@141", "$@142", "$@143", + "component_header", "$@144", "$@145", "component_inheritance_spec", + "$@146", "component_exports", "component_export", "$@147", "$@148", + "$@149", "$@150", "$@151", "$@152", "$@153", "provides_decl", "interface_type", "uses_decl", "uses_opt_multiple", "opt_multiple", - "emits_decl", "publishes_decl", "consumes_decl", "home_decl", "$@152", - "home_header", "$@153", "$@154", "$@155", "$@156", "$@157", "$@158", - "home_inheritance_spec", "$@159", "primary_key_spec", "home_body", - "$@160", "$@161", "home_exports", "home_export", "$@162", "$@163", - "factory_decl", "$@164", "$@165", "finder_decl", "$@166", "$@167", + "emits_decl", "publishes_decl", "consumes_decl", "home_decl", "$@154", + "home_header", "$@155", "$@156", "$@157", "$@158", "$@159", "$@160", + "home_inheritance_spec", "$@161", "primary_key_spec", "home_body", + "$@162", "$@163", "home_exports", "home_export", "$@164", "$@165", + "factory_decl", "$@166", "$@167", "finder_decl", "$@168", "$@169", "event", "event_forward_decl", "event_concrete_forward_decl", - "event_abs_forward_decl", "event_abs_decl", "$@168", "$@169", "$@170", + "event_abs_forward_decl", "event_abs_decl", "$@170", "$@171", "$@172", "event_abs_header", "event_custom_header", "event_plain_header", - "event_rest_of_header", "$@171", "event_decl", "$@172", "$@173", "$@174", + "event_rest_of_header", "$@173", "event_decl", "$@174", "$@175", "$@176", "event_header", "formal_parameter_type", "at_least_one_formal_parameter", "formal_parameters", "formal_parameter", "at_least_one_formal_parameter_name", "formal_parameter_names", - "formal_parameter_name", "porttype_decl", "$@175", "$@176", "$@177", - "$@178", "at_least_one_port_export", "port_exports", "port_export", - "$@179", "$@180", "$@181", "extended_port_decl", + "formal_parameter_name", "porttype_decl", "$@177", "$@178", "$@179", + "$@180", "at_least_one_port_export", "port_exports", "port_export", + "$@181", "$@182", "$@183", "extended_port_decl", "at_least_one_actual_parameter", "actual_parameters", "actual_parameter", - "connector_decl", "connector_header", "$@182", "$@183", "connector_body", - "$@184", "$@185", "connector_exports", "connector_export", "$@186", - "$@187", "$@188", "$@189", YY_NULLPTR + "connector_decl", "connector_header", "$@184", "$@185", "connector_body", + "$@186", "$@187", "connector_exports", "connector_export", "$@188", + "$@189", "$@190", "$@191", YY_NULLPTR }; #endif @@ -842,12 +844,12 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -600 +#define YYPACT_NINF -629 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-600))) + (!!((Yystate) == (-629))) -#define YYTABLE_NINF -536 +#define YYTABLE_NINF -538 #define yytable_value_is_error(Yytable_value) \ 0 @@ -856,94 +858,94 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -600, 68, 1292, -600, -600, -600, -600, -600, -600, -600, - -600, -600, -600, -600, 46, 80, 106, 56, -600, 46, - 46, -600, 53, 53, -600, -600, 94, -600, -600, 13, - -600, 1555, 25, 92, -600, -600, 18, -600, -600, -600, - -600, -600, -600, 569, -600, -600, -600, -600, -600, 1423, - 97, -600, -600, 102, -600, 136, -600, -600, -600, -600, - -600, -600, -600, -600, -600, -600, -600, -600, -600, -600, - -600, -600, -600, -600, 99, -600, -600, -600, 99, -600, - -600, 114, 126, 336, 53, 46, 1532, 46, 46, 46, - 46, -600, -600, -600, 86, 46, 119, -600, 130, 46, - -600, 99, 46, 141, 145, 46, -600, -600, -18, -600, - 15, -600, -600, 133, -600, 147, 160, 1563, -600, -600, - -600, 172, 214, -600, 200, 212, 220, 152, -600, 85, - -600, -600, -600, -600, -600, -600, 82, -600, -600, -600, - -600, -600, -600, 230, -600, -600, -600, -600, -600, -600, - -600, -600, -600, -600, -600, -600, -600, -600, -600, -600, - -600, 136, -600, -600, -600, 38, -600, -600, 221, -600, - 223, 227, 228, -600, 53, 231, 235, 233, -600, 237, - 238, 239, 240, 245, 247, 248, 250, -600, -600, -600, - 253, 255, -600, -600, -600, -600, 230, -600, -600, -600, - -600, -600, -600, -600, -600, -600, 230, -600, -600, -600, - -600, -600, -600, -600, -600, 266, -600, 251, -600, -600, - 226, -600, 333, -600, -600, -600, 40, 44, -600, -600, - -600, 336, -600, -600, -600, -600, 267, -600, -600, -600, - -600, 356, -600, -600, 41, 268, -600, -600, -600, -600, - -600, -600, -600, -600, 355, -600, 120, 273, 318, -600, - -600, -600, -600, -600, -600, 2, -600, -600, 262, -600, - -600, -600, -600, -600, -600, -600, -600, -600, 318, 279, - 281, -600, -600, -600, 46, 46, 282, 283, -600, -600, - -600, 280, -600, 333, -600, -600, -600, 510, -600, -600, - 371, -600, 284, 285, -600, -600, -600, -600, -600, -600, - -600, -600, -600, -600, 203, 203, 203, 120, 230, -600, - -600, 286, 278, 288, 157, 155, 125, -600, -600, -600, - -600, -600, 53, -600, -600, -600, -600, 287, -600, 53, - -600, 120, 120, 120, 120, -600, -600, -600, -600, -600, - -600, -600, -600, 201, -600, 271, -600, -600, -600, -600, - -600, -600, -600, -600, 53, 318, -600, -600, -600, 291, - 226, -600, -600, -600, 296, 358, 46, -600, -600, -600, - -600, 1345, 298, 297, -600, 1563, -600, -600, -600, 293, - 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, - 306, 46, -600, 230, 1074, 822, 120, -600, -600, -600, - -600, -600, 295, -600, 300, -600, 309, -600, -600, -600, - -600, 234, 990, -600, -600, -600, -600, 84, 334, 53, - 53, -600, -600, -600, -600, -600, 84, -600, 314, -600, - 315, 302, 317, -600, -600, 1109, 230, -600, 53, 318, - -600, -600, -600, 408, -600, 323, 412, 329, -600, -600, - 278, 288, 157, 155, 155, 125, 125, -600, -600, -600, - -600, -600, 325, -600, -600, -600, 331, -600, -600, -600, - -600, -600, -600, 672, -600, -600, -600, -600, -600, 332, - -600, -600, -600, 335, 337, 880, 338, 339, 340, 120, - -600, 333, -600, 343, 344, 623, 134, 53, 53, 53, - -600, 345, -600, -600, -600, -600, -600, -600, -600, 46, - 46, -600, 346, -600, -600, -600, 1193, 906, 393, 706, - -600, 230, 333, -600, -600, 70, 73, 349, 350, 351, - 333, 352, -600, -600, -600, -600, -600, -600, 48, -600, - -600, 353, 354, 230, -600, 151, 336, -600, -600, -600, - 41, -600, 357, -600, 359, 360, 361, 366, 367, -600, - 230, -600, -600, -600, -600, -600, 368, 369, -600, 1513, - 1513, -600, -600, -600, -600, -600, -600, -600, -600, 295, - 309, -600, -600, -600, -600, -600, 417, 230, -600, -600, - -600, -600, -600, -600, 81, 81, 81, 370, -600, 372, - 375, 380, 381, 382, 383, -600, -600, -600, 384, 387, - 386, 388, -600, -600, -600, -600, -600, -600, -600, -600, - -600, -600, 120, 120, 302, 46, -600, 390, 347, 391, - -600, 362, -600, -600, -600, -600, -600, -600, 1370, -600, - 53, -600, -600, -600, -600, -600, -600, -600, -600, -600, - 49, -600, -600, -600, 394, 46, 321, -600, -600, -600, - -600, -600, -600, -600, -600, -600, -600, 341, 341, -600, - -600, -600, -600, 706, 46, -600, -600, -600, -600, -600, - -600, -600, -600, 400, 402, 404, 405, 151, 53, -600, - -600, -600, -600, 406, 230, 51, -600, -600, -600, -600, - 407, -600, -600, -600, -600, -600, 389, -600, 53, -600, - -600, -600, -600, -600, 230, 409, 1238, -600, -600, 341, - 410, 415, 423, 424, 458, 458, 46, 457, 421, -600, - -600, 230, 425, -600, -600, 427, -600, -600, -600, -600, - -600, 434, -600, -600, -600, -600, -600, -600, -600, -600, - 484, 541, 439, -600, 458, 209, 706, -600, 452, 442, - 458, 450, 494, 46, 53, -600, -600, 467, -600, 454, - 210, 458, -600, -600, -600, -600, -600, -600, -600, -600, - -600, -600, -600, -600, -600, -600, -600, -600, 230, -600, - 468, -600, -600, -600, -600, 455, -600, -600, -600, 475, - 120, 471, 476, 71, -600, 222, 46, 424, 53, 53, - 460, 46, 541, -600, 473, 706, 529, -600, -600, -600, - -600, -600, 1487, -600, -600, -600, 463, 465, -600, -600, - -600, -600, -600, -600, -600, 480, -600, -600, -600, -600, - 53, 210, 46, 470, -600, 46, 488, 490, -600, -600, - -600, -600, -600, -600, 522, -600, 492, 505, -600, -600, - 526, -600 + -629, 57, 1243, -629, -629, -629, -629, -629, -629, -629, + -629, -629, -629, -629, 71, 81, 50, 73, -629, 71, + 71, -629, 40, 40, -629, -629, 71, -629, -629, 6, + -629, 223, 25, 72, -629, -629, 12, -629, -629, -629, + -629, -629, -629, 344, -629, -629, -629, -629, -629, 1427, + 42, -629, -629, 75, -629, 144, -629, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, + -629, -629, -629, -629, 80, -629, -629, -629, 80, -629, + -629, 96, 115, 1598, 40, 71, 1536, 71, 71, 71, + 71, -629, -629, -629, 79, 71, 122, -629, 125, 71, + -629, 80, 71, 123, 126, 71, -629, -629, 15, -629, + 27, -629, -629, 128, -629, 132, 135, 570, -629, -629, + -629, 138, 186, -629, 153, 157, 160, 142, -629, 168, + -629, -629, -629, -629, -629, -629, 176, -629, -629, -629, + -629, -629, -629, 192, -629, -629, -629, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, + -629, 144, -629, -629, -629, 97, -629, -629, 184, -629, + 188, 212, 221, -629, 40, 202, 225, 222, -629, 227, + 228, 230, 234, 235, 237, 239, 243, -629, -629, -629, + 244, 245, -629, -629, -629, -629, 192, -629, -629, -629, + -629, -629, -629, -629, -629, -629, 192, -629, -629, -629, + -629, -629, -629, -629, -629, 246, -629, 247, -629, -629, + 251, -629, 332, -629, -629, -629, 41, 44, -629, -629, + -629, 1598, -629, -629, -629, -629, 248, -629, -629, -629, + -629, 335, -629, -629, 120, 253, -629, -629, -629, -629, + -629, -629, -629, -629, 338, -629, 181, 249, 301, -629, + -629, -629, -629, -629, -629, 13, -629, -629, 261, -629, + -629, -629, -629, -629, -629, -629, -629, -629, 301, 282, + 283, -629, -629, -629, 71, 71, 284, 285, -629, -629, + -629, 286, -629, 332, -629, -629, -629, -629, -629, -629, + 373, -629, 289, 290, -629, -629, -629, -629, -629, -629, + -629, -629, -629, -629, 60, 60, 60, 181, 192, -629, + -629, 281, 288, 280, 170, 164, 129, -629, -629, -629, + -629, -629, 40, -629, -629, -629, -629, 292, -629, 40, + -629, 181, 181, 181, 181, -629, -629, -629, -629, -629, + -629, -629, -629, 238, -629, 293, -629, -629, -629, -629, + -629, -629, -629, -629, 40, 301, -629, -629, -629, 302, + 251, 699, 1296, 300, 303, -629, 570, -629, -629, -629, + 291, 181, 181, 181, 181, 181, 181, 181, 181, 181, + 181, 307, 71, -629, 192, 1079, 827, 181, -629, -629, + -629, -629, -629, 308, -629, 296, -629, 312, -629, -629, + -629, -629, 384, 995, -629, -629, -629, -629, 65, 349, + 40, 40, -629, -629, -629, -629, -629, 65, -629, 319, + -629, 315, 304, 318, -629, -629, 1114, 192, -629, 40, + 301, -629, -629, -629, -629, 328, -629, -629, 71, -629, + -629, 333, 334, 419, 337, -629, -629, 288, 280, 170, + 164, 164, 129, 129, -629, -629, -629, -629, -629, 329, + -629, -629, -629, 340, -629, -629, -629, -629, -629, -629, + 1571, -629, -629, -629, -629, -629, 341, -629, -629, -629, + 339, 336, 885, 347, 350, 351, 181, -629, 332, -629, + 356, 357, 1376, 101, 40, 40, 40, -629, 358, -629, + -629, -629, -629, -629, -629, -629, 71, 71, -629, 365, + -629, -629, -629, 1198, 911, 410, 1171, -629, 192, 332, + -629, -629, 83, 88, 368, 369, 371, 332, 372, -629, + -629, -629, -629, -629, -629, 64, -629, -629, 375, 376, + 192, -629, 89, 1536, -629, 434, -629, -629, -629, -629, + 120, -629, 379, -629, 380, 381, 385, 387, 389, -629, + 192, -629, -629, -629, -629, -629, 390, 391, -629, 1517, + 1517, -629, -629, -629, -629, -629, -629, -629, -629, 308, + 312, -629, -629, -629, -629, -629, 464, 192, -629, -629, + -629, -629, -629, -629, 90, 90, 90, 397, -629, 398, + 399, 400, 401, 402, 403, -629, -629, -629, 407, 408, + 409, 411, -629, -629, -629, -629, -629, -629, -629, -629, + -629, -629, 181, 181, 304, 71, -629, 412, 404, 413, + -629, 431, -629, -629, -629, -629, -629, 417, 181, 420, + 1402, -629, 40, -629, -629, -629, -629, -629, -629, -629, + -629, -629, 69, -629, -629, -629, 421, 71, 394, -629, + -629, -629, -629, -629, -629, -629, -629, -629, -629, 405, + 405, -629, -629, -629, -629, 1171, 71, -629, -629, -629, + -629, -629, -629, -629, -629, 423, 426, 428, 427, 89, + -629, -629, -629, 40, -629, -629, -629, -629, 430, 192, + 70, -629, -629, -629, -629, 484, -629, -629, -629, -629, + -629, 415, -629, 40, -629, -629, -629, -629, -629, 192, + 436, 561, -629, -629, 405, 432, 439, 424, 486, 491, + 491, 71, 477, 440, -629, -629, 192, 442, -629, -629, + 435, -629, -629, -629, -629, -629, 429, -629, -629, -629, + -629, -629, -629, -629, -629, 478, 533, 437, -629, 491, + 146, 1171, -629, 450, 441, 491, 445, 483, 71, 40, + -629, -629, 455, -629, 449, 201, 491, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, + -629, -629, -629, 192, -629, 462, -629, -629, -629, -629, + 453, -629, -629, -629, 472, 181, 468, 473, 53, -629, + 242, 71, 486, 40, 40, 459, 71, 533, -629, 475, + 1171, 531, -629, -629, -629, -629, -629, 1491, -629, -629, + -629, 465, 466, -629, -629, -629, -629, -629, -629, -629, + 480, -629, -629, -629, -629, 40, 201, 71, 474, -629, + 71, 489, 479, -629, -629, -629, -629, -629, -629, 503, + -629, 481, 492, -629, -629, 505, -629 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -951,139 +953,139 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 4, 0, 0, 3, 1, 38, 144, 40, 70, 218, - 279, 295, 330, 378, 0, 0, 0, 0, 94, 0, - 0, 489, 0, 0, 558, 579, 0, 6, 7, 42, + 4, 0, 0, 3, 1, 38, 144, 40, 70, 220, + 281, 297, 332, 380, 0, 0, 0, 0, 94, 0, + 0, 491, 0, 0, 560, 581, 0, 6, 7, 42, 24, 61, 0, 0, 22, 64, 77, 66, 26, 78, 83, 79, 84, 77, 80, 81, 65, 18, 10, 0, - 0, 12, 224, 281, 220, 329, 221, 247, 248, 222, - 20, 14, 16, 28, 449, 448, 451, 30, 487, 32, - 519, 521, 520, 518, 77, 537, 538, 517, 77, 34, + 0, 12, 226, 283, 222, 331, 223, 249, 250, 224, + 20, 14, 16, 28, 451, 450, 453, 30, 489, 32, + 521, 523, 522, 520, 77, 539, 540, 519, 77, 34, 36, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 140, 259, 223, 77, 0, 77, 88, 77, 0, - 82, 77, 0, 455, 530, 0, 139, 135, 0, 134, - 0, 208, 208, 0, 46, 0, 0, 0, 208, 8, - 9, 0, 97, 72, 0, 0, 0, 263, 265, 0, - 269, 270, 273, 274, 275, 276, 272, 277, 278, 344, - 352, 357, 92, 231, 102, 227, 229, 230, 228, 232, - 261, 262, 233, 237, 234, 236, 235, 238, 239, 281, - 244, 0, 245, 246, 240, 0, 243, 241, 351, 242, - 356, 0, 0, 5, 0, 206, 0, 0, 297, 0, - 0, 0, 0, 0, 0, 0, 0, 531, 524, 533, - 0, 0, 582, 578, 39, 272, 157, 145, 149, 153, - 154, 150, 151, 152, 155, 156, 41, 71, 219, 225, - 280, 296, 331, 379, 73, 528, 74, 0, 529, 95, - 460, 490, 0, 446, 137, 447, 0, 0, 196, 43, - 25, 0, 544, 540, 541, 546, 543, 547, 545, 542, - 539, 0, 48, 551, 0, 0, 23, 96, 75, 67, - 27, 85, 264, 271, 266, 268, 0, 0, 99, 343, - 340, 348, 353, 19, 11, 211, 13, 282, 0, 21, - 15, 17, 29, 452, 31, 501, 488, 33, 99, 0, - 0, 35, 37, 586, 0, 0, 0, 0, 89, 458, - 456, 498, 136, 0, 559, 207, 580, 0, 4, 548, - 0, 552, 0, 549, 183, 184, 185, 187, 190, 189, - 191, 192, 188, 186, 0, 0, 0, 0, 180, 577, + 0, 140, 261, 225, 77, 0, 77, 88, 77, 0, + 82, 77, 0, 457, 532, 0, 139, 135, 0, 134, + 0, 210, 210, 0, 46, 0, 0, 0, 210, 8, + 9, 0, 97, 72, 0, 0, 0, 265, 267, 0, + 271, 272, 275, 276, 277, 278, 274, 279, 280, 346, + 354, 359, 92, 233, 102, 229, 231, 232, 230, 234, + 263, 264, 235, 239, 236, 238, 237, 240, 241, 283, + 246, 0, 247, 248, 242, 0, 245, 243, 353, 244, + 358, 0, 0, 5, 0, 208, 0, 0, 299, 0, + 0, 0, 0, 0, 0, 0, 0, 533, 526, 535, + 0, 0, 584, 580, 39, 274, 157, 145, 149, 153, + 154, 150, 151, 152, 155, 156, 41, 71, 221, 227, + 282, 298, 333, 381, 73, 530, 74, 0, 531, 95, + 462, 492, 0, 448, 137, 449, 0, 0, 194, 43, + 25, 0, 546, 542, 543, 548, 545, 549, 547, 544, + 541, 0, 48, 553, 0, 0, 23, 96, 75, 67, + 27, 85, 266, 273, 268, 270, 0, 0, 99, 345, + 342, 350, 355, 19, 11, 213, 13, 284, 0, 21, + 15, 17, 29, 454, 31, 503, 490, 33, 99, 0, + 0, 35, 37, 588, 0, 0, 0, 0, 89, 460, + 458, 500, 136, 0, 561, 209, 582, 197, 4, 550, + 0, 554, 0, 551, 183, 184, 185, 187, 190, 189, + 191, 192, 188, 186, 0, 0, 0, 0, 180, 579, 158, 159, 160, 162, 164, 166, 169, 172, 176, 181, - 576, 62, 0, 113, 104, 267, 193, 0, 345, 0, - 93, 0, 0, 0, 0, 209, 288, 298, 462, 505, - 532, 525, 534, 583, 146, 259, 226, 252, 253, 254, - 260, 332, 380, 113, 0, 99, 496, 491, 138, 0, - 460, 194, 198, 201, 0, 204, 0, 205, 197, 199, - 202, 0, 3, 0, 49, 0, 177, 178, 179, 0, + 578, 62, 0, 113, 104, 269, 193, 0, 347, 0, + 93, 0, 0, 0, 0, 211, 290, 300, 464, 507, + 534, 527, 536, 585, 146, 261, 228, 254, 255, 256, + 262, 334, 382, 113, 0, 99, 498, 493, 138, 0, + 462, 0, 0, 3, 0, 49, 0, 177, 178, 179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 574, 0, 76, 133, 0, 0, 0, 208, 98, 341, - 349, 354, 134, 212, 0, 213, 216, 283, 287, 208, - 208, 453, 0, 113, 104, 368, 373, 0, 483, 0, - 0, 591, 366, 367, 587, 589, 0, 593, 0, 585, - 0, 0, 249, 208, 287, 0, 459, 457, 0, 99, - 560, 581, 195, 0, 200, 0, 0, 0, 550, 182, - 161, 163, 165, 167, 168, 170, 171, 173, 174, 175, - 208, 63, 130, 128, 388, 389, 0, 112, 120, 114, - 124, 122, 126, 0, 116, 118, 393, 110, 108, 0, - 103, 105, 106, 0, 0, 0, 0, 0, 0, 0, - 210, 0, 214, 0, 288, 0, 0, 0, 0, 0, - 473, 0, 461, 463, 465, 467, 469, 471, 475, 0, - 0, 506, 0, 504, 507, 509, 0, 0, 0, 0, - 479, 478, 0, 482, 481, 0, 0, 0, 0, 0, - 0, 0, 584, 147, 363, 359, 362, 250, 0, 333, - 338, 288, 0, 497, 492, 0, 0, 45, 553, 50, - 0, 131, 0, 69, 0, 0, 0, 0, 0, 392, - 422, 419, 420, 421, 383, 391, 0, 0, 208, 0, - 0, 87, 107, 347, 346, 342, 350, 355, 217, 0, - 216, 284, 286, 293, 290, 289, 263, 309, 304, 305, - 306, 307, 299, 308, 0, 0, 0, 0, 454, 0, - 0, 0, 0, 0, 0, 511, 514, 503, 0, 0, - 0, 0, 369, 374, 477, 572, 573, 592, 588, 590, - 480, 594, 0, 0, 360, 0, 339, 0, 335, 0, - 91, 0, 570, 566, 568, 561, 565, 203, 0, 575, - 0, 129, 121, 115, 125, 123, 127, 208, 117, 119, - 0, 111, 109, 215, 0, 0, 0, 486, 484, 485, - 474, 464, 466, 468, 470, 472, 476, 0, 0, 508, - 510, 527, 536, 0, 0, 148, 364, 361, 251, 334, - 336, 382, 493, 0, 0, 0, 0, 563, 0, 56, - 42, 51, 55, 0, 132, 0, 394, 294, 291, 300, - 397, 512, 515, 370, 375, 258, 0, 208, 0, 571, - 567, 569, 562, 564, 58, 0, 0, 57, 384, 0, - 0, 0, 0, 0, 429, 429, 0, 433, 255, 365, - 337, 494, 0, 52, 54, 0, 395, 292, 301, 398, - 405, 0, 404, 426, 513, 516, 371, 430, 376, 256, - 500, 0, 410, 385, 429, 0, 0, 400, 401, 0, - 429, 0, 437, 0, 0, 495, 557, 0, 556, 0, - 0, 429, 396, 316, 323, 321, 302, 312, 313, 320, - 406, 402, 427, 372, 431, 434, 377, 257, 499, 59, - 554, 409, 423, 424, 425, 0, 415, 416, 386, 0, - 0, 0, 0, 0, 208, 318, 0, 0, 0, 0, - 0, 0, 0, 411, 412, 0, 441, 317, 324, 322, - 303, 311, 0, 319, 407, 403, 0, 0, 435, 60, - 555, 413, 417, 438, 387, 0, 326, 314, 428, 432, - 0, 0, 0, 0, 325, 0, 0, 0, 414, 418, - 439, 327, 315, 436, 0, 445, 0, 442, 440, 443, - 0, 444 + 0, 576, 0, 76, 133, 0, 0, 0, 210, 98, + 343, 351, 356, 134, 214, 0, 215, 218, 285, 289, + 210, 210, 455, 0, 113, 104, 370, 375, 0, 485, + 0, 0, 593, 368, 369, 589, 591, 0, 595, 0, + 587, 0, 0, 251, 210, 289, 0, 461, 459, 0, + 99, 562, 583, 201, 195, 0, 203, 196, 0, 198, + 204, 0, 0, 0, 0, 552, 182, 161, 163, 165, + 167, 168, 170, 171, 173, 174, 175, 210, 63, 130, + 128, 390, 391, 0, 112, 120, 114, 124, 122, 126, + 0, 116, 118, 395, 110, 108, 0, 103, 105, 106, + 0, 0, 0, 0, 0, 0, 0, 212, 0, 216, + 0, 290, 0, 0, 0, 0, 0, 475, 0, 463, + 465, 467, 469, 471, 473, 477, 0, 0, 508, 0, + 506, 509, 511, 0, 0, 0, 0, 481, 480, 0, + 484, 483, 0, 0, 0, 0, 0, 0, 0, 586, + 147, 365, 361, 364, 252, 0, 335, 340, 290, 0, + 499, 494, 0, 0, 199, 207, 200, 45, 555, 50, + 0, 131, 0, 69, 0, 0, 0, 0, 0, 394, + 424, 421, 422, 423, 385, 393, 0, 0, 210, 0, + 0, 87, 107, 349, 348, 344, 352, 357, 219, 0, + 218, 286, 288, 295, 292, 291, 265, 311, 306, 307, + 308, 309, 301, 310, 0, 0, 0, 0, 456, 0, + 0, 0, 0, 0, 0, 513, 516, 505, 0, 0, + 0, 0, 371, 376, 479, 574, 575, 594, 590, 592, + 482, 596, 0, 0, 362, 0, 341, 0, 337, 0, + 91, 0, 572, 568, 570, 563, 567, 0, 0, 0, + 0, 577, 0, 129, 121, 115, 125, 123, 127, 210, + 117, 119, 0, 111, 109, 217, 0, 0, 0, 488, + 486, 487, 476, 466, 468, 470, 472, 474, 478, 0, + 0, 510, 512, 529, 538, 0, 0, 148, 366, 363, + 253, 336, 338, 384, 495, 0, 0, 0, 0, 565, + 202, 206, 205, 0, 56, 42, 51, 55, 0, 132, + 0, 396, 296, 293, 302, 399, 514, 517, 372, 377, + 260, 0, 210, 0, 573, 569, 571, 564, 566, 58, + 0, 0, 57, 386, 0, 0, 0, 0, 0, 431, + 431, 0, 435, 257, 367, 339, 496, 0, 52, 54, + 0, 397, 294, 303, 400, 407, 0, 406, 428, 515, + 518, 373, 432, 378, 258, 502, 0, 412, 387, 431, + 0, 0, 402, 403, 0, 431, 0, 439, 0, 0, + 497, 559, 0, 558, 0, 0, 431, 398, 318, 325, + 323, 304, 314, 315, 322, 408, 404, 429, 374, 433, + 436, 379, 259, 501, 59, 556, 411, 425, 426, 427, + 0, 417, 418, 388, 0, 0, 0, 0, 0, 210, + 320, 0, 0, 0, 0, 0, 0, 0, 413, 414, + 0, 443, 319, 326, 324, 305, 313, 0, 321, 409, + 405, 0, 0, 437, 60, 557, 415, 419, 440, 389, + 0, 328, 316, 430, 434, 0, 0, 0, 0, 327, + 0, 0, 0, 416, 420, 441, 329, 317, 438, 0, + 447, 0, 444, 442, 445, 0, 446 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -600, -600, 304, 305, 555, -560, -600, -600, -600, -600, - -600, -600, -600, -600, -600, -600, -600, -600, -600, -600, - -600, -557, -600, -600, -600, -600, -600, -600, -600, -600, - -600, -600, -600, -600, -600, -600, -121, -600, -600, -600, - -600, -600, -600, -600, -600, -600, -600, -600, 252, -600, - -600, 93, -600, -600, -600, 589, -600, -600, -600, -600, - -600, -600, -600, 591, -600, 256, -600, -600, -241, -600, - -600, 184, -600, -600, -600, -600, -349, -355, -600, -600, - -600, -600, -600, -600, -600, -600, -313, -600, -600, -22, - -600, -600, -211, -10, -600, 4, -600, -600, -600, -600, - -199, -21, -236, -600, 219, 224, 218, -96, -91, -140, - -23, -600, -302, -600, -600, -600, -600, -600, -600, -600, - -600, -87, 562, -600, -600, -600, 23, 113, 16, -600, - -600, -600, -40, 122, -470, -600, -600, -600, -47, -600, - -600, -599, -117, -600, -600, -7, -600, -56, -600, -600, - -48, -45, -55, -54, -53, 324, -600, -38, -600, -31, - -600, -600, -600, -600, 178, 277, -600, -273, -600, -600, - -600, -28, -600, -26, -600, -600, -600, -600, -600, -600, - -600, -600, -600, -188, -600, -600, -600, -600, -600, -186, - -600, -600, -600, -600, -600, -600, -600, -41, -600, -600, - -600, -600, -600, -600, -600, -90, -600, -600, -600, -600, - -600, -600, -600, -67, -600, -600, -600, -63, -600, -600, - -600, -600, -600, -600, -600, 11, -600, -600, -320, -600, - -600, -600, -600, -600, -600, -600, -600, -600, -600, 17, - -600, -600, -600, -600, -600, -600, -600, -600, -600, -600, - -600, -600, -600, -600, -600, -576, -600, -600, -600, -600, - -600, -166, -600, -600, -600, -600, -600, -600, -600, -600, - -198, -600, -600, -495, -600, -579, -600, -600, -600, -600, - -600, -600, -600, -600, -600, -600, -600, -600, -600, -600, - 20, 21, -600, -600, -600, -600, -600, -600, -600, -600, - -600, 289, -600, -600, -600, -600, -600, -600, -600, -600, - -600, -600, -311, 236, -282, -600, -600, -600, -600, -600, - -600, -600, -600, -600, -600, -600, -600, -600, -600, -600, - -600, -600, -600, -600, -600, -600, -600, -600, -600, -600, - -600, -600, -600, -600, -600, -600, -600, -600, -600, -600, - -600, -600, -600, -600, -600, -600, 576, -600, -600, -600, - -600, -600, -600, -600, -600, -600, 270, -600, -600, -164, - -600, -600, -600, -600, -600, -600, -600, -37, -600, -600, - -600, 242, -600, -600, 96, -600, -600, -600, -600, -600, - -600, -600, -600, -600, -600, -600, -600, -600 + -629, -629, 294, 297, 534, -601, -629, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, + -629, -599, -629, -629, -629, -629, -629, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -142, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -629, -629, 272, -629, + -629, 112, -629, -629, -629, 581, -629, -629, -629, -629, + -629, -629, -629, 583, -629, 275, -629, -629, -238, -629, + -629, 185, -629, -629, -629, -629, -313, -354, -629, -629, + -629, -629, -629, -629, -629, -629, -331, -629, -629, -22, + -629, -629, -186, -10, -629, 16, -629, -629, -629, -629, + -190, -27, -219, -629, 226, 224, 229, -91, -90, -149, + -32, -629, -304, -629, -629, -629, -629, -629, -629, -629, + -629, -629, -84, 558, -629, -629, -629, 26, 117, 17, + -629, 67, -629, -40, 130, -450, -629, -629, -629, -49, + -629, -629, -609, -120, -629, -629, -8, -629, -70, -629, + -629, -51, -48, -69, -63, -52, 255, -629, -38, -629, + -31, -629, -629, -629, -629, 193, 295, -629, -275, -629, + -629, -629, -28, -629, -26, -629, -629, -629, -629, -629, + -629, -629, -629, -629, -191, -629, -629, -629, -629, -629, + -185, -629, -629, -629, -629, -629, -629, -629, -41, -629, + -629, -629, -629, -629, -629, -629, -93, -629, -629, -629, + -629, -629, -629, -629, -76, -629, -629, -629, -72, -629, + -629, -629, -629, -629, -629, -629, 0, -629, -629, -324, + -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, + 20, -629, -629, -629, -629, -629, -629, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -628, -629, -629, -629, + -629, -629, -183, -629, -629, -629, -629, -629, -629, -629, + -629, -220, -629, -629, -493, -629, -553, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, + -629, 21, 22, -629, -629, -629, -629, -629, -629, -629, + -629, -629, 270, -629, -629, -629, -629, -629, -629, -629, + -629, -629, -629, -300, 215, -270, -629, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -629, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -629, 565, -629, -629, + -629, -629, -629, -629, -629, -629, -629, 268, -629, -629, + -182, -629, -629, -629, -629, -629, -629, -629, -53, -629, + -629, -629, 236, -629, -629, 92, -629, -629, -629, -629, + -629, -629, -629, -629, -629, -629, -629, -629, -629 }; /* YYDEFGOTO[NTERM-NUM]. */ @@ -1091,44 +1093,44 @@ static const yytype_int16 yydefgoto[] = { -1, 1, 2, 3, 27, 28, 172, 176, 180, 181, 171, 179, 121, 116, 125, 182, 184, 186, 190, 191, - 82, 29, 84, 30, 115, 298, 455, 31, 32, 117, - 302, 457, 648, 725, 701, 726, 702, 703, 742, 821, - 33, 118, 401, 34, 35, 124, 333, 476, 36, 85, - 37, 142, 332, 38, 39, 40, 126, 334, 489, 41, - 217, 363, 552, 42, 258, 43, 102, 248, 340, 44, - 45, 405, 490, 491, 580, 579, 404, 477, 565, 576, - 577, 564, 567, 566, 568, 562, 402, 472, 650, 318, - 222, 293, 109, 355, 46, 478, 83, 284, 440, 632, + 82, 29, 84, 30, 115, 298, 452, 31, 32, 117, + 302, 454, 650, 730, 706, 731, 707, 708, 747, 826, + 33, 118, 392, 34, 35, 124, 333, 473, 36, 85, + 37, 142, 332, 38, 39, 40, 126, 334, 486, 41, + 217, 363, 549, 42, 258, 43, 102, 248, 340, 44, + 45, 396, 487, 488, 580, 579, 395, 474, 565, 576, + 577, 564, 567, 566, 568, 562, 393, 469, 652, 318, + 222, 293, 109, 355, 46, 475, 83, 284, 431, 632, 197, 319, 336, 321, 322, 323, 324, 325, 326, 327, - 328, 329, 337, 48, 297, 374, 375, 376, 377, 378, - 49, 50, 295, 345, 414, 415, 502, 416, 479, 86, - 208, 285, 594, 145, 146, 147, 148, 52, 356, 442, - 635, 357, 714, 738, 773, 358, 359, 149, 150, 151, - 152, 153, 154, 155, 156, 157, 158, 53, 87, 54, - 177, 346, 503, 417, 504, 592, 419, 595, 665, 730, - 664, 55, 88, 56, 268, 420, 666, 731, 765, 812, - 602, 786, 813, 787, 814, 856, 809, 788, 815, 789, - 811, 810, 845, 847, 855, 57, 58, 59, 89, 286, - 443, 637, 549, 638, 717, 550, 164, 341, 496, 165, - 257, 407, 166, 167, 342, 497, 168, 169, 343, 498, - 170, 360, 441, 545, 634, 546, 633, 716, 480, 432, - 528, 683, 736, 770, 433, 529, 684, 737, 772, 481, - 90, 287, 444, 639, 482, 657, 745, 781, 826, 483, - 574, 493, 578, 729, 764, 711, 732, 733, 751, 768, - 817, 752, 766, 816, 763, 779, 780, 805, 824, 851, - 806, 825, 852, 575, 807, 754, 769, 818, 758, 771, - 819, 796, 820, 850, 844, 853, 864, 866, 867, 870, - 484, 485, 63, 64, 65, 183, 348, 511, 66, 220, - 365, 290, 364, 421, 512, 609, 610, 611, 612, 613, - 607, 614, 643, 532, 644, 436, 534, 515, 516, 517, - 67, 185, 68, 105, 291, 449, 641, 718, 760, 367, - 448, 775, 276, 349, 522, 422, 523, 618, 619, 524, - 677, 734, 525, 678, 735, 69, 70, 71, 72, 73, - 279, 423, 620, 74, 75, 76, 188, 278, 77, 280, - 424, 621, 78, 241, 242, 303, 243, 777, 800, 778, - 79, 111, 369, 555, 696, 645, 697, 646, 694, 695, - 693, 437, 245, 400, 330, 80, 81, 112, 370, 193, - 283, 438, 353, 439, 538, 539, 537, 541 + 328, 329, 337, 48, 297, 371, 447, 553, 448, 449, + 649, 49, 50, 295, 345, 405, 406, 499, 407, 476, + 86, 208, 285, 594, 145, 146, 147, 148, 52, 356, + 433, 635, 357, 719, 743, 778, 358, 359, 149, 150, + 151, 152, 153, 154, 155, 156, 157, 158, 53, 87, + 54, 177, 346, 500, 408, 501, 592, 410, 595, 667, + 735, 666, 55, 88, 56, 268, 411, 668, 736, 770, + 817, 602, 791, 818, 792, 819, 861, 814, 793, 820, + 794, 816, 815, 850, 852, 860, 57, 58, 59, 89, + 286, 434, 637, 546, 638, 722, 547, 164, 341, 493, + 165, 257, 398, 166, 167, 342, 494, 168, 169, 343, + 495, 170, 360, 432, 542, 634, 543, 633, 721, 477, + 423, 525, 685, 741, 775, 424, 526, 686, 742, 777, + 478, 90, 287, 435, 639, 479, 659, 750, 786, 831, + 480, 574, 490, 578, 734, 769, 716, 737, 738, 756, + 773, 822, 757, 771, 821, 768, 784, 785, 810, 829, + 856, 811, 830, 857, 575, 812, 759, 774, 823, 763, + 776, 824, 801, 825, 855, 849, 858, 869, 871, 872, + 875, 481, 482, 63, 64, 65, 183, 348, 508, 66, + 220, 365, 290, 364, 412, 509, 609, 610, 611, 612, + 613, 607, 614, 643, 529, 644, 427, 531, 512, 513, + 514, 67, 185, 68, 105, 291, 440, 641, 723, 765, + 367, 439, 780, 276, 349, 519, 413, 520, 618, 619, + 521, 679, 739, 522, 680, 740, 69, 70, 71, 72, + 73, 279, 414, 620, 74, 75, 76, 188, 278, 77, + 280, 415, 621, 78, 241, 242, 303, 243, 782, 805, + 783, 79, 111, 369, 552, 698, 645, 699, 646, 696, + 697, 695, 428, 245, 391, 330, 80, 81, 112, 370, + 193, 283, 429, 353, 430, 535, 536, 534, 538 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1136,338 +1138,346 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 108, 110, 163, 144, 92, 159, 47, 93, 320, 103, - 104, 292, 160, 571, 445, 161, 204, 162, 51, 60, - 205, 143, 61, 62, 226, 227, 408, 198, 201, 202, - 203, 244, 299, 431, 623, 199, 688, 350, 200, 409, - 410, 411, 434, 294, 106, 163, 209, 296, 159, 91, - 492, 636, 706, 47, 728, 160, 106, 223, 161, 571, - 162, 196, 206, 224, 143, 51, 60, 521, 4, 61, - 62, 435, 783, 625, 526, 207, 626, 210, 211, 212, - 213, 389, 368, 224, 106, 215, 8, 106, 699, 218, - 225, 700, 219, 254, 255, 221, 224, 113, 373, 784, - 785, 510, 712, 530, 114, 18, -141, 344, 413, 99, - 513, 122, 8, 119, 304, 305, 306, 307, 308, 309, - 310, 311, 107, 106, 447, 312, 313, 174, 174, 123, - 259, 174, 260, 412, 107, 174, 174, 106, 174, 514, - 314, 315, 596, 128, 129, 316, 317, 132, 133, 134, - 135, 224, 265, 746, 224, 18, 755, 12, 178, 95, - 252, -310, 224, 253, 204, 107, 699, 187, 205, 700, - 494, 187, 492, 256, -142, 198, 201, 202, 203, 122, - 120, 425, 426, 199, 174, 782, 200, 214, 713, 216, - -328, 793, 122, 304, 305, 306, 307, 308, 309, 310, - 311, 107, 808, 192, 312, 313, 106, -143, 554, 196, - 783, 427, 122, 571, 194, 107, 428, 834, -100, 314, - 315, 174, 228, 122, 316, 317, 397, 398, 399, -450, - 204, 425, 426, -522, 205, 642, 229, 784, 785, 393, - 394, 198, 201, 202, 203, 802, 803, 804, 230, 199, - 784, 785, 200, 859, 395, 396, 861, 467, 468, 469, - 246, 427, 247, 588, 425, 426, 428, 94, 96, 429, - 430, 790, 98, 101, 354, 196, 304, 305, 306, 307, - 308, 309, 310, 311, 107, 507, 508, 312, 313, 249, - 589, 386, 387, 388, 427, 509, 571, 463, 464, 428, - 250, 372, 429, 430, 465, 466, 661, 662, 317, 251, - 403, 224, 261, 379, 262, 263, 264, 403, -207, 289, - 495, 624, 267, 266, 320, 269, 270, 271, 272, 630, - 842, 686, 505, 506, 273, 274, 106, 275, 277, 106, - 288, 281, 446, 282, 127, 128, 129, 130, 131, 132, - 133, 134, 135, 195, -523, 571, 548, 647, 300, 301, - 331, 140, 141, 335, 338, 339, 92, 347, 351, 454, - 352, 361, 362, 366, 383, 391, 384, 642, -358, 385, - 450, 406, 390, 560, 452, 47, 392, 453, -44, 456, - 499, 471, 533, 667, 668, 669, 320, 51, 60, 459, - 470, 61, 62, 501, 542, 531, 500, 535, 536, 544, - 543, 547, 556, 557, 531, 558, 572, 107, 559, 561, - 573, 563, 581, 582, 622, 252, 553, 709, 692, 583, - 585, 586, 587, 591, -285, 608, 617, 627, 628, 629, - 631, 690, -399, -381, 640, 651, 710, 652, 653, 654, - 598, 599, 600, 601, 655, 656, 658, 659, 670, 750, - 671, 570, 572, 672, 163, 603, 573, 159, 673, 674, - 675, 676, 679, 143, 160, 680, 681, 161, 682, 162, - 689, 691, 707, 143, 597, 604, 605, 606, 719, 204, - 720, 660, 721, 205, 727, 722, 753, 739, 747, 743, - 198, 201, 202, 203, 748, 836, 837, 570, 199, 615, - 616, 200, 757, 106, 6, 759, 761, 9, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 195, 137, 749, - 10, 11, 762, 12, 196, 140, 141, 857, 163, 163, - 767, 159, 159, 774, 776, -408, 791, 792, 160, 160, - 14, 161, 161, 162, 162, 794, 795, 143, 143, 799, - 801, 823, 822, 827, 829, 838, 830, 841, 843, 848, - 705, 849, 106, 854, 828, 860, 862, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 10, - 11, 107, 12, 139, 140, 141, 863, 865, 868, 869, - 371, 871, 381, 382, 173, 744, 100, 97, 527, 460, - 462, 685, 175, 663, 590, 461, 572, 584, 708, 756, - 573, 380, 551, 418, 593, 831, 106, 740, 704, 833, - 548, 127, 128, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 138, 10, 11, 687, 12, 139, 140, 141, - 107, 835, 47, 858, 189, 458, 649, -101, 840, 451, - 723, 570, 122, 518, 51, 60, 0, 0, 61, 62, - 0, 0, 540, 0, 92, 106, 724, 715, 0, 0, - 127, 128, 129, 130, 131, 132, 133, 134, 135, 195, - 137, 138, 0, 0, 0, 0, 741, 140, 141, 572, - 0, 0, 0, 573, 107, 0, 569, 0, 0, 106, - 174, 0, 0, 0, 127, 128, 129, 130, 131, 132, - 133, 134, 135, 195, 137, 138, 92, 832, 0, 715, - 47, 140, 141, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 51, 60, 570, 0, 61, 62, 0, 0, - 0, 0, 798, 107, 0, 0, 0, 0, 572, 0, - 0, 0, 573, 92, 0, 0, 797, 0, 0, 0, + 108, 110, 163, 144, 92, 159, 93, 204, 399, 103, + 104, 205, 160, 198, 201, 161, 113, 162, 47, 51, + 202, 143, 60, 61, 62, 320, 690, 226, 227, 422, + 571, 203, 199, 623, 244, 200, 292, 400, 401, 402, + 350, 299, 489, 106, 294, 163, 209, 296, 159, 704, + 436, 705, 717, 425, 788, 160, 8, 4, 161, 518, + 162, 196, 206, 106, 143, 47, 51, 636, 106, 60, + 61, 62, 711, 733, 91, 207, 571, 210, 211, 212, + 213, 789, 790, 426, 527, 215, 625, 8, 507, 218, + 223, 626, 219, 106, 224, 221, 224, 114, 380, 18, + -141, 523, 225, 95, 106, 122, 751, 368, 224, 596, + 128, 129, 510, 119, 132, 133, 134, 135, 344, 416, + 417, 107, 18, 106, 12, 404, 99, 438, 174, 174, + 704, 174, 705, 304, 305, 306, 307, 308, 309, 310, + 311, 107, 511, -312, 312, 313, 107, 788, 123, 418, + 252, 174, 265, 253, 419, 204, 174, 174, 403, 205, + 120, 198, 201, -330, 224, 317, 178, -142, 202, 224, + 489, 224, 122, 122, 789, 790, 254, 255, 491, 203, + 199, 446, 107, 200, 106, 192, 187, 760, 174, 259, + 187, 260, 718, 304, 305, 306, 307, 308, 309, 310, + 311, 107, 551, 194, 312, 313, 214, 174, 216, 196, + -143, -452, 839, -100, -524, 122, 787, 228, 122, 314, + 315, 229, 798, 230, 316, 317, 246, -47, 642, -47, + 388, 389, 390, 813, 247, 571, 807, 808, 809, 464, + 465, 466, 249, -47, -47, 250, -47, -47, 864, 251, + -47, 866, 384, 385, 304, 305, 306, 307, 308, 309, + 310, 311, 107, 386, 387, 312, 313, 256, 416, 417, + 789, 790, -47, 224, 354, 261, -47, 588, 795, 262, + 314, 315, 377, 378, 379, 316, 317, 94, 96, -209, + -47, 98, 101, 460, 461, 204, 462, 463, 418, 205, + 263, 198, 201, 419, 663, 664, 420, 421, 202, 264, + 394, 267, 589, 266, 492, 269, 270, 394, 271, 203, + 199, 571, 272, 200, 273, 274, 502, 503, 275, 688, + 451, 277, 281, 282, -525, 106, 288, 847, 301, 300, + 338, 320, 437, 624, 289, 331, 335, 106, 339, 196, + 545, 630, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 10, 11, 347, 12, 139, 140, + 141, 351, 352, 361, 362, 642, 374, 381, 383, 366, + 571, 375, 468, 560, 376, 382, 397, 445, 47, 51, + -44, 441, 60, 61, 62, 453, 528, 456, 532, 533, + -360, 467, 497, 496, 572, 528, 498, 530, 573, 539, + 540, 541, 544, 320, 416, 417, 554, 550, 669, 670, + 671, 556, 558, 561, 557, 107, 559, 582, 583, 701, + 563, 581, -101, 598, 599, 504, 505, 122, 555, 585, + 600, 622, 586, 587, 418, 506, 591, -287, 608, 419, + 572, 601, 420, 421, 573, 617, 627, 628, 570, 629, + 631, 163, 603, 648, 159, -383, 640, 653, 654, 655, + 143, 160, 252, 656, 161, 657, 162, 658, 660, 661, + 143, 597, 604, 605, 606, 672, 673, 674, 675, 676, + 677, 678, 841, 842, 662, 681, 682, 694, 692, 683, + 714, 684, 691, 693, 570, 700, 615, 616, 702, 712, + 715, 724, 163, 209, 725, 159, 726, 727, 732, -401, + 752, 755, 160, 744, 862, 161, 748, 162, 753, 758, + 754, 143, 762, 766, 764, 772, 781, 779, 163, 163, + 767, 159, 159, -410, 796, 800, 797, 804, 160, 160, + 799, 161, 161, 162, 162, 806, 827, 143, 143, 828, + 832, 834, 5, 835, 843, 6, 7, 8, 9, 846, + 848, 853, 854, 859, 231, 710, 232, 867, 870, 865, + 876, 10, 11, 173, 12, 868, 874, 873, 13, 749, + 233, 234, 372, 235, 236, 373, 833, 237, 100, 97, + 524, 14, 15, 16, 17, 687, 458, 457, 175, 572, + 18, 19, 459, 573, 20, 590, 665, 21, 713, 238, + 647, 761, 584, 239, 22, 23, 450, 836, 548, 745, + 709, 24, 25, 703, 689, 838, 863, 240, 545, 840, + 442, 409, 537, 189, 455, 845, 728, 26, 515, 0, + 0, -53, 651, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 570, 0, 0, 47, 51, 0, 0, + 60, 61, 62, 0, 0, 0, 92, 0, 720, 0, + 0, 729, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 572, 0, 0, 0, 573, + 0, 746, 106, 6, 0, 0, 443, 127, 128, 129, + 130, 131, 132, 133, 134, 135, 195, 137, 0, 0, + 0, 0, 12, 0, 140, 141, 0, 0, 0, 0, + 0, 92, 0, 720, 0, 837, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 47, 51, 570, + 0, 60, 61, 62, 572, 0, 0, 803, 573, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 92, 0, + 802, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 107, 0, 0, 0, 0, 0, 0, 0, 0, 444, + 0, 0, 0, 0, 0, 0, 163, 851, 0, 159, + 0, 394, 394, 0, 0, 0, 160, 0, 570, 161, + 0, 162, 0, 0, 0, 143, 844, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 470, 0, + -392, 6, 0, 394, 9, -392, -392, -392, -392, -392, + -392, -392, -392, -392, -392, -392, -392, 10, 11, 0, + 12, 0, -392, -392, 13, 0, 0, 416, 417, 471, + 472, -392, 0, 0, 0, 0, 0, 14, 0, 0, + 0, 483, 484, 485, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 106, 0, + 22, 23, 0, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 0, 0, 0, -392, 139, + 140, 141, 470, 0, -392, 6, 0, -86, 9, -392, + -392, -392, -392, -392, -392, -392, -392, -392, -392, -392, + -392, 10, 11, 0, 12, 0, -392, -392, 13, 0, + 0, 416, 417, 471, 472, -392, 0, 0, 0, 0, + 0, 14, 0, 0, 0, 483, 484, 485, 0, 0, + 0, 0, 0, 0, 0, 0, 107, 0, 0, 0, + 0, 0, 174, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 107, 0, 0, - 0, 163, 846, 0, 159, 0, 403, 403, 0, 0, - 0, 160, 0, 570, 161, 0, 162, 0, 0, 0, - 143, 839, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 473, 0, -390, 6, 0, 403, 9, - -390, -390, -390, -390, -390, -390, -390, -390, -390, -390, - -390, -390, 10, 11, 0, 12, 0, -390, -390, 13, - 0, 0, 425, 426, 474, 475, -390, 0, 0, 0, - 0, 0, 14, 0, 0, 0, 486, 487, 488, 0, + 0, 0, -392, 0, 0, 0, 470, 0, -392, 6, + 0, -537, 9, -392, -392, -392, -392, -392, -392, -392, + -392, -392, -392, -392, -392, 10, 11, 0, 12, 0, + -392, -392, 13, 0, 0, 416, 417, 471, 472, -392, + 0, 0, 0, 0, 0, 14, 0, 0, 0, 516, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 517, + 0, 0, 0, 0, 0, 0, 0, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 106, 0, 22, 23, 0, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 0, 0, 0, -390, 139, 140, 141, 473, 0, -390, - 6, 0, -86, 9, -390, -390, -390, -390, -390, -390, - -390, -390, -390, -390, -390, -390, 10, 11, 0, 12, - 0, -390, -390, 13, 0, 0, 425, 426, 474, 475, - -390, 0, 0, 0, 0, 0, 14, 0, 0, 0, - 486, 487, 488, 0, 0, 0, 0, 0, 0, 0, - 0, 107, 0, 0, 0, 0, 0, 174, 0, 22, - 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -390, 0, 0, - 0, 473, 0, -390, 6, 0, -535, 9, -390, -390, - -390, -390, -390, -390, -390, -390, -390, -390, -390, -390, - 10, 11, 0, 12, 0, -390, -390, 13, 0, 0, - 425, 426, 474, 475, -390, 0, 0, 0, 0, 0, - 14, 0, 0, 0, 519, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 520, 0, 0, 0, 0, 0, - 0, 0, 0, 22, 23, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -392, 0, 0, 0, + 470, 0, -392, 6, 0, -504, 9, -392, -392, -392, + -392, -392, -392, -392, -392, -392, -392, -392, -392, 10, + 11, 0, 12, 0, -392, -392, 13, 0, 0, 416, + 417, 471, 472, -392, 0, 470, 0, -392, 6, 14, + 0, 9, -392, -392, -392, -392, -392, -392, -392, -392, + -392, -392, -392, -392, 10, 11, 0, 12, 0, -392, + -392, 13, 22, 23, 416, 417, 471, 472, -392, 0, + 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, + -392, 0, 0, 0, 0, 0, 0, 0, 0, -68, + 0, 0, 0, 0, 106, 0, 0, 22, 23, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 195, 137, + 138, 0, 0, 0, 0, -392, 140, 141, 0, 470, + 0, -392, 6, 0, -90, 9, -392, -392, -392, -392, + -392, -392, -392, -392, -392, -392, -392, -392, 10, 11, + 0, 12, 0, -392, -392, 13, 0, 0, 416, 417, + 471, 472, -392, 0, 0, 0, 0, 0, 14, 0, + 0, 0, 0, -2, 5, 0, 0, 6, 7, 8, + 9, 0, 107, 0, 0, 0, 0, 0, 0, 0, + 0, 22, 23, 10, 11, 0, 12, 0, 0, 0, + 13, 0, 0, 0, 0, 0, 0, 0, 0, -392, + 0, 0, 0, 14, 15, 16, 17, 0, -528, 0, + 0, 0, 18, 19, 0, 0, 20, 5, 0, 21, + 6, 7, 8, 9, 0, 0, 22, 23, 0, 0, + 0, 0, 0, 24, 25, 0, 10, 11, 0, 12, + 0, 0, 0, 13, 0, 0, 0, 0, 0, 26, + -210, 0, 0, 0, 0, 0, 14, 15, 16, 17, + 0, 0, 0, 0, 0, 18, 19, 0, 0, 20, + 0, 0, 21, 0, 0, 0, 0, 0, 0, 22, + 23, 0, 0, 0, 0, 0, 24, 25, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 593, 0, 106, + 0, 0, 26, -210, 127, 128, 129, 130, 131, 132, + 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, -390, 0, 0, 0, 473, 0, -390, 6, 0, - -502, 9, -390, -390, -390, -390, -390, -390, -390, -390, - -390, -390, -390, -390, 10, 11, 0, 12, 0, -390, - -390, 13, 0, 0, 425, 426, 474, 475, -390, 0, - 473, 0, -390, 6, 14, 0, 9, -390, -390, -390, - -390, -390, -390, -390, -390, -390, -390, -390, -390, 10, - 11, 0, 12, 0, -390, -390, 13, 22, 23, 425, - 426, 474, 475, -390, 0, 0, 0, 0, 0, 14, - 0, 0, 0, 0, 0, -390, 0, 0, 0, 0, - 0, 0, 0, 0, -68, 0, 0, 0, 0, 0, - 0, 0, 22, 23, 0, 0, 0, 0, 0, 0, + 0, 0, 10, 11, 0, 12, 0, 0, 5, 13, + 0, 6, 7, 8, 9, 0, 0, 0, 0, 0, + 0, 0, 14, 15, 16, 17, 0, 10, 11, 0, + 12, 18, 19, 0, 13, 20, 0, 107, 21, 0, + 0, 0, 0, 174, 0, 22, 23, 14, 15, 16, + 17, 0, 24, 25, 703, 0, 18, 19, 0, 0, + 20, 0, 0, 21, 0, 0, 0, 0, 26, 0, + 22, 23, 0, 0, 106, 0, 0, 24, 25, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 10, 11, 26, 12, 139, 140, 141, 593, 0, + 106, 0, 0, 0, 0, 127, 128, 129, 130, 131, + 132, 133, 134, 135, 136, 137, 138, 10, 11, 106, + 12, 139, 140, 141, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 10, 11, 0, 12, + 139, 140, 141, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 107, 0, 106, 0, 0, 0, 174, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 195, 137, + 138, 0, 0, 0, 0, 0, 140, 141, 107, 0, + 0, 106, 0, 0, 0, 569, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 195, 0, 107, 0, 0, + 0, 0, 0, 140, 141, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -390, 0, 0, 0, 473, 0, -390, 6, 0, -90, - 9, -390, -390, -390, -390, -390, -390, -390, -390, -390, - -390, -390, -390, 10, 11, 0, 12, 0, -390, -390, - 13, 0, 0, 425, 426, 474, 475, -390, 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, -390, 0, 0, 0, 14, 15, - 16, 17, 0, -526, 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, - 698, 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, -208, - 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, -208, 22, 23, 0, 0, 0, 0, 0, - 24, 25, 698, 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, 593, 0, 106, 0, 0, 0, - 0, 127, 128, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 138, 10, 11, 106, 12, 139, 140, 141, - 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, - 137, 138, 10, 11, 0, 12, 139, 140, 141, -47, - 0, -47, 0, 0, 0, 0, 0, 231, 107, 232, - 0, 0, 0, 0, 174, -47, -47, 0, -47, -47, - 0, 0, -47, 233, 234, 0, 235, 236, 0, 0, - 237, 0, 0, 0, 107, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -47, 0, 0, 0, -47, 0, - 0, 0, 238, 107, 0, 0, 239, 0, 0, 0, - 0, 0, -47, 0, 0, 0, 0, 0, 0, 0, - 240 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 107, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 107 }; static const yytype_int16 yycheck[] = { - 22, 23, 43, 43, 14, 43, 2, 14, 244, 19, - 20, 222, 43, 483, 363, 43, 83, 43, 2, 2, - 83, 43, 2, 2, 111, 112, 339, 83, 83, 83, - 83, 118, 231, 353, 529, 83, 635, 278, 83, 341, - 342, 343, 353, 3, 3, 86, 86, 3, 86, 3, - 405, 3, 3, 49, 3, 86, 3, 75, 86, 529, - 86, 83, 84, 81, 86, 49, 49, 422, 0, 49, - 49, 353, 1, 3, 423, 85, 3, 87, 88, 89, - 90, 317, 293, 81, 3, 95, 6, 3, 648, 99, - 75, 648, 102, 8, 9, 105, 81, 3, 297, 28, - 29, 421, 678, 19, 91, 49, 88, 105, 344, 53, - 421, 93, 6, 88, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 3, 365, 84, 85, 87, 87, 36, - 92, 87, 94, 344, 81, 87, 87, 3, 87, 421, - 99, 100, 8, 9, 10, 104, 105, 13, 14, 15, - 16, 81, 174, 729, 81, 49, 735, 23, 22, 53, - 8, 90, 81, 11, 231, 81, 726, 74, 231, 726, - 406, 78, 527, 91, 88, 231, 231, 231, 231, 93, - 88, 30, 31, 231, 87, 764, 231, 94, 683, 96, - 88, 770, 93, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 781, 89, 84, 85, 3, 88, 449, 231, - 1, 60, 93, 683, 88, 81, 65, 816, 88, 99, - 100, 87, 89, 93, 104, 105, 101, 102, 103, 88, - 297, 30, 31, 88, 297, 555, 89, 28, 29, 82, - 83, 297, 297, 297, 297, 35, 36, 37, 88, 297, - 28, 29, 297, 852, 99, 100, 855, 397, 398, 399, - 88, 60, 48, 499, 30, 31, 65, 15, 16, 68, - 69, 766, 16, 17, 284, 297, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 51, 52, 84, 85, 89, - 501, 314, 315, 316, 60, 61, 766, 393, 394, 65, - 88, 297, 68, 69, 395, 396, 579, 580, 105, 89, - 332, 81, 91, 297, 91, 88, 88, 339, 87, 93, - 407, 532, 89, 88, 560, 88, 88, 88, 88, 540, - 825, 633, 419, 420, 89, 88, 3, 89, 88, 3, - 89, 88, 364, 88, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 88, 825, 443, 556, 91, 3, - 92, 25, 26, 8, 91, 47, 376, 105, 89, 376, - 89, 89, 89, 93, 3, 97, 92, 697, 107, 94, - 89, 94, 96, 470, 88, 381, 98, 29, 90, 92, - 95, 401, 58, 604, 605, 606, 632, 381, 381, 106, - 94, 381, 381, 94, 90, 427, 106, 429, 430, 107, - 95, 94, 4, 90, 436, 3, 483, 81, 89, 94, - 483, 90, 90, 88, 31, 8, 448, 106, 66, 92, - 92, 92, 92, 90, 90, 90, 90, 88, 88, 88, - 88, 94, 35, 90, 90, 88, 105, 88, 88, 88, - 506, 506, 506, 506, 88, 88, 88, 88, 88, 35, - 88, 483, 529, 88, 505, 506, 529, 505, 88, 88, - 88, 88, 88, 495, 505, 88, 90, 505, 90, 505, - 90, 90, 88, 505, 506, 507, 508, 509, 88, 556, - 88, 578, 88, 556, 88, 90, 38, 108, 88, 90, - 556, 556, 556, 556, 89, 818, 819, 529, 556, 519, - 520, 556, 55, 3, 4, 94, 91, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 106, - 20, 21, 105, 23, 556, 25, 26, 850, 579, 580, - 106, 579, 580, 59, 3, 106, 94, 105, 579, 580, - 40, 579, 580, 579, 580, 105, 62, 579, 580, 92, - 106, 106, 94, 88, 93, 105, 90, 94, 39, 106, - 657, 106, 3, 93, 810, 105, 88, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 81, 23, 24, 25, 26, 106, 75, 106, 94, - 90, 75, 298, 298, 49, 726, 17, 16, 424, 390, - 392, 632, 50, 590, 501, 391, 683, 495, 665, 736, - 683, 297, 444, 346, 1, 813, 3, 717, 650, 815, - 717, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 634, 23, 24, 25, 26, - 81, 817, 648, 851, 78, 385, 560, 88, 822, 370, - 697, 683, 93, 421, 648, 648, -1, -1, 648, 648, - -1, -1, 436, -1, 684, 3, 698, 684, -1, -1, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, -1, -1, -1, -1, 718, 25, 26, 766, - -1, -1, -1, 766, 81, -1, 34, -1, -1, 3, - 87, -1, -1, -1, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 18, 19, 736, 814, -1, 736, - 726, 25, 26, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 726, 726, 766, -1, 726, 726, -1, -1, - -1, -1, 774, 81, -1, -1, -1, -1, 825, -1, - -1, -1, 825, 773, -1, -1, 773, -1, -1, -1, + 22, 23, 43, 43, 14, 43, 14, 83, 339, 19, + 20, 83, 43, 83, 83, 43, 26, 43, 2, 2, + 83, 43, 2, 2, 2, 244, 635, 111, 112, 353, + 480, 83, 83, 526, 118, 83, 222, 341, 342, 343, + 278, 231, 396, 3, 3, 86, 86, 3, 86, 650, + 363, 650, 680, 353, 1, 86, 6, 0, 86, 413, + 86, 83, 84, 3, 86, 49, 49, 3, 3, 49, + 49, 49, 3, 3, 3, 85, 526, 87, 88, 89, + 90, 28, 29, 353, 19, 95, 3, 6, 412, 99, + 75, 3, 102, 3, 81, 105, 81, 91, 317, 49, + 88, 414, 75, 53, 3, 93, 734, 293, 81, 8, + 9, 10, 412, 88, 13, 14, 15, 16, 105, 30, + 31, 81, 49, 3, 23, 344, 53, 365, 87, 87, + 731, 87, 731, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 412, 90, 84, 85, 81, 1, 36, 60, + 8, 87, 174, 11, 65, 231, 87, 87, 344, 231, + 88, 231, 231, 88, 81, 105, 22, 88, 231, 81, + 524, 81, 93, 93, 28, 29, 8, 9, 397, 231, + 231, 371, 81, 231, 3, 89, 74, 740, 87, 92, + 78, 94, 685, 73, 74, 75, 76, 77, 78, 79, + 80, 81, 440, 88, 84, 85, 94, 87, 96, 231, + 88, 88, 821, 88, 88, 93, 769, 89, 93, 99, + 100, 89, 775, 88, 104, 105, 88, 4, 552, 6, + 101, 102, 103, 786, 48, 685, 35, 36, 37, 388, + 389, 390, 89, 20, 21, 88, 23, 24, 857, 89, + 27, 860, 82, 83, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 99, 100, 84, 85, 91, 30, 31, + 28, 29, 49, 81, 284, 91, 53, 496, 771, 91, + 99, 100, 314, 315, 316, 104, 105, 15, 16, 87, + 67, 16, 17, 384, 385, 371, 386, 387, 60, 371, + 88, 371, 371, 65, 579, 580, 68, 69, 371, 88, + 332, 89, 498, 88, 398, 88, 88, 339, 88, 371, + 371, 771, 88, 371, 89, 88, 410, 411, 89, 633, + 371, 88, 88, 88, 88, 3, 89, 830, 3, 91, + 91, 560, 364, 529, 93, 92, 8, 3, 47, 371, + 434, 537, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, 105, 23, 24, 25, + 26, 89, 89, 89, 89, 699, 3, 96, 98, 93, + 830, 92, 392, 467, 94, 97, 94, 371, 372, 372, + 90, 89, 372, 372, 372, 92, 418, 106, 420, 421, + 107, 94, 106, 95, 480, 427, 94, 58, 480, 90, + 95, 107, 94, 632, 30, 31, 88, 439, 604, 605, + 606, 88, 3, 94, 90, 81, 89, 88, 92, 648, + 90, 90, 88, 503, 503, 51, 52, 93, 448, 92, + 503, 31, 92, 92, 60, 61, 90, 90, 90, 65, + 526, 503, 68, 69, 526, 90, 88, 88, 480, 88, + 88, 502, 503, 29, 502, 90, 90, 88, 88, 88, + 492, 502, 8, 88, 502, 88, 502, 88, 88, 88, + 502, 503, 504, 505, 506, 88, 88, 88, 88, 88, + 88, 88, 823, 824, 578, 88, 88, 66, 94, 90, + 106, 90, 90, 90, 526, 88, 516, 517, 88, 88, + 105, 88, 553, 553, 88, 553, 88, 90, 88, 35, + 88, 35, 553, 108, 855, 553, 90, 553, 89, 38, + 106, 553, 55, 91, 94, 106, 3, 59, 579, 580, + 105, 579, 580, 106, 94, 62, 105, 92, 579, 580, + 105, 579, 580, 579, 580, 106, 94, 579, 580, 106, + 88, 93, 1, 90, 105, 4, 5, 6, 7, 94, + 39, 106, 106, 93, 4, 659, 6, 88, 75, 105, + 75, 20, 21, 49, 23, 106, 94, 106, 27, 731, + 20, 21, 298, 23, 24, 298, 815, 27, 17, 16, + 415, 40, 41, 42, 43, 632, 382, 381, 50, 685, + 49, 50, 383, 685, 53, 498, 590, 56, 667, 49, + 553, 741, 492, 53, 63, 64, 371, 818, 435, 722, + 652, 70, 71, 72, 634, 820, 856, 67, 722, 822, + 370, 346, 427, 78, 376, 827, 699, 86, 412, -1, + -1, 90, 560, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 685, -1, -1, 650, 650, -1, -1, + 650, 650, 650, -1, -1, -1, 686, -1, 686, -1, + -1, 703, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 771, -1, -1, -1, 771, + -1, 723, 3, 4, -1, -1, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, -1, -1, + -1, -1, 23, -1, 25, 26, -1, -1, -1, -1, + -1, 741, -1, 741, -1, 819, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 731, 731, 771, + -1, 731, 731, 731, 830, -1, -1, 779, 830, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 778, -1, + 778, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 81, -1, -1, -1, -1, -1, -1, -1, -1, 90, + -1, -1, -1, -1, -1, -1, 837, 837, -1, 837, + -1, 823, 824, -1, -1, -1, 837, -1, 830, 837, + -1, 837, -1, -1, -1, 837, 826, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, + 3, 4, -1, 855, 7, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, + 23, -1, 25, 26, 27, -1, -1, 30, 31, 32, + 33, 34, -1, -1, -1, -1, -1, 40, -1, -1, + -1, 44, 45, 46, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 3, -1, + 63, 64, -1, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, -1, -1, -1, 81, 24, + 25, 26, 1, -1, 3, 4, -1, 90, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, -1, 23, -1, 25, 26, 27, -1, + -1, 30, 31, 32, 33, 34, -1, -1, -1, -1, + -1, 40, -1, -1, -1, 44, 45, 46, -1, -1, + -1, -1, -1, -1, -1, -1, 81, -1, -1, -1, + -1, -1, 87, -1, 63, 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 81, -1, -1, - -1, 832, 832, -1, 832, -1, 818, 819, -1, -1, - -1, 832, -1, 825, 832, -1, 832, -1, -1, -1, - 832, 821, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 1, -1, 3, 4, -1, 850, 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, 81, -1, -1, -1, 1, -1, 3, 4, + -1, 90, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, -1, 23, -1, + 25, 26, 27, -1, -1, 30, 31, 32, 33, 34, + -1, -1, -1, -1, -1, 40, -1, -1, -1, 44, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 54, + -1, -1, -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 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, + -1, -1, -1, -1, -1, -1, 81, -1, -1, -1, + 1, -1, 3, 4, -1, 90, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, -1, 23, -1, 25, 26, 27, -1, -1, 30, + 31, 32, 33, 34, -1, 1, -1, 3, 4, 40, + -1, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, -1, 23, -1, 25, + 26, 27, 63, 64, 30, 31, 32, 33, 34, -1, + -1, -1, -1, -1, 40, -1, -1, -1, -1, -1, + 81, -1, -1, -1, -1, -1, -1, -1, -1, 90, + -1, -1, -1, -1, 3, -1, -1, 63, 64, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, -1, -1, -1, -1, 81, 25, 26, -1, 1, + -1, 3, 4, -1, 90, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + -1, 23, -1, 25, 26, 27, -1, -1, 30, 31, + 32, 33, 34, -1, -1, -1, -1, -1, 40, -1, + -1, -1, -1, 0, 1, -1, -1, 4, 5, 6, + 7, -1, 81, -1, -1, -1, -1, -1, -1, -1, + -1, 63, 64, 20, 21, -1, 23, -1, -1, -1, + 27, -1, -1, -1, -1, -1, -1, -1, -1, 81, + -1, -1, -1, 40, 41, 42, 43, -1, 90, -1, + -1, -1, 49, 50, -1, -1, 53, 1, -1, 56, + 4, 5, 6, 7, -1, -1, 63, 64, -1, -1, + -1, -1, -1, 70, 71, -1, 20, 21, -1, 23, + -1, -1, -1, 27, -1, -1, -1, -1, -1, 86, + 87, -1, -1, -1, -1, -1, 40, 41, 42, 43, + -1, -1, -1, -1, -1, 49, 50, -1, -1, 53, + -1, -1, 56, -1, -1, -1, -1, -1, -1, 63, + 64, -1, -1, -1, -1, -1, 70, 71, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 1, -1, 3, + -1, -1, 86, 87, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, - -1, 25, 26, 27, -1, -1, 30, 31, 32, 33, - 34, -1, -1, -1, -1, -1, 40, -1, -1, -1, - 44, 45, 46, -1, -1, -1, -1, -1, -1, -1, - -1, 81, -1, -1, -1, -1, -1, 87, -1, 63, - 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 81, -1, -1, - -1, 1, -1, 3, 4, -1, 90, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, -1, 23, -1, 25, 26, 27, -1, -1, - 30, 31, 32, 33, 34, -1, -1, -1, -1, -1, - 40, -1, -1, -1, 44, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 54, -1, -1, -1, -1, -1, - -1, -1, -1, 63, 64, -1, -1, -1, -1, -1, + 24, 25, 26, 1, -1, -1, 4, 5, 6, 7, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 20, 21, -1, 23, -1, -1, 1, 27, + -1, 4, 5, 6, 7, -1, -1, -1, -1, -1, + -1, -1, 40, 41, 42, 43, -1, 20, 21, -1, + 23, 49, 50, -1, 27, 53, -1, 81, 56, -1, + -1, -1, -1, 87, -1, 63, 64, 40, 41, 42, + 43, -1, 70, 71, 72, -1, 49, 50, -1, -1, + 53, -1, -1, 56, -1, -1, -1, -1, 86, -1, + 63, 64, -1, -1, 3, -1, -1, 70, 71, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 86, 23, 24, 25, 26, 1, -1, + 3, -1, -1, -1, -1, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 3, + 23, 24, 25, 26, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, -1, 23, + 24, 25, 26, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 81, -1, 3, -1, -1, -1, 87, 8, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, -1, -1, -1, -1, -1, 25, 26, 81, -1, + -1, 3, -1, -1, -1, 34, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, -1, 81, -1, -1, + -1, -1, -1, 25, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 81, -1, -1, -1, 1, -1, 3, 4, -1, - 90, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, -1, 23, -1, 25, - 26, 27, -1, -1, 30, 31, 32, 33, 34, -1, - 1, -1, 3, 4, 40, -1, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, -1, 23, -1, 25, 26, 27, 63, 64, 30, - 31, 32, 33, 34, -1, -1, -1, -1, -1, 40, - -1, -1, -1, -1, -1, 81, -1, -1, -1, -1, - -1, -1, -1, -1, 90, -1, -1, -1, -1, -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, -1, -1, 40, -1, -1, -1, -1, -1, 1, - -1, -1, 4, 5, 6, 7, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 63, 64, 20, 21, - -1, 23, -1, -1, -1, 27, -1, -1, -1, -1, - -1, -1, -1, -1, 81, -1, -1, -1, 40, 41, - 42, 43, -1, 90, -1, -1, -1, 49, 50, -1, - -1, 53, 0, 1, 56, -1, 4, 5, 6, 7, - -1, 63, 64, -1, -1, -1, -1, -1, 70, 71, - 72, -1, 20, 21, -1, 23, -1, -1, -1, 27, - -1, -1, -1, -1, 86, -1, -1, -1, 90, -1, - -1, -1, 40, 41, 42, 43, -1, -1, -1, -1, - -1, 49, 50, -1, -1, 53, 1, -1, 56, 4, - 5, 6, 7, -1, -1, 63, 64, -1, -1, -1, - -1, -1, 70, 71, -1, 20, 21, -1, 23, -1, - -1, 1, 27, -1, 4, 5, 6, 7, 86, 87, - -1, -1, -1, -1, -1, 40, 41, 42, 43, -1, - 20, 21, -1, 23, 49, 50, -1, 27, 53, -1, - -1, 56, -1, -1, -1, -1, -1, -1, 63, 64, - 40, 41, 42, 43, -1, 70, 71, -1, -1, 49, - 50, -1, -1, 53, 1, -1, 56, 4, 5, 6, - 7, 86, 87, 63, 64, -1, -1, -1, -1, -1, - 70, 71, 72, 20, 21, -1, 23, -1, -1, -1, - 27, -1, -1, -1, -1, -1, 86, -1, -1, -1, - -1, -1, -1, 40, 41, 42, 43, -1, -1, -1, - -1, -1, 49, 50, -1, -1, 53, -1, -1, 56, - -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, - 3, -1, -1, 70, 71, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 86, - 23, 24, 25, 26, 1, -1, 3, -1, -1, -1, - -1, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 3, 23, 24, 25, 26, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, -1, 23, 24, 25, 26, 4, - -1, 6, -1, -1, -1, -1, -1, 4, 81, 6, - -1, -1, -1, -1, 87, 20, 21, -1, 23, 24, - -1, -1, 27, 20, 21, -1, 23, 24, -1, -1, - 27, -1, -1, -1, 81, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 49, -1, -1, -1, 53, -1, - -1, -1, 49, 81, -1, -1, 53, -1, -1, -1, - -1, -1, 67, -1, -1, -1, -1, -1, -1, -1, - 67 + -1, -1, 81, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 81 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1478,90 +1488,90 @@ static const yytype_uint16 yystos[] = 20, 21, 23, 27, 40, 41, 42, 43, 49, 50, 53, 56, 63, 64, 70, 71, 86, 113, 114, 130, 132, 136, 137, 149, 152, 153, 157, 159, 162, 163, - 164, 168, 172, 174, 178, 179, 203, 204, 222, 229, - 230, 237, 246, 266, 268, 280, 282, 304, 305, 306, - 348, 399, 400, 401, 402, 403, 407, 429, 431, 454, - 455, 456, 457, 458, 462, 463, 464, 467, 471, 479, - 494, 495, 129, 205, 131, 158, 238, 267, 281, 307, - 349, 3, 202, 254, 157, 53, 157, 172, 174, 53, - 164, 174, 175, 202, 202, 432, 3, 81, 198, 201, - 198, 480, 496, 3, 91, 133, 122, 138, 150, 88, + 164, 168, 172, 174, 178, 179, 203, 204, 222, 230, + 231, 238, 247, 267, 269, 281, 283, 305, 306, 307, + 349, 400, 401, 402, 403, 404, 408, 430, 432, 455, + 456, 457, 458, 459, 463, 464, 465, 468, 472, 480, + 495, 496, 129, 205, 131, 158, 239, 268, 282, 308, + 350, 3, 202, 255, 157, 53, 157, 172, 174, 53, + 164, 174, 175, 202, 202, 433, 3, 81, 198, 201, + 198, 481, 497, 202, 91, 133, 122, 138, 150, 88, 88, 121, 93, 160, 154, 123, 165, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 24, - 25, 26, 160, 198, 241, 242, 243, 244, 245, 256, - 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, - 268, 280, 282, 306, 315, 318, 321, 322, 325, 326, - 329, 119, 115, 113, 87, 231, 116, 269, 22, 120, - 117, 118, 124, 404, 125, 430, 126, 160, 465, 465, - 127, 128, 89, 498, 88, 17, 198, 209, 256, 259, - 260, 261, 262, 263, 322, 326, 198, 202, 239, 241, + 25, 26, 160, 198, 242, 243, 244, 245, 246, 257, + 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, + 269, 281, 283, 307, 316, 319, 322, 323, 326, 327, + 330, 119, 115, 113, 87, 232, 116, 270, 22, 120, + 117, 118, 124, 405, 125, 431, 126, 160, 466, 466, + 127, 128, 89, 499, 88, 17, 198, 209, 257, 260, + 261, 262, 263, 264, 323, 327, 198, 202, 240, 242, 202, 202, 202, 202, 160, 202, 160, 169, 202, 202, - 408, 202, 199, 75, 81, 75, 230, 230, 89, 89, + 409, 202, 199, 75, 81, 75, 231, 231, 89, 89, 88, 4, 6, 20, 21, 23, 24, 27, 49, 53, - 67, 472, 473, 475, 230, 491, 88, 48, 176, 89, - 88, 89, 8, 11, 8, 9, 91, 319, 173, 92, - 94, 91, 91, 88, 88, 198, 88, 89, 283, 88, - 88, 88, 88, 89, 88, 89, 441, 88, 466, 459, - 468, 88, 88, 499, 206, 240, 308, 350, 89, 93, - 410, 433, 201, 200, 3, 231, 3, 223, 134, 209, - 91, 3, 139, 474, 73, 74, 75, 76, 77, 78, + 67, 473, 474, 476, 231, 492, 88, 48, 176, 89, + 88, 89, 8, 11, 8, 9, 91, 320, 173, 92, + 94, 91, 91, 88, 88, 198, 88, 89, 284, 88, + 88, 88, 88, 89, 88, 89, 442, 88, 467, 460, + 469, 88, 88, 500, 206, 241, 309, 351, 89, 93, + 411, 434, 201, 200, 3, 232, 3, 223, 134, 209, + 91, 3, 139, 475, 73, 74, 75, 76, 77, 78, 79, 80, 84, 85, 99, 100, 104, 105, 198, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, - 493, 92, 161, 155, 166, 8, 211, 221, 91, 47, - 177, 316, 323, 327, 105, 232, 270, 105, 405, 442, - 177, 89, 89, 501, 202, 202, 247, 250, 254, 255, - 330, 89, 89, 170, 411, 409, 93, 438, 201, 481, - 497, 90, 204, 209, 224, 225, 226, 227, 228, 237, - 264, 111, 112, 3, 92, 94, 219, 219, 219, 211, - 96, 97, 98, 82, 83, 99, 100, 101, 102, 103, - 492, 151, 195, 198, 185, 180, 94, 320, 195, 221, - 221, 221, 201, 211, 233, 234, 236, 272, 274, 275, - 284, 412, 444, 460, 469, 30, 31, 60, 65, 68, - 69, 337, 338, 343, 421, 423, 424, 490, 500, 502, - 207, 331, 248, 309, 351, 185, 198, 177, 439, 434, - 89, 410, 88, 29, 254, 135, 92, 140, 475, 106, - 213, 214, 215, 216, 216, 217, 217, 218, 218, 218, - 94, 202, 196, 1, 32, 33, 156, 186, 204, 237, - 337, 348, 353, 358, 399, 400, 44, 45, 46, 167, - 181, 182, 186, 360, 211, 230, 317, 324, 328, 95, - 106, 94, 235, 271, 273, 230, 230, 51, 52, 61, - 337, 406, 413, 421, 423, 426, 427, 428, 490, 44, - 54, 186, 443, 445, 448, 451, 185, 180, 339, 344, - 19, 198, 422, 58, 425, 198, 198, 505, 503, 504, - 422, 506, 90, 95, 107, 332, 334, 94, 230, 311, - 314, 273, 171, 198, 177, 482, 4, 90, 3, 89, - 230, 94, 194, 90, 190, 187, 192, 191, 193, 34, - 198, 243, 322, 326, 359, 382, 188, 189, 361, 184, - 183, 90, 88, 92, 242, 92, 92, 92, 211, 201, - 236, 90, 274, 1, 241, 276, 8, 198, 256, 261, - 262, 263, 289, 306, 198, 198, 198, 419, 90, 414, - 415, 416, 417, 418, 420, 202, 202, 90, 446, 447, - 461, 470, 31, 382, 201, 3, 3, 88, 88, 88, - 201, 88, 208, 335, 333, 249, 3, 310, 312, 352, - 90, 435, 337, 421, 423, 484, 486, 209, 141, 493, - 197, 88, 88, 88, 88, 88, 88, 354, 88, 88, - 230, 276, 276, 235, 279, 277, 285, 201, 201, 201, - 88, 88, 88, 88, 88, 88, 88, 449, 452, 88, - 88, 90, 90, 340, 345, 210, 221, 334, 250, 90, - 94, 90, 66, 489, 487, 488, 483, 485, 72, 114, - 130, 143, 145, 146, 198, 230, 3, 88, 247, 106, - 105, 364, 364, 382, 251, 254, 336, 313, 436, 88, - 88, 88, 90, 486, 198, 142, 144, 88, 3, 362, - 278, 286, 365, 366, 450, 453, 341, 346, 252, 108, - 314, 198, 147, 90, 145, 355, 364, 88, 89, 106, - 35, 367, 370, 38, 384, 384, 251, 55, 387, 94, - 437, 91, 105, 373, 363, 287, 371, 106, 368, 385, - 342, 388, 347, 253, 59, 440, 3, 476, 478, 374, - 375, 356, 384, 1, 28, 29, 290, 292, 296, 298, - 382, 94, 105, 384, 105, 62, 390, 254, 198, 92, - 477, 106, 35, 36, 37, 376, 379, 383, 384, 295, - 300, 299, 288, 291, 293, 297, 372, 369, 386, 389, - 391, 148, 94, 106, 377, 380, 357, 88, 211, 93, - 90, 292, 230, 298, 250, 370, 195, 195, 105, 202, - 478, 94, 382, 39, 393, 301, 241, 302, 106, 106, - 392, 378, 381, 394, 93, 303, 294, 195, 379, 250, - 105, 250, 88, 106, 395, 75, 396, 397, 106, 94, - 398, 75 + 494, 92, 161, 155, 166, 8, 211, 221, 91, 47, + 177, 317, 324, 328, 105, 233, 271, 105, 406, 443, + 177, 89, 89, 502, 202, 202, 248, 251, 255, 256, + 331, 89, 89, 170, 412, 410, 93, 439, 201, 482, + 498, 224, 111, 112, 3, 92, 94, 219, 219, 219, + 211, 96, 97, 98, 82, 83, 99, 100, 101, 102, + 103, 493, 151, 195, 198, 185, 180, 94, 321, 195, + 221, 221, 221, 201, 211, 234, 235, 237, 273, 275, + 276, 285, 413, 445, 461, 470, 30, 31, 60, 65, + 68, 69, 338, 339, 344, 422, 424, 425, 491, 501, + 503, 207, 332, 249, 310, 352, 185, 198, 177, 440, + 435, 89, 411, 7, 90, 204, 209, 225, 227, 228, + 265, 307, 135, 92, 140, 476, 106, 213, 214, 215, + 216, 216, 217, 217, 218, 218, 218, 94, 202, 196, + 1, 32, 33, 156, 186, 204, 238, 338, 349, 354, + 359, 400, 401, 44, 45, 46, 167, 181, 182, 186, + 361, 211, 231, 318, 325, 329, 95, 106, 94, 236, + 272, 274, 231, 231, 51, 52, 61, 338, 407, 414, + 422, 424, 427, 428, 429, 491, 44, 54, 186, 444, + 446, 449, 452, 185, 180, 340, 345, 19, 198, 423, + 58, 426, 198, 198, 506, 504, 505, 423, 507, 90, + 95, 107, 333, 335, 94, 231, 312, 315, 274, 171, + 198, 177, 483, 226, 88, 202, 88, 90, 3, 89, + 231, 94, 194, 90, 190, 187, 192, 191, 193, 34, + 198, 244, 323, 327, 360, 383, 188, 189, 362, 184, + 183, 90, 88, 92, 243, 92, 92, 92, 211, 201, + 237, 90, 275, 1, 242, 277, 8, 198, 257, 262, + 263, 264, 290, 307, 198, 198, 198, 420, 90, 415, + 416, 417, 418, 419, 421, 202, 202, 90, 447, 448, + 462, 471, 31, 383, 201, 3, 3, 88, 88, 88, + 201, 88, 208, 336, 334, 250, 3, 311, 313, 353, + 90, 436, 338, 422, 424, 485, 487, 240, 29, 229, + 141, 494, 197, 88, 88, 88, 88, 88, 88, 355, + 88, 88, 231, 277, 277, 236, 280, 278, 286, 201, + 201, 201, 88, 88, 88, 88, 88, 88, 88, 450, + 453, 88, 88, 90, 90, 341, 346, 210, 221, 335, + 251, 90, 94, 90, 66, 490, 488, 489, 484, 486, + 88, 211, 88, 72, 114, 130, 143, 145, 146, 198, + 231, 3, 88, 248, 106, 105, 365, 365, 383, 252, + 255, 337, 314, 437, 88, 88, 88, 90, 487, 198, + 142, 144, 88, 3, 363, 279, 287, 366, 367, 451, + 454, 342, 347, 253, 108, 315, 198, 147, 90, 145, + 356, 365, 88, 89, 106, 35, 368, 371, 38, 385, + 385, 252, 55, 388, 94, 438, 91, 105, 374, 364, + 288, 372, 106, 369, 386, 343, 389, 348, 254, 59, + 441, 3, 477, 479, 375, 376, 357, 385, 1, 28, + 29, 291, 293, 297, 299, 383, 94, 105, 385, 105, + 62, 391, 255, 198, 92, 478, 106, 35, 36, 37, + 377, 380, 384, 385, 296, 301, 300, 289, 292, 294, + 298, 373, 370, 387, 390, 392, 148, 94, 106, 378, + 381, 358, 88, 211, 93, 90, 293, 231, 299, 251, + 371, 195, 195, 105, 202, 479, 94, 383, 39, 394, + 302, 242, 303, 106, 106, 393, 379, 382, 395, 93, + 304, 295, 195, 380, 251, 105, 251, 88, 106, 396, + 75, 397, 398, 106, 94, 399, 75 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ @@ -1586,47 +1596,47 @@ static const yytype_uint16 yyr1[] = 212, 212, 213, 213, 214, 214, 215, 215, 215, 216, 216, 216, 217, 217, 217, 217, 218, 218, 218, 218, 219, 219, 219, 220, 220, 220, 220, 220, 220, 220, - 220, 220, 220, 221, 222, 223, 223, 224, 224, 224, - 225, 226, 226, 227, 228, 228, 229, 230, 230, 231, - 232, 232, 233, 233, 234, 235, 235, 236, 238, 237, - 237, 237, 237, 237, 237, 240, 239, 241, 241, 242, - 242, 242, 243, 243, 243, 243, 243, 243, 243, 243, - 244, 244, 244, 244, 245, 245, 245, 246, 246, 247, - 249, 248, 248, 250, 250, 251, 253, 252, 252, 254, - 255, 256, 256, 257, 257, 257, 258, 258, 258, 259, - 259, 259, 260, 261, 261, 262, 263, 264, 265, 267, - 266, 269, 270, 271, 268, 272, 273, 273, 275, 274, - 277, 278, 276, 279, 276, 281, 280, 283, 284, 285, - 286, 287, 288, 282, 289, 289, 289, 289, 289, 289, - 290, 291, 291, 293, 294, 292, 295, 292, 296, 297, - 297, 299, 298, 300, 301, 298, 303, 302, 304, 305, - 307, 308, 309, 310, 306, 311, 313, 312, 312, 314, - 316, 317, 315, 315, 319, 320, 318, 321, 323, 324, - 322, 322, 325, 327, 328, 326, 326, 329, 331, 330, - 332, 333, 333, 335, 336, 334, 337, 337, 339, 340, - 341, 342, 338, 344, 345, 346, 347, 343, 349, 350, - 351, 352, 348, 354, 355, 356, 357, 353, 358, 358, - 358, 359, 359, 361, 362, 363, 360, 365, 364, 366, - 364, 367, 369, 368, 368, 371, 372, 370, 374, 373, - 375, 373, 376, 378, 377, 377, 380, 381, 379, 382, - 382, 382, 382, 383, 383, 383, 385, 386, 384, 384, - 388, 389, 387, 387, 391, 392, 390, 390, 394, 395, - 393, 393, 396, 398, 397, 397, 399, 400, 401, 401, - 402, 404, 405, 406, 403, 408, 409, 407, 411, 410, - 410, 412, 412, 414, 413, 415, 413, 416, 413, 417, - 413, 418, 413, 419, 413, 420, 413, 421, 422, 422, - 423, 424, 425, 425, 426, 427, 428, 430, 429, 432, - 433, 434, 435, 436, 437, 431, 439, 438, 438, 440, - 440, 442, 443, 441, 444, 444, 445, 446, 445, 447, - 445, 449, 450, 448, 452, 453, 451, 454, 454, 454, - 455, 455, 456, 457, 459, 460, 461, 458, 462, 463, - 464, 466, 465, 468, 469, 470, 467, 471, 471, 472, - 472, 472, 472, 472, 472, 472, 472, 472, 472, 473, - 474, 474, 475, 475, 476, 477, 477, 478, 480, 481, - 482, 483, 479, 484, 485, 485, 487, 486, 488, 486, - 489, 486, 490, 490, 491, 492, 492, 493, 494, 496, - 497, 495, 499, 500, 498, 501, 501, 503, 502, 504, - 502, 505, 502, 506, 502 + 220, 220, 220, 221, 223, 222, 224, 224, 225, 225, + 225, 226, 225, 227, 227, 228, 229, 229, 230, 231, + 231, 232, 233, 233, 234, 234, 235, 236, 236, 237, + 239, 238, 238, 238, 238, 238, 238, 241, 240, 242, + 242, 243, 243, 243, 244, 244, 244, 244, 244, 244, + 244, 244, 245, 245, 245, 245, 246, 246, 246, 247, + 247, 248, 250, 249, 249, 251, 251, 252, 254, 253, + 253, 255, 256, 257, 257, 258, 258, 258, 259, 259, + 259, 260, 260, 260, 261, 262, 262, 263, 264, 265, + 266, 268, 267, 270, 271, 272, 269, 273, 274, 274, + 276, 275, 278, 279, 277, 280, 277, 282, 281, 284, + 285, 286, 287, 288, 289, 283, 290, 290, 290, 290, + 290, 290, 291, 292, 292, 294, 295, 293, 296, 293, + 297, 298, 298, 300, 299, 301, 302, 299, 304, 303, + 305, 306, 308, 309, 310, 311, 307, 312, 314, 313, + 313, 315, 317, 318, 316, 316, 320, 321, 319, 322, + 324, 325, 323, 323, 326, 328, 329, 327, 327, 330, + 332, 331, 333, 334, 334, 336, 337, 335, 338, 338, + 340, 341, 342, 343, 339, 345, 346, 347, 348, 344, + 350, 351, 352, 353, 349, 355, 356, 357, 358, 354, + 359, 359, 359, 360, 360, 362, 363, 364, 361, 366, + 365, 367, 365, 368, 370, 369, 369, 372, 373, 371, + 375, 374, 376, 374, 377, 379, 378, 378, 381, 382, + 380, 383, 383, 383, 383, 384, 384, 384, 386, 387, + 385, 385, 389, 390, 388, 388, 392, 393, 391, 391, + 395, 396, 394, 394, 397, 399, 398, 398, 400, 401, + 402, 402, 403, 405, 406, 407, 404, 409, 410, 408, + 412, 411, 411, 413, 413, 415, 414, 416, 414, 417, + 414, 418, 414, 419, 414, 420, 414, 421, 414, 422, + 423, 423, 424, 425, 426, 426, 427, 428, 429, 431, + 430, 433, 434, 435, 436, 437, 438, 432, 440, 439, + 439, 441, 441, 443, 444, 442, 445, 445, 446, 447, + 446, 448, 446, 450, 451, 449, 453, 454, 452, 455, + 455, 455, 456, 456, 457, 458, 460, 461, 462, 459, + 463, 464, 465, 467, 466, 469, 470, 471, 468, 472, + 472, 473, 473, 473, 473, 473, 473, 473, 473, 473, + 473, 474, 475, 475, 476, 476, 477, 478, 478, 479, + 481, 482, 483, 484, 480, 485, 486, 486, 488, 487, + 489, 487, 490, 487, 491, 491, 492, 493, 493, 494, + 495, 497, 498, 496, 500, 501, 499, 502, 502, 504, + 503, 505, 503, 506, 503, 507, 503 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1651,47 +1661,47 @@ static const yytype_uint8 yyr2[] = 1, 3, 1, 3, 1, 3, 1, 3, 3, 1, 3, 3, 1, 3, 3, 3, 1, 2, 2, 2, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 5, 3, 0, 1, 1, 1, - 2, 1, 1, 4, 1, 1, 2, 2, 0, 3, - 3, 0, 1, 1, 2, 3, 0, 3, 0, 3, - 1, 1, 1, 2, 1, 0, 3, 1, 1, 1, + 1, 1, 1, 1, 0, 6, 2, 0, 1, 2, + 2, 0, 4, 1, 1, 4, 2, 0, 2, 2, + 0, 3, 3, 0, 1, 1, 2, 3, 0, 3, + 0, 3, 1, 1, 1, 2, 1, 0, 3, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 0, 4, 0, 1, 1, 2, 0, 4, + 0, 1, 1, 1, 1, 1, 2, 1, 2, 3, + 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 0, 3, 0, 0, 0, 7, 2, 2, 0, + 0, 3, 0, 0, 5, 0, 3, 0, 3, 0, + 0, 0, 0, 0, 0, 15, 1, 1, 1, 1, + 1, 1, 2, 2, 0, 0, 0, 6, 0, 3, + 2, 2, 0, 0, 3, 0, 0, 5, 0, 3, + 1, 1, 0, 0, 0, 0, 9, 2, 0, 4, + 0, 2, 0, 0, 6, 2, 0, 0, 6, 6, + 0, 0, 6, 1, 1, 0, 0, 6, 1, 1, + 0, 3, 2, 2, 0, 0, 0, 5, 1, 1, + 0, 0, 0, 0, 9, 0, 0, 0, 0, 9, + 0, 0, 0, 0, 9, 0, 0, 0, 0, 11, + 1, 1, 0, 1, 1, 0, 0, 0, 8, 0, + 3, 0, 4, 2, 0, 4, 0, 0, 0, 5, + 0, 3, 0, 4, 2, 0, 4, 0, 0, 0, + 5, 1, 1, 1, 1, 1, 1, 1, 0, 0, + 6, 0, 0, 0, 6, 0, 0, 0, 6, 0, + 0, 0, 6, 0, 2, 0, 4, 0, 3, 3, + 1, 1, 2, 0, 0, 0, 7, 0, 0, 6, + 0, 3, 0, 2, 0, 0, 3, 0, 3, 0, + 3, 0, 3, 0, 3, 0, 3, 0, 3, 3, + 1, 1, 3, 2, 1, 0, 3, 3, 3, 0, + 3, 0, 0, 0, 0, 0, 0, 13, 0, 3, + 0, 2, 0, 0, 0, 5, 2, 0, 1, 0, + 3, 0, 3, 0, 0, 6, 0, 0, 6, 1, + 1, 1, 1, 1, 2, 3, 0, 0, 0, 8, + 3, 3, 2, 0, 3, 0, 0, 0, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, - 0, 4, 0, 1, 1, 2, 0, 4, 0, 1, - 1, 1, 1, 1, 2, 1, 2, 3, 2, 1, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 0, - 3, 0, 0, 0, 7, 2, 2, 0, 0, 3, - 0, 0, 5, 0, 3, 0, 3, 0, 0, 0, - 0, 0, 0, 15, 1, 1, 1, 1, 1, 1, - 2, 2, 0, 0, 0, 6, 0, 3, 2, 2, - 0, 0, 3, 0, 0, 5, 0, 3, 1, 1, - 0, 0, 0, 0, 9, 2, 0, 4, 0, 2, - 0, 0, 6, 2, 0, 0, 6, 6, 0, 0, - 6, 1, 1, 0, 0, 6, 1, 1, 0, 3, - 2, 2, 0, 0, 0, 5, 1, 1, 0, 0, - 0, 0, 9, 0, 0, 0, 0, 9, 0, 0, - 0, 0, 9, 0, 0, 0, 0, 11, 1, 1, - 0, 1, 1, 0, 0, 0, 8, 0, 3, 0, - 4, 2, 0, 4, 0, 0, 0, 5, 0, 3, - 0, 4, 2, 0, 4, 0, 0, 0, 5, 1, - 1, 1, 1, 1, 1, 1, 0, 0, 6, 0, - 0, 0, 6, 0, 0, 0, 6, 0, 0, 0, - 6, 0, 2, 0, 4, 0, 3, 3, 1, 1, - 2, 0, 0, 0, 7, 0, 0, 6, 0, 3, - 0, 2, 0, 0, 3, 0, 3, 0, 3, 0, - 3, 0, 3, 0, 3, 0, 3, 3, 1, 1, - 3, 2, 1, 0, 3, 3, 3, 0, 3, 0, - 0, 0, 0, 0, 0, 13, 0, 3, 0, 2, - 0, 0, 0, 5, 2, 0, 1, 0, 3, 0, - 3, 0, 0, 6, 0, 0, 6, 1, 1, 1, - 1, 1, 2, 3, 0, 0, 0, 8, 3, 3, - 2, 0, 3, 0, 0, 0, 8, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, - 3, 0, 2, 5, 2, 3, 0, 1, 0, 0, - 0, 0, 10, 2, 2, 0, 0, 3, 0, 3, - 0, 3, 3, 3, 3, 4, 0, 1, 2, 0, - 0, 6, 0, 0, 5, 2, 0, 0, 3, 0, - 3, 0, 3, 0, 3 + 2, 2, 3, 0, 2, 5, 2, 3, 0, 1, + 0, 0, 0, 0, 10, 2, 2, 0, 0, 3, + 0, 3, 0, 3, 3, 3, 3, 4, 0, 1, + 2, 0, 0, 6, 0, 0, 5, 2, 0, 0, + 3, 0, 3, 0, 3, 0, 3 }; @@ -2369,7 +2379,7 @@ yyreduce: switch (yyn) { case 5: -#line 395 "fe/idl.ypp" /* yacc.c:1651 */ +#line 398 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Decl *d = (yyvsp[0].dcval); if (d) @@ -2382,314 +2392,314 @@ yyreduce: "Annotating this type of definition is not supported"); } } -#line 2386 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2396 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 6: -#line 408 "fe/idl.ypp" /* yacc.c:1651 */ +#line 411 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 2393 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2403 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 7: -#line 414 "fe/idl.ypp" /* yacc.c:1651 */ +#line 417 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 2401 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2411 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 8: -#line 418 "fe/idl.ypp" /* yacc.c:1651 */ +#line 421 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = 0; } -#line 2409 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2419 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 9: -#line 422 "fe/idl.ypp" /* yacc.c:1651 */ +#line 425 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = 0; } -#line 2417 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2427 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 10: -#line 429 "fe/idl.ypp" /* yacc.c:1651 */ +#line 432 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AnnotationDeclSeen); } -#line 2425 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2435 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 11: -#line 433 "fe/idl.ypp" /* yacc.c:1651 */ +#line 436 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2434 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2444 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 12: -#line 438 "fe/idl.ypp" /* yacc.c:1651 */ +#line 441 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 2442 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2452 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 13: -#line 442 "fe/idl.ypp" /* yacc.c:1651 */ +#line 445 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 2451 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2461 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 14: -#line 447 "fe/idl.ypp" /* yacc.c:1651 */ +#line 450 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 2459 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2469 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 15: -#line 451 "fe/idl.ypp" /* yacc.c:1651 */ +#line 454 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2468 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2478 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 16: -#line 456 "fe/idl.ypp" /* yacc.c:1651 */ +#line 459 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 2476 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2486 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 17: -#line 460 "fe/idl.ypp" /* yacc.c:1651 */ +#line 463 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2485 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2495 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 18: -#line 465 "fe/idl.ypp" /* yacc.c:1651 */ +#line 468 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 2493 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2503 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 19: -#line 469 "fe/idl.ypp" /* yacc.c:1651 */ +#line 472 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 2502 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2512 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 20: -#line 474 "fe/idl.ypp" /* yacc.c:1651 */ +#line 477 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 2510 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2520 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 21: -#line 478 "fe/idl.ypp" /* yacc.c:1651 */ +#line 481 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2519 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2529 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 22: -#line 483 "fe/idl.ypp" /* yacc.c:1651 */ +#line 486 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen); } -#line 2527 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2537 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 23: -#line 487 "fe/idl.ypp" /* yacc.c:1651 */ +#line 490 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2536 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2546 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 24: -#line 492 "fe/idl.ypp" /* yacc.c:1651 */ +#line 495 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen); } -#line 2544 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2554 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 25: -#line 496 "fe/idl.ypp" /* yacc.c:1651 */ +#line 499 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = (yyvsp[-2].dcval); } -#line 2553 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2563 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 26: -#line 501 "fe/idl.ypp" /* yacc.c:1651 */ +#line 504 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeDeclSeen); } -#line 2561 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2571 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 27: -#line 505 "fe/idl.ypp" /* yacc.c:1651 */ +#line 508 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2570 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2580 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 28: -#line 510 "fe/idl.ypp" /* yacc.c:1651 */ +#line 513 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentDeclSeen); } -#line 2578 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2588 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 29: -#line 514 "fe/idl.ypp" /* yacc.c:1651 */ +#line 517 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2587 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2597 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 30: -#line 519 "fe/idl.ypp" /* yacc.c:1651 */ +#line 522 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeDeclSeen); } -#line 2595 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2605 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 31: -#line 523 "fe/idl.ypp" /* yacc.c:1651 */ +#line 526 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2604 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2614 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 32: -#line 528 "fe/idl.ypp" /* yacc.c:1651 */ +#line 531 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventDeclSeen); } -#line 2612 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2622 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 33: -#line 532 "fe/idl.ypp" /* yacc.c:1651 */ +#line 535 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2621 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2631 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 34: -#line 537 "fe/idl.ypp" /* yacc.c:1651 */ +#line 540 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeDeclSeen); } -#line 2629 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2639 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 35: -#line 541 "fe/idl.ypp" /* yacc.c:1651 */ +#line 544 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2638 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2648 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 36: -#line 546 "fe/idl.ypp" /* yacc.c:1651 */ +#line 549 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorDeclSeen); } -#line 2646 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2656 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 37: -#line 550 "fe/idl.ypp" /* yacc.c:1651 */ +#line 553 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); (yyval.dcval) = 0; } -#line 2655 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2665 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 38: -#line 555 "fe/idl.ypp" /* yacc.c:1651 */ +#line 558 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 2663 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2673 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 39: -#line 559 "fe/idl.ypp" /* yacc.c:1651 */ +#line 562 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; (yyval.dcval) = 0; } -#line 2673 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2683 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 40: -#line 568 "fe/idl.ypp" /* yacc.c:1651 */ +#line 571 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSeen); } -#line 2681 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2691 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 41: -#line 572 "fe/idl.ypp" /* yacc.c:1651 */ +#line 575 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 2689 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2699 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 42: -#line 579 "fe/idl.ypp" /* yacc.c:1651 */ +#line 582 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleIDSeen); @@ -2728,27 +2738,27 @@ yyreduce: (yyval.dcval) = m; } -#line 2732 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2742 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 43: -#line 618 "fe/idl.ypp" /* yacc.c:1651 */ +#line 621 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSqSeen); } -#line 2740 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2750 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 44: -#line 622 "fe/idl.ypp" /* yacc.c:1651 */ +#line 625 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen); } -#line 2748 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2758 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 45: -#line 626 "fe/idl.ypp" /* yacc.c:1651 */ +#line 629 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ModuleQsSeen); /* @@ -2758,19 +2768,19 @@ yyreduce: idl_global->scopes ().pop (); (yyval.dcval) = (yyvsp[-5].dcval); } -#line 2762 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2772 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 46: -#line 639 "fe/idl.ypp" /* yacc.c:1651 */ +#line 642 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleIDSeen); } -#line 2770 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2780 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 47: -#line 646 "fe/idl.ypp" /* yacc.c:1651 */ +#line 649 "fe/idl.ypp" /* yacc.c:1651 */ { // The module_header rule is common to template module, fixed // module and instantiated template module. In the last @@ -2784,11 +2794,11 @@ yyreduce: IDL_GlobalData::PS_ModuleIDSeen); } } -#line 2788 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2798 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 48: -#line 660 "fe/idl.ypp" /* yacc.c:1651 */ +#line 663 "fe/idl.ypp" /* yacc.c:1651 */ { if (FE_Utils::duplicate_param_id ((yyvsp[0].plval))) { @@ -2798,11 +2808,11 @@ yyreduce: return 1; } } -#line 2802 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2812 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 49: -#line 670 "fe/idl.ypp" /* yacc.c:1651 */ +#line 673 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleParamsSeen); @@ -2832,27 +2842,27 @@ yyreduce: // of the template module. idl_global->current_params ((yyvsp[-2].plval)); } -#line 2836 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2846 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 50: -#line 700 "fe/idl.ypp" /* yacc.c:1651 */ +#line 703 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleSqSeen); } -#line 2844 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2854 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 51: -#line 704 "fe/idl.ypp" /* yacc.c:1651 */ +#line 707 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleBodySeen); } -#line 2852 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2862 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 52: -#line 708 "fe/idl.ypp" /* yacc.c:1651 */ +#line 711 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleQsSeen); @@ -2869,29 +2879,29 @@ yyreduce: // that we are no longer in a template module scope. idl_global->current_params (0); } -#line 2873 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2883 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 58: -#line 742 "fe/idl.ypp" /* yacc.c:1651 */ +#line 745 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefSeen); } -#line 2882 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2892 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 59: -#line 747 "fe/idl.ypp" /* yacc.c:1651 */ +#line 750 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefParamsSeen); } -#line 2891 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2901 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 60: -#line 752 "fe/idl.ypp" /* yacc.c:1651 */ +#line 755 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefIDSeen); @@ -2969,29 +2979,29 @@ yyreduce: idl_global->in_tmpl_mod_no_alias (itmna_flag); idl_global->in_tmpl_mod_alias (false); } -#line 2973 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2983 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 61: -#line 833 "fe/idl.ypp" /* yacc.c:1651 */ +#line 836 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleSeen); } -#line 2982 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 2992 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 62: -#line 838 "fe/idl.ypp" /* yacc.c:1651 */ +#line 841 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleArgsSeen); } -#line 2991 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3001 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 63: -#line 843 "fe/idl.ypp" /* yacc.c:1651 */ +#line 846 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleIDSeen); @@ -3053,11 +3063,11 @@ yyreduce: idl_global->set_err_count (idl_global->err_count () + 1); } } -#line 3057 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3067 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 66: -#line 913 "fe/idl.ypp" /* yacc.c:1651 */ +#line 916 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Interface *i = 0; @@ -3095,27 +3105,27 @@ yyreduce: */ idl_global->scopes ().push (i); } -#line 3099 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3109 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 67: -#line 951 "fe/idl.ypp" /* yacc.c:1651 */ +#line 954 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSqSeen); } -#line 3107 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3117 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 68: -#line 955 "fe/idl.ypp" /* yacc.c:1651 */ +#line 958 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen); } -#line 3115 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3125 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 69: -#line 959 "fe/idl.ypp" /* yacc.c:1651 */ +#line 962 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceQsSeen); @@ -3124,28 +3134,28 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3128 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3138 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 70: -#line 971 "fe/idl.ypp" /* yacc.c:1651 */ +#line 974 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSeen); } -#line 3136 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3146 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 71: -#line 975 "fe/idl.ypp" /* yacc.c:1651 */ +#line 978 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3145 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3155 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 72: -#line 983 "fe/idl.ypp" /* yacc.c:1651 */ +#line 986 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3181,11 +3191,11 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3185 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3195 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 73: -#line 1020 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1023 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3214,11 +3224,11 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3218 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3228 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 74: -#line 1050 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1053 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3247,50 +3257,44 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3251 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3261 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 75: -#line 1082 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1085 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 3259 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3269 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 76: -#line 1086 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1089 "fe/idl.ypp" /* yacc.c:1651 */ { (yyvsp[0].nlval)->truncatable ((yyvsp[-2].bval)); (yyval.nlval) = (yyvsp[0].nlval); } -#line 3268 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3278 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 77: -#line 1091 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1094 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 3276 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3286 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 82: -#line 1105 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1108 "fe/idl.ypp" /* yacc.c:1651 */ { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("error in %C line %d\n"), - idl_global->filename ()->get_string (), - idl_global->lineno ())); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Sorry, I (TAO_IDL) can't handle") - ACE_TEXT (" custom yet\n"))); + idl_global->err ()->unsupported_error ("custom is not supported"); } -#line 3290 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3294 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 84: -#line 1119 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1116 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_ValueType *v = 0; @@ -3333,27 +3337,27 @@ yyreduce: */ idl_global->scopes ().push (v); } -#line 3337 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3341 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 85: -#line 1162 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1159 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3345 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3349 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 86: -#line 1166 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1163 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3353 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3357 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 87: -#line 1170 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1167 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen); @@ -3372,11 +3376,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3376 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3380 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 88: -#line 1193 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1190 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_ValueType *v = 0; @@ -3419,27 +3423,27 @@ yyreduce: */ idl_global->scopes ().push (v); } -#line 3423 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3427 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 89: -#line 1236 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1233 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3431 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3435 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 90: -#line 1240 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1237 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3439 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3443 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 91: -#line 1244 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1241 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen); @@ -3448,19 +3452,19 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3452 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3456 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 92: -#line 1257 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1254 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 3460 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3464 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 93: -#line 1261 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1258 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -3491,61 +3495,61 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 3495 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3499 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 94: -#line 1295 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1292 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSeen); } -#line 3503 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3507 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 95: -#line 1299 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1296 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3512 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3516 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 96: -#line 1307 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1304 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.bval) = true; } -#line 3520 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3524 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 97: -#line 1311 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1308 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.bval) = false; } -#line 3528 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3532 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 98: -#line 1319 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1316 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = (yyvsp[0].nlval); } -#line 3536 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3540 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 99: -#line 1323 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1320 "fe/idl.ypp" /* yacc.c:1651 */ { /* | EMPTY */ (yyval.nlval) = 0; } -#line 3545 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3549 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 100: -#line 1332 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1329 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -3568,11 +3572,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3572 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3576 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 101: -#line 1356 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1353 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -3595,11 +3599,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3599 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3603 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 102: -#line 1382 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1379 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen); @@ -3660,191 +3664,191 @@ yyreduce: delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 3664 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3668 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 108: -#line 1458 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1455 "fe/idl.ypp" /* yacc.c:1651 */ { /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_PUBLIC; } -#line 3673 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3677 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 109: -#line 1463 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1460 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 3680 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3684 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 110: -#line 1466 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1463 "fe/idl.ypp" /* yacc.c:1651 */ { /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_PRIVATE; } -#line 3689 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3693 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 111: -#line 1471 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1468 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 3696 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3700 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 114: -#line 1482 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1479 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 3704 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3708 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 115: -#line 1486 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1483 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3712 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3716 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 116: -#line 1490 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1487 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 3720 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3724 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 117: -#line 1494 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1491 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3728 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3732 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 118: -#line 1498 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1495 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 3736 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3740 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 119: -#line 1502 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1499 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3744 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3748 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 120: -#line 1506 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1503 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 3752 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3756 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 121: -#line 1510 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1507 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } -#line 3760 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3764 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 122: -#line 1514 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1511 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 3768 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3772 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 123: -#line 1518 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1515 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3776 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3780 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 124: -#line 1522 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1519 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 3784 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3788 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 125: -#line 1526 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1523 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3792 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3796 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 126: -#line 1530 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1527 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen); } -#line 3800 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3804 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 127: -#line 1534 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1531 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3808 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3812 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 128: -#line 1538 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1535 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 3816 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3820 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 129: -#line 1542 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1539 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 3825 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3829 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 130: -#line 1550 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1547 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.nlval), UTL_NameList ((yyvsp[-1].idlist), (yyvsp[0].nlval)), 1); } -#line 3836 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3840 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 131: -#line 1561 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1558 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SNListCommaSeen); } -#line 3844 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3848 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 132: -#line 1565 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1562 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ScopedNameSeen); @@ -3864,19 +3868,19 @@ yyreduce: (yyval.nlval) = (yyvsp[-3].nlval); } } -#line 3868 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3872 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 133: -#line 1585 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1582 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 3876 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3880 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 134: -#line 1592 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1589 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -3885,19 +3889,19 @@ yyreduce: 0), 1); } -#line 3889 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3893 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 135: -#line 1601 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1598 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); } -#line 3897 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3901 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 136: -#line 1605 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1602 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -3917,11 +3921,11 @@ yyreduce: sn), 1); } -#line 3921 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3925 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 137: -#line 1626 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1623 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); @@ -3931,11 +3935,11 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3935 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3939 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 138: -#line 1636 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1633 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -3947,11 +3951,11 @@ yyreduce: (yyvsp[-3].idlist)->nconc (sn); (yyval.idlist) = (yyvsp[-3].idlist); } -#line 3951 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3955 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 139: -#line 1650 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1647 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.idval), Identifier ((yyvsp[0].strval)), @@ -3959,11 +3963,11 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3963 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3967 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 140: -#line 1660 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1657 "fe/idl.ypp" /* yacc.c:1651 */ { /* defining_id is a defining identifier whereas id is usually a reference to a defining identifier */ @@ -3971,11 +3975,11 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3975 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 3979 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 141: -#line 1671 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1668 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -4018,11 +4022,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4022 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4026 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 142: -#line 1715 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1712 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -4048,11 +4052,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4052 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4056 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 143: -#line 1742 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1739 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -4078,43 +4082,43 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4082 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4086 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 144: -#line 1771 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1768 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConstSeen); } -#line 4090 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4094 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 145: -#line 1775 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1772 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConstTypeSeen); } -#line 4098 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4102 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 146: -#line 1779 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1776 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConstIDSeen); } -#line 4106 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4110 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 147: -#line 1783 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1780 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConstAssignSeen); } -#line 4114 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4118 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 148: -#line 1787 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1784 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = 0; UTL_ScopedName n ((yyvsp[-4].idval), 0); @@ -4170,27 +4174,27 @@ yyreduce: delete (yyvsp[-4].idval); (yyvsp[-4].idval) = 0; } -#line 4174 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4178 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 155: -#line 1852 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1849 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_string; } -#line 4182 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4186 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 156: -#line 1856 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1853 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_wstring; } -#line 4190 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4194 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 157: -#line 1860 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1857 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_PredefinedType *c = 0; @@ -4256,11 +4260,11 @@ yyreduce: sn = 0; (yyvsp[0].idlist) = 0; } -#line 4260 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4264 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 161: -#line 1933 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1930 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4269,11 +4273,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4273 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4277 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 163: -#line 1946 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1943 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4282,11 +4286,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4286 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4290 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 165: -#line 1959 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1956 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4295,11 +4299,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4299 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4303 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 167: -#line 1972 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1969 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4308,11 +4312,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4312 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4316 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 168: -#line 1981 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1978 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4321,11 +4325,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4325 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4329 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 170: -#line 1994 "fe/idl.ypp" /* yacc.c:1651 */ +#line 1991 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4334,11 +4338,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4338 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4342 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 171: -#line 2003 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2000 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4347,11 +4351,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4351 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4355 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 173: -#line 2016 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2013 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4360,11 +4364,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4364 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4368 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 174: -#line 2025 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2022 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4373,11 +4377,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4377 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4381 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 175: -#line 2034 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2031 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4386,11 +4390,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4390 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4394 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 177: -#line 2047 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2044 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ( @@ -4399,11 +4403,11 @@ yyreduce: 0 ); } -#line 4403 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4407 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 178: -#line 2056 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2053 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen()->create_expr ( @@ -4412,11 +4416,11 @@ yyreduce: 0 ); } -#line 4416 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4420 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 179: -#line 2065 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2062 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen()->create_expr ( @@ -4425,11 +4429,11 @@ yyreduce: 0 ); } -#line 4429 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4433 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 180: -#line 2077 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2074 "fe/idl.ypp" /* yacc.c:1651 */ { /* * An expression which is a scoped name is not resolved now, @@ -4479,104 +4483,104 @@ yyreduce: delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 4483 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4487 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 182: -#line 2128 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2125 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = (yyvsp[-1].exval); } -#line 4491 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4495 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 183: -#line 2135 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2132 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].ival)); } -#line 4499 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4503 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 184: -#line 2139 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2136 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].uival)); } -#line 4508 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4512 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 185: -#line 2144 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2141 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].sval)); (yyvsp[0].sval)->destroy (); delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 4519 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4523 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 186: -#line 2151 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2148 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].wsval)); } -#line 4527 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4531 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 187: -#line 2155 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2152 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].cval)); } -#line 4535 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4539 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 188: -#line 2159 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2156 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_OutputCDR::from_wchar wc ((yyvsp[0].wcval)); (yyval.exval) = idl_global->gen ()->create_expr (wc); } -#line 4544 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4548 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 189: -#line 2164 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2161 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].fixval)); } -#line 4552 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4556 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 190: -#line 2168 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2165 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].dval)); } -#line 4560 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4564 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 191: -#line 2172 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2169 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr (true); } -#line 4568 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4572 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 192: -#line 2176 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2173 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.exval) = idl_global->gen ()->create_expr (false); } -#line 4576 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4580 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 193: -#line 2183 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2180 "fe/idl.ypp" /* yacc.c:1651 */ { int good_expression = 1; (yyvsp[0].exval)->evaluate (AST_Expression::EK_positive_int); @@ -4641,68 +4645,156 @@ yyreduce: idl_global->err ()->syntax_error (idl_global->parse_state ()); } } -#line 4645 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4649 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 194: -#line 2250 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2248 "fe/idl.ypp" /* yacc.c:1651 */ { - if (idl_global->idl_version_ >= IDL_VERSION_4) + if (idl_global->idl_version_ < IDL_VERSION_4) { - ACE_DEBUG ((LM_WARNING, - ACE_TEXT ("WARNING: in %C on line %d:\n") - ACE_TEXT ("Declaring annotations is not supported at the ") - ACE_TEXT ("momment, this annotation is being ignored!\n"), - idl_global->filename ()->get_string (), - idl_global->lineno () - )); + idl_global->err ()->idl_version_error ( + "Annotations are an IDL4 feature"); } - else + + Identifier *id = (yyvsp[-1].idval); + UTL_ScopedName name (id, 0); + AST_Annotation_Decl::escape_name (&name); + AST_Annotation_Decl *annotation_decl = idl_global->gen ()-> + create_annotation_decl (&name); + idl_global->scopes ().top_non_null ()-> + fe_add_annotation_decl (annotation_decl); + idl_global->scopes ().push (annotation_decl); + } +#line 4670 "fe/idl.tab.cpp" /* yacc.c:1651 */ + break; + + case 195: +#line 2265 "fe/idl.ypp" /* yacc.c:1651 */ + { + Identifier *id = (yyvsp[-4].idval); + idl_global->scopes ().pop (); + id->destroy (); + delete id; + } +#line 4681 "fe/idl.tab.cpp" /* yacc.c:1651 */ + break; + + case 201: +#line 2283 "fe/idl.ypp" /* yacc.c:1651 */ + { + idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); + idl_global->in_typedef (true); + } +#line 4690 "fe/idl.tab.cpp" /* yacc.c:1651 */ + break; + + case 205: +#line 2297 "fe/idl.ypp" /* yacc.c:1651 */ + { + UTL_Scope *scope = idl_global->scopes ().top_non_null (); + UTL_Scope *root = idl_global->scopes ().bottom (); + + AST_Expression::ExprType type = (yyvsp[-3].etval); + Identifier *name = (yyvsp[-2].idval); + UTL_ScopedName scoped_name (name, 0); + AST_Expression *default_value = (yyvsp[-1].exval); + + AST_Decl * type_obj; + switch (type) { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: in %C on line %d:\n") - ACE_TEXT ("Annotations are an IDL4 feature, ") - ACE_TEXT ("they not supported in IDL %C!\n"), - idl_global->filename ()->get_string (), - idl_global->lineno (), - idl_global->idl_version_.to_string () - )); - idl_global->err()->syntax_error (idl_global->parse_state()); + case AST_Expression::EV_string: + case AST_Expression::EV_wstring: + type_obj = tao_string_decl; + break; + case AST_Expression::EV_enum: + type_obj = tao_enum_constant_decl; + break; + default: + type_obj = root->lookup_primitive_type (type); + } + + FE_Declarator *declarator = new FE_Declarator ( + &scoped_name, FE_Declarator::FD_simple, 0); + AST_Annotation_Member *member = idl_global->gen ()-> + create_annotation_member ( + type, declarator->compose (type_obj), declarator->name ()); + scope->fe_add_annotation_member (member); + + if (default_value) + { + // Check if types are compatible, else report error + AST_Expression::AST_ExprValue *result = + default_value->check_and_coerce (type, tao_enum_constant_decl); + tao_enum_constant_decl = 0; + if (result) + { + member->value (default_value); + } + else + { + idl_global->err ()->coercion_error (default_value, type); + } + delete result; } } -#line 4674 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4742 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; case 206: -#line 2307 "fe/idl.ypp" /* yacc.c:1651 */ +#line 2348 "fe/idl.ypp" /* yacc.c:1651 */ + { + (yyval.exval) = (yyvsp[0].exval); + } +#line 4750 "fe/idl.tab.cpp" /* yacc.c:1651 */ + break; + + case 207: +#line 2352 "fe/idl.ypp" /* yacc.c:1651 */ + { + (yyval.exval) = 0; + } +#line 4758 "fe/idl.tab.cpp" /* yacc.c:1651 */ + break; + + case 208: +#line 2359 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); - annotations->push_back ((yyvsp[0].annotation_val)); + AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val); + if (annotation) + { + annotations->push_back (annotation); + } (yyval.annotations_val) = annotations; } -#line 4684 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4772 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 207: -#line 2316 "fe/idl.ypp" /* yacc.c:1651 */ + case 209: +#line 2372 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appls *annotations = (yyvsp[-1].annotations_val); - annotations->push_back ((yyvsp[0].annotation_val)); + AST_Annotation_Appl *annotation = (yyvsp[0].annotation_val); + if (annotation) + { + annotations->push_back (annotation); + } (yyval.annotations_val) = annotations; } -#line 4694 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4786 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 208: -#line 2322 "fe/idl.ypp" /* yacc.c:1651 */ + case 210: +#line 2382 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotations_val) = new AST_Annotation_Appls (); } -#line 4702 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4794 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 209: -#line 2329 "fe/idl.ypp" /* yacc.c:1651 */ + case 211: +#line 2389 "fe/idl.ypp" /* yacc.c:1651 */ { if (idl_global->idl_version_ < IDL_VERSION_4) { @@ -4710,29 +4802,48 @@ yyreduce: "Annotations are an IDL4 feature"); } - (yyval.annotation_val) = idl_global->gen ()->create_annotation_appl ((yyvsp[-1].idlist), (yyvsp[0].annotation_params_val)); + AST_Annotation_Appl *appl = 0; + UTL_ScopedName *name = (yyvsp[-1].idlist); + AST_Annotation_Decl::escape_name (name); + AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); + + // Check for Annotation Declaration + AST_Decl *d = idl_global->scopes ().top_non_null ()-> + lookup_by_name (name); + if (!d /*&& !idl_global->ignore_missing_annotations_*/) + { + idl_global->err ()->lookup_error (name); + } + else + { + AST_Annotation_Decl *decl = AST_Annotation_Decl::narrow_from_decl (d); + appl = idl_global->gen ()->create_annotation_appl (name, params); + appl->apply_from (decl); + } + + (yyval.annotation_val) = appl; } -#line 4716 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4827 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 210: -#line 2342 "fe/idl.ypp" /* yacc.c:1651 */ + case 212: +#line 2421 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotation_params_val) = (yyvsp[-1].annotation_params_val); } -#line 4724 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4835 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 211: -#line 2346 "fe/idl.ypp" /* yacc.c:1651 */ + case 213: +#line 2425 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotation_params_val) = 0; } -#line 4732 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4843 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 212: -#line 2353 "fe/idl.ypp" /* yacc.c:1651 */ + case 214: +#line 2432 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appl::Params *params = new AST_Annotation_Appl::Params; AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param; @@ -4741,99 +4852,99 @@ yyreduce: params->push (param); (yyval.annotation_params_val) = params; } -#line 4745 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4856 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 213: -#line 2362 "fe/idl.ypp" /* yacc.c:1651 */ + case 215: +#line 2441 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotation_params_val) = (yyvsp[0].annotation_params_val); } -#line 4753 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4864 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 214: -#line 2369 "fe/idl.ypp" /* yacc.c:1651 */ + case 216: +#line 2448 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); params->push ((yyvsp[-1].annotation_param_val)); (yyval.annotation_params_val) = params; } -#line 4763 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4874 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 215: -#line 2377 "fe/idl.ypp" /* yacc.c:1651 */ + case 217: +#line 2456 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appl::Params *params = (yyvsp[0].annotation_params_val); params->push ((yyvsp[-1].annotation_param_val)); (yyval.annotation_params_val) = params; } -#line 4773 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4884 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 216: -#line 2383 "fe/idl.ypp" /* yacc.c:1651 */ + case 218: +#line 2462 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.annotation_params_val) = new AST_Annotation_Appl::Params; } -#line 4781 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4892 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 217: -#line 2390 "fe/idl.ypp" /* yacc.c:1651 */ + case 219: +#line 2469 "fe/idl.ypp" /* yacc.c:1651 */ { AST_Annotation_Appl::Param *param = new AST_Annotation_Appl::Param; param->id = (yyvsp[-2].idval); param->expr = (yyvsp[0].exval); (yyval.annotation_param_val) = param; } -#line 4792 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4903 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 218: -#line 2400 "fe/idl.ypp" /* yacc.c:1651 */ + case 220: +#line 2479 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 4801 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4912 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 219: -#line 2405 "fe/idl.ypp" /* yacc.c:1651 */ + case 221: +#line 2484 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4809 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4920 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 220: -#line 2409 "fe/idl.ypp" /* yacc.c:1651 */ + case 222: +#line 2488 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4817 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4928 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 221: -#line 2413 "fe/idl.ypp" /* yacc.c:1651 */ + case 223: +#line 2492 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4825 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4936 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 222: -#line 2417 "fe/idl.ypp" /* yacc.c:1651 */ + case 224: +#line 2496 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = (yyvsp[0].dcval); } -#line 4833 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4944 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 223: -#line 2421 "fe/idl.ypp" /* yacc.c:1651 */ + case 225: +#line 2500 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Native *node = 0; @@ -4859,27 +4970,27 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 4863 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4974 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 224: -#line 2447 "fe/idl.ypp" /* yacc.c:1651 */ + case 226: +#line 2526 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = 0; } -#line 4871 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4982 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 225: -#line 2454 "fe/idl.ypp" /* yacc.c:1651 */ + case 227: +#line 2533 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TypeSpecSeen); } -#line 4879 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 4990 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 226: -#line 2458 "fe/idl.ypp" /* yacc.c:1651 */ + case 228: +#line 2537 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); FE_Declarator *d = 0; @@ -4944,22 +5055,22 @@ yyreduce: (yyval.dcval) = t; } -#line 4948 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5059 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 229: -#line 2531 "fe/idl.ypp" /* yacc.c:1651 */ + case 231: +#line 2610 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 4959 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5070 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 231: -#line 2539 "fe/idl.ypp" /* yacc.c:1651 */ + case 233: +#line 2618 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -4982,30 +5093,30 @@ yyreduce: (yyval.dcval) = d; } -#line 4986 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5097 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 249: -#line 2594 "fe/idl.ypp" /* yacc.c:1651 */ + case 251: +#line 2673 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.dlval), UTL_DeclList ((yyvsp[-1].deval), (yyvsp[0].dlval)), 1); } -#line 4997 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5108 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 250: -#line 2605 "fe/idl.ypp" /* yacc.c:1651 */ + case 252: +#line 2684 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5005 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5116 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 251: -#line 2609 "fe/idl.ypp" /* yacc.c:1651 */ + case 253: +#line 2688 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -5025,38 +5136,38 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5029 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5140 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 252: -#line 2629 "fe/idl.ypp" /* yacc.c:1651 */ + case 254: +#line 2708 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dlval) = 0; } -#line 5037 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5148 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 255: -#line 2641 "fe/idl.ypp" /* yacc.c:1651 */ + case 257: +#line 2720 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.dlval), UTL_DeclList ((yyvsp[-1].deval), (yyvsp[0].dlval)), 1); } -#line 5048 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5159 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 256: -#line 2652 "fe/idl.ypp" /* yacc.c:1651 */ + case 258: +#line 2731 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 5056 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5167 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 257: -#line 2656 "fe/idl.ypp" /* yacc.c:1651 */ + case 259: +#line 2735 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -5076,19 +5187,19 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 5080 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5191 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 258: -#line 2676 "fe/idl.ypp" /* yacc.c:1651 */ + case 260: +#line 2755 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dlval) = 0; } -#line 5088 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5199 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 259: -#line 2683 "fe/idl.ypp" /* yacc.c:1651 */ + case 261: +#line 2762 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_ScopedName *sn = 0; ACE_NEW_RETURN (sn, @@ -5101,11 +5212,11 @@ yyreduce: 0), 1); } -#line 5105 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5216 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 260: -#line 2699 "fe/idl.ypp" /* yacc.c:1651 */ + case 262: +#line 2778 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_ScopedName *sn = 0; ACE_NEW_RETURN (sn, @@ -5120,156 +5231,156 @@ yyreduce: (yyvsp[0].dcval)), 1); } -#line 5124 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5235 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 263: -#line 2722 "fe/idl.ypp" /* yacc.c:1651 */ + case 265: +#line 2801 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_long; } -#line 5132 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5243 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 264: -#line 2726 "fe/idl.ypp" /* yacc.c:1651 */ + case 266: +#line 2805 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_longlong; } -#line 5140 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5251 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 265: -#line 2730 "fe/idl.ypp" /* yacc.c:1651 */ + case 267: +#line 2809 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_short; } -#line 5148 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5259 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 266: -#line 2737 "fe/idl.ypp" /* yacc.c:1651 */ + case 268: +#line 2816 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_ulong; } -#line 5156 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5267 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 267: -#line 2741 "fe/idl.ypp" /* yacc.c:1651 */ + case 269: +#line 2820 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_ulonglong; } -#line 5164 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5275 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 268: -#line 2745 "fe/idl.ypp" /* yacc.c:1651 */ + case 270: +#line 2824 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_ushort; } -#line 5172 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5283 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 269: -#line 2752 "fe/idl.ypp" /* yacc.c:1651 */ + case 271: +#line 2831 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_double; } -#line 5180 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5291 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 270: -#line 2756 "fe/idl.ypp" /* yacc.c:1651 */ + case 272: +#line 2835 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_float; } -#line 5188 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5299 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 271: -#line 2760 "fe/idl.ypp" /* yacc.c:1651 */ + case 273: +#line 2839 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_longdouble; } -#line 5196 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5307 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 272: -#line 2767 "fe/idl.ypp" /* yacc.c:1651 */ + case 274: +#line 2846 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_fixed; } -#line 5204 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5315 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 273: -#line 2774 "fe/idl.ypp" /* yacc.c:1651 */ + case 275: +#line 2853 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_char; } -#line 5212 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5323 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 274: -#line 2778 "fe/idl.ypp" /* yacc.c:1651 */ + case 276: +#line 2857 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_wchar; } -#line 5220 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5331 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 275: -#line 2785 "fe/idl.ypp" /* yacc.c:1651 */ + case 277: +#line 2864 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_octet; } -#line 5228 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5339 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 276: -#line 2792 "fe/idl.ypp" /* yacc.c:1651 */ + case 278: +#line 2871 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_bool; } -#line 5236 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5347 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 277: -#line 2799 "fe/idl.ypp" /* yacc.c:1651 */ + case 279: +#line 2878 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_any; } -#line 5244 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5355 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 278: -#line 2806 "fe/idl.ypp" /* yacc.c:1651 */ + case 280: +#line 2885 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.etval) = AST_Expression::EV_object; } -#line 5252 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5363 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 279: -#line 2813 "fe/idl.ypp" /* yacc.c:1651 */ + case 281: +#line 2892 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen); } -#line 5260 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5371 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 280: -#line 2817 "fe/idl.ypp" /* yacc.c:1651 */ + case 282: +#line 2896 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5269 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5380 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 281: -#line 2826 "fe/idl.ypp" /* yacc.c:1651 */ + case 283: +#line 2905 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -5300,27 +5411,27 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5304 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5415 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 282: -#line 2857 "fe/idl.ypp" /* yacc.c:1651 */ + case 284: +#line 2936 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen); } -#line 5312 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5423 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 283: -#line 2861 "fe/idl.ypp" /* yacc.c:1651 */ + case 285: +#line 2940 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); } -#line 5320 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5431 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 284: -#line 2865 "fe/idl.ypp" /* yacc.c:1651 */ + case 286: +#line 2944 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); @@ -5332,20 +5443,20 @@ yyreduce: ); idl_global->scopes ().pop (); } -#line 5336 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5447 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 288: -#line 2886 "fe/idl.ypp" /* yacc.c:1651 */ + case 290: +#line 2965 "fe/idl.ypp" /* yacc.c:1651 */ { /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_NA; } -#line 5345 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5456 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 289: -#line 2891 "fe/idl.ypp" /* yacc.c:1651 */ + case 291: +#line 2970 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[0].decls_val)) { @@ -5356,27 +5467,27 @@ yyreduce: } } } -#line 5360 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5471 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 290: -#line 2905 "fe/idl.ypp" /* yacc.c:1651 */ + case 292: +#line 2984 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_MemberTypeSeen); } -#line 5368 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5479 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 291: -#line 2909 "fe/idl.ypp" /* yacc.c:1651 */ + case 293: +#line 2988 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsSeen); } -#line 5376 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5487 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 292: -#line 2913 "fe/idl.ypp" /* yacc.c:1651 */ + case 294: +#line 2992 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); FE_Declarator *d = 0; @@ -5436,53 +5547,53 @@ yyreduce: (yyval.decls_val) = members; } -#line 5440 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5551 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 293: -#line 2973 "fe/idl.ypp" /* yacc.c:1651 */ + case 295: +#line 3052 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->err()->syntax_error (idl_global->parse_state ()); } -#line 5448 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5559 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 294: -#line 2977 "fe/idl.ypp" /* yacc.c:1651 */ + case 296: +#line 3056 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 5457 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5568 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 295: -#line 2985 "fe/idl.ypp" /* yacc.c:1651 */ + case 297: +#line 3064 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen); } -#line 5465 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5576 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 296: -#line 2989 "fe/idl.ypp" /* yacc.c:1651 */ + case 298: +#line 3068 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5474 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5585 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 297: -#line 2997 "fe/idl.ypp" /* yacc.c:1651 */ + case 299: +#line 3076 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchSeen); } -#line 5482 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5593 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 298: -#line 3001 "fe/idl.ypp" /* yacc.c:1651 */ + case 300: +#line 3080 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[-3].idval), 0); @@ -5515,19 +5626,19 @@ yyreduce: * Don't delete $1 yet; we'll need it a bit later. */ } -#line 5519 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5630 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 299: -#line 3034 "fe/idl.ypp" /* yacc.c:1651 */ + case 301: +#line 3113 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SwitchTypeSeen); } -#line 5527 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5638 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 300: -#line 3038 "fe/idl.ypp" /* yacc.c:1651 */ + case 302: +#line 3117 "fe/idl.ypp" /* yacc.c:1651 */ { /* * The top of the scopes must be an empty union we added after we @@ -5583,27 +5694,27 @@ yyreduce: delete (yyvsp[-8].idval); (yyvsp[-8].idval) = 0; } -#line 5587 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5698 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 301: -#line 3094 "fe/idl.ypp" /* yacc.c:1651 */ + case 303: +#line 3173 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionSqSeen); } -#line 5595 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5706 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 302: -#line 3098 "fe/idl.ypp" /* yacc.c:1651 */ + case 304: +#line 3177 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionBodySeen); } -#line 5603 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5714 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 303: -#line 3102 "fe/idl.ypp" /* yacc.c:1651 */ + case 305: +#line 3181 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionQsSeen); @@ -5619,22 +5730,22 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 5623 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5734 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 304: -#line 3121 "fe/idl.ypp" /* yacc.c:1651 */ + case 306: +#line 3200 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 5634 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5745 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 305: -#line 3128 "fe/idl.ypp" /* yacc.c:1651 */ + case 307: +#line 3207 "fe/idl.ypp" /* yacc.c:1651 */ { /* wchars are not allowed. */ if ((yyvsp[0].etval) == AST_Expression::EV_wchar) @@ -5647,11 +5758,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5651 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5762 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 306: -#line 3141 "fe/idl.ypp" /* yacc.c:1651 */ + case 308: +#line 3220 "fe/idl.ypp" /* yacc.c:1651 */ { /* octets are not allowed. */ idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE); @@ -5660,22 +5771,22 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5664 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5775 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 307: -#line 3150 "fe/idl.ypp" /* yacc.c:1651 */ + case 309: +#line 3229 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 5675 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5786 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 309: -#line 3158 "fe/idl.ypp" /* yacc.c:1651 */ + case 311: +#line 3237 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -5779,27 +5890,27 @@ yyreduce: delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 5783 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5894 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 313: -#line 3272 "fe/idl.ypp" /* yacc.c:1651 */ + case 315: +#line 3351 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen); } -#line 5791 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5902 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 314: -#line 3276 "fe/idl.ypp" /* yacc.c:1651 */ + case 316: +#line 3355 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen); } -#line 5799 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5910 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 315: -#line 3280 "fe/idl.ypp" /* yacc.c:1651 */ + case 317: +#line 3359 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_UnionBranch *b = 0; @@ -5828,39 +5939,39 @@ yyreduce: f = 0; } } -#line 5832 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5943 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 316: -#line 3309 "fe/idl.ypp" /* yacc.c:1651 */ + case 318: +#line 3388 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 5840 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5951 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 317: -#line 3313 "fe/idl.ypp" /* yacc.c:1651 */ + case 319: +#line 3392 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 5849 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5960 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 318: -#line 3321 "fe/idl.ypp" /* yacc.c:1651 */ + case 320: +#line 3400 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.llval), UTL_LabelList ((yyvsp[-1].ulval), (yyvsp[0].llval)), 1); } -#line 5860 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5971 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 319: -#line 3331 "fe/idl.ypp" /* yacc.c:1651 */ + case 321: +#line 3410 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_LabelList *ll = 0; ACE_NEW_RETURN (ll, @@ -5878,27 +5989,27 @@ yyreduce: (yyval.llval) = (yyvsp[-1].llval); } } -#line 5882 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 5993 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 320: -#line 3349 "fe/idl.ypp" /* yacc.c:1651 */ + case 322: +#line 3428 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.llval) = 0; } -#line 5890 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6001 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 321: -#line 3356 "fe/idl.ypp" /* yacc.c:1651 */ + case 323: +#line 3435 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DefaultSeen); } -#line 5898 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6009 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 322: -#line 3360 "fe/idl.ypp" /* yacc.c:1651 */ + case 324: +#line 3439 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -5907,27 +6018,27 @@ yyreduce: 0 ); } -#line 5911 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6022 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 323: -#line 3369 "fe/idl.ypp" /* yacc.c:1651 */ + case 325: +#line 3448 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_CaseSeen); } -#line 5919 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6030 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 324: -#line 3373 "fe/idl.ypp" /* yacc.c:1651 */ + case 326: +#line 3452 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen); } -#line 5927 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6038 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 325: -#line 3377 "fe/idl.ypp" /* yacc.c:1651 */ + case 327: +#line 3456 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -5936,19 +6047,19 @@ yyreduce: (yyvsp[-2].exval) ); } -#line 5940 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6051 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 326: -#line 3389 "fe/idl.ypp" /* yacc.c:1651 */ + case 328: +#line 3468 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemTypeSeen); } -#line 5948 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6059 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 327: -#line 3393 "fe/idl.ypp" /* yacc.c:1651 */ + case 329: +#line 3472 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemDeclSeen); @@ -5992,11 +6103,11 @@ yyreduce: (yyvsp[0].deval) = 0; } } -#line 5996 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6107 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 328: -#line 3440 "fe/idl.ypp" /* yacc.c:1651 */ + case 330: +#line 3519 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -6018,11 +6129,11 @@ yyreduce: (yyval.dcval) = d; } -#line 6022 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6133 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 329: -#line 3465 "fe/idl.ypp" /* yacc.c:1651 */ + case 331: +#line 3544 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -6042,19 +6153,19 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6046 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6157 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 330: -#line 3488 "fe/idl.ypp" /* yacc.c:1651 */ + case 332: +#line 3567 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen); } -#line 6054 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6165 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 331: -#line 3492 "fe/idl.ypp" /* yacc.c:1651 */ + case 333: +#line 3571 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), 0); @@ -6085,27 +6196,27 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6089 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6200 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 332: -#line 3523 "fe/idl.ypp" /* yacc.c:1651 */ + case 334: +#line 3602 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumSqSeen); } -#line 6097 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6208 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 333: -#line 3527 "fe/idl.ypp" /* yacc.c:1651 */ + case 335: +#line 3606 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumBodySeen); } -#line 6105 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6216 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 334: -#line 3531 "fe/idl.ypp" /* yacc.c:1651 */ + case 336: +#line 3610 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumQsSeen); @@ -6124,19 +6235,19 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 6128 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6239 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 336: -#line 3556 "fe/idl.ypp" /* yacc.c:1651 */ + case 338: +#line 3635 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EnumCommaSeen); } -#line 6136 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6247 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 339: -#line 3565 "fe/idl.ypp" /* yacc.c:1651 */ + case 341: +#line 3644 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); Identifier id ((yyvsp[0].strval)); @@ -6167,27 +6278,27 @@ yyreduce: (void) s->fe_add_enum_val (e); } } -#line 6171 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6282 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 340: -#line 3600 "fe/idl.ypp" /* yacc.c:1651 */ + case 342: +#line 3679 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceCommaSeen); } -#line 6179 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6290 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 341: -#line 3604 "fe/idl.ypp" /* yacc.c:1651 */ + case 343: +#line 3683 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceExprSeen); } -#line 6187 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6298 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 342: -#line 3608 "fe/idl.ypp" /* yacc.c:1651 */ + case 344: +#line 3687 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -6271,11 +6382,11 @@ yyreduce: ev = 0; (yyval.dcval) = seq; } -#line 6275 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6386 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 343: -#line 3693 "fe/idl.ypp" /* yacc.c:1651 */ + case 345: +#line 3772 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -6340,11 +6451,11 @@ yyreduce: (yyval.dcval) = seq; } -#line 6344 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6455 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 344: -#line 3761 "fe/idl.ypp" /* yacc.c:1651 */ + case 346: +#line 3840 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSeen); @@ -6353,19 +6464,19 @@ yyreduce: */ idl_global->scopes ().push (0); } -#line 6357 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6468 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 345: -#line 3770 "fe/idl.ypp" /* yacc.c:1651 */ + case 347: +#line 3849 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSqSeen); } -#line 6365 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6476 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 346: -#line 3774 "fe/idl.ypp" /* yacc.c:1651 */ + case 348: +#line 3853 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SequenceTypeSeen); Decl_Annotations_Pair *seq_head = new Decl_Annotations_Pair; @@ -6373,36 +6484,36 @@ yyreduce: seq_head->annotations = (yyvsp[-1].annotations_val); (yyval.decl_annotations_pair_val) = seq_head; } -#line 6377 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6488 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 347: -#line 3785 "fe/idl.ypp" /* yacc.c:1651 */ + case 349: +#line 3864 "fe/idl.ypp" /* yacc.c:1651 */ { (yyvsp[-1].exval)->evaluate (AST_Expression::EK_positive_int); (yyval.dcval) = idl_global->gen ()->create_fixed ((yyvsp[-3].exval), (yyvsp[-1].exval)); } -#line 6386 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6497 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 348: -#line 3794 "fe/idl.ypp" /* yacc.c:1651 */ + case 350: +#line 3873 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6394 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6505 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 349: -#line 3798 "fe/idl.ypp" /* yacc.c:1651 */ + case 351: +#line 3877 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6402 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6513 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 350: -#line 3802 "fe/idl.ypp" /* yacc.c:1651 */ + case 352: +#line 3881 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -6424,81 +6535,80 @@ yyreduce: } else { - (yyval.dcval) = idl_global->gen ()->create_string ((yyvsp[-2].exval)); + tao_string_decl = idl_global->gen ()->create_string ((yyvsp[-2].exval)); + /* * Add this AST_String to the types defined in the global scope. */ - (void) idl_global->root ()->fe_add_string ( - AST_String::narrow_from_decl ( - (yyval.dcval) - ) - ); + idl_global->root ()->fe_add_string ( + AST_String::narrow_from_decl ( + tao_string_decl)); - if (!idl_global->in_typedef () - && !idl_global->anon_silent ()) + if (!idl_global->in_typedef () && !idl_global->anon_silent ()) { idl_global->err ()->anonymous_type_diagnostic (); } + + (yyval.dcval) = tao_string_decl; } delete ev; ev = 0; } -#line 6448 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6559 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 351: -#line 3844 "fe/idl.ypp" /* yacc.c:1651 */ + case 353: +#line 3923 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); + /* * Create a node representing a string. */ ACE_CDR::ULong bound = 0UL; - - (yyval.dcval) = + tao_string_decl = idl_global->gen ()->create_string ( idl_global->gen ()->create_expr (bound, AST_Expression::EV_ulong) ); + /* * Add this AST_String to the types defined in the global scope. */ - (void) idl_global->root ()->fe_add_string ( - AST_String::narrow_from_decl ( - (yyval.dcval) - ) - ); + idl_global->root ()->fe_add_string ( + AST_String::narrow_from_decl ( + tao_string_decl)); } -#line 6474 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6584 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 352: -#line 3869 "fe/idl.ypp" /* yacc.c:1651 */ + case 354: +#line 3947 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6482 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6592 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 353: -#line 3877 "fe/idl.ypp" /* yacc.c:1651 */ + case 355: +#line 3955 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6490 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6600 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 354: -#line 3881 "fe/idl.ypp" /* yacc.c:1651 */ + case 356: +#line 3959 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6498 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6608 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 355: -#line 3885 "fe/idl.ypp" /* yacc.c:1651 */ + case 357: +#line 3963 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -6514,26 +6624,28 @@ yyreduce: } else { - (yyval.dcval) = idl_global->gen ()->create_wstring ((yyvsp[-2].exval)); + AST_String *string = idl_global->gen ()->create_wstring ((yyvsp[-2].exval)); + /* * Add this AST_String to the types defined in the global scope. */ - (void) idl_global->root ()->fe_add_string ( - AST_String::narrow_from_decl ((yyval.dcval)) - ); + idl_global->root ()->fe_add_string ( + AST_String::narrow_from_decl ( + string)); - if (!idl_global->in_typedef () - && !idl_global->anon_silent ()) + if (!idl_global->in_typedef () && !idl_global->anon_silent ()) { idl_global->err ()->anonymous_type_diagnostic (); } + + (yyval.dcval) = string; } } -#line 6533 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6645 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 356: -#line 3916 "fe/idl.ypp" /* yacc.c:1651 */ + case 358: +#line 3996 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -6541,40 +6653,40 @@ yyreduce: * Create a node representing a wstring. */ ACE_CDR::ULong bound = 0UL; - - (yyval.dcval) = + AST_String *string = idl_global->gen ()->create_wstring ( idl_global->gen ()->create_expr (bound, AST_Expression::EV_ulong) ); + /* * Add this AST_String to the types defined in the global scope. */ - (void) idl_global->root ()->fe_add_string ( - AST_String::narrow_from_decl ((yyval.dcval)) - ); + idl_global->root ()->fe_add_string ( + AST_String::narrow_from_decl ( + string)); } -#line 6558 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6670 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 357: -#line 3940 "fe/idl.ypp" /* yacc.c:1651 */ + case 359: +#line 4020 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6566 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6678 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 358: -#line 3947 "fe/idl.ypp" /* yacc.c:1651 */ + case 360: +#line 4027 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen); } -#line 6574 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6686 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 359: -#line 3951 "fe/idl.ypp" /* yacc.c:1651 */ + case 361: +#line 4031 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted); @@ -6607,22 +6719,22 @@ yyreduce: } } } -#line 6611 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6723 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 360: -#line 3987 "fe/idl.ypp" /* yacc.c:1651 */ + case 362: +#line 4067 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.elval), UTL_ExprList ((yyvsp[-1].exval), (yyvsp[0].elval)), 1); } -#line 6622 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6734 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 361: -#line 3997 "fe/idl.ypp" /* yacc.c:1651 */ + case 363: +#line 4077 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_ExprList *el = 0; ACE_NEW_RETURN (el, @@ -6640,35 +6752,35 @@ yyreduce: (yyval.elval) = (yyvsp[-1].elval); } } -#line 6644 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6756 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 362: -#line 4015 "fe/idl.ypp" /* yacc.c:1651 */ + case 364: +#line 4095 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.elval) = 0; } -#line 6652 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6764 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 363: -#line 4022 "fe/idl.ypp" /* yacc.c:1651 */ + case 365: +#line 4102 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen); } -#line 6660 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6772 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 364: -#line 4026 "fe/idl.ypp" /* yacc.c:1651 */ + case 366: +#line 4106 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen); } -#line 6668 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6780 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 365: -#line 4030 "fe/idl.ypp" /* yacc.c:1651 */ + case 367: +#line 4110 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen); @@ -6722,43 +6834,43 @@ yyreduce: delete ev; ev = 0; } -#line 6726 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6838 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 368: -#line 4092 "fe/idl.ypp" /* yacc.c:1651 */ + case 370: +#line 4172 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen); } -#line 6734 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6846 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 369: -#line 4096 "fe/idl.ypp" /* yacc.c:1651 */ + case 371: +#line 4176 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 6742 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6854 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 370: -#line 4100 "fe/idl.ypp" /* yacc.c:1651 */ + case 372: +#line 4180 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 6750 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6862 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 371: -#line 4104 "fe/idl.ypp" /* yacc.c:1651 */ + case 373: +#line 4184 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 6758 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6870 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 372: -#line 4108 "fe/idl.ypp" /* yacc.c:1651 */ + case 374: +#line 4188 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; @@ -6818,43 +6930,43 @@ yyreduce: delete (yyvsp[-2].dlval); (yyvsp[-2].dlval) = 0; } -#line 6822 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6934 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 373: -#line 4171 "fe/idl.ypp" /* yacc.c:1651 */ + case 375: +#line 4251 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 6830 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6942 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 374: -#line 4175 "fe/idl.ypp" /* yacc.c:1651 */ + case 376: +#line 4255 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 6838 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6950 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 375: -#line 4179 "fe/idl.ypp" /* yacc.c:1651 */ + case 377: +#line 4259 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 6846 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6958 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 376: -#line 4183 "fe/idl.ypp" /* yacc.c:1651 */ + case 378: +#line 4263 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted); } -#line 6854 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 6966 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 377: -#line 4187 "fe/idl.ypp" /* yacc.c:1651 */ + case 379: +#line 4267 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Attribute *a = 0; @@ -6923,19 +7035,19 @@ yyreduce: delete (yyvsp[-4].dlval); (yyvsp[-4].dlval) = 0; } -#line 6927 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7039 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 378: -#line 4259 "fe/idl.ypp" /* yacc.c:1651 */ + case 380: +#line 4339 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen); } -#line 6935 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7047 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 379: -#line 4263 "fe/idl.ypp" /* yacc.c:1651 */ + case 381: +#line 4343 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -6964,27 +7076,27 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6968 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7080 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 380: -#line 4292 "fe/idl.ypp" /* yacc.c:1651 */ + case 382: +#line 4372 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen); } -#line 6976 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7088 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 381: -#line 4296 "fe/idl.ypp" /* yacc.c:1651 */ + case 383: +#line 4376 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen); } -#line 6984 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7096 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 382: -#line 4300 "fe/idl.ypp" /* yacc.c:1651 */ + case 384: +#line 4380 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen); /* @@ -6992,19 +7104,19 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 6996 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7108 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 383: -#line 4312 "fe/idl.ypp" /* yacc.c:1651 */ + case 385: +#line 4392 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7004 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7116 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 384: -#line 4316 "fe/idl.ypp" /* yacc.c:1651 */ + case 386: +#line 4396 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); Identifier id ((yyvsp[0].strval)); @@ -7068,27 +7180,27 @@ yyreduce: */ idl_global->scopes ().push (o); } -#line 7072 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7184 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 385: -#line 4380 "fe/idl.ypp" /* yacc.c:1651 */ + case 387: +#line 4460 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7080 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7192 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 386: -#line 4384 "fe/idl.ypp" /* yacc.c:1651 */ + case 388: +#line 4464 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); } -#line 7088 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7200 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 387: -#line 4388 "fe/idl.ypp" /* yacc.c:1651 */ + case 389: +#line 4468 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Operation *o = 0; @@ -7117,57 +7229,57 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 7121 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7233 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 388: -#line 4420 "fe/idl.ypp" /* yacc.c:1651 */ + case 390: +#line 4500 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_oneway; } -#line 7130 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7242 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 389: -#line 4425 "fe/idl.ypp" /* yacc.c:1651 */ + case 391: +#line 4505 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_idempotent; } -#line 7139 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7251 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 390: -#line 4430 "fe/idl.ypp" /* yacc.c:1651 */ + case 392: +#line 4510 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ofval) = AST_Operation::OP_noflags; } -#line 7147 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7259 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 392: -#line 4438 "fe/idl.ypp" /* yacc.c:1651 */ + case 394: +#line 4518 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( AST_Expression::EV_void ); } -#line 7158 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7270 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 393: -#line 4448 "fe/idl.ypp" /* yacc.c:1651 */ + case 395: +#line 4528 "fe/idl.ypp" /* yacc.c:1651 */ { //@@ PS_FactorySeen? idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7167 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7279 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 394: -#line 4453 "fe/idl.ypp" /* yacc.c:1651 */ + case 396: +#line 4533 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7208,19 +7320,19 @@ yyreduce: */ idl_global->scopes ().push (factory); } -#line 7212 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7324 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 395: -#line 4494 "fe/idl.ypp" /* yacc.c:1651 */ + case 397: +#line 4574 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7220 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7332 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 396: -#line 4498 "fe/idl.ypp" /* yacc.c:1651 */ + case 398: +#line 4578 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -7233,67 +7345,67 @@ yyreduce: idl_global->scopes ().pop (); } -#line 7237 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7349 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 397: -#line 4514 "fe/idl.ypp" /* yacc.c:1651 */ + case 399: +#line 4594 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7245 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7357 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 398: -#line 4518 "fe/idl.ypp" /* yacc.c:1651 */ + case 400: +#line 4598 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7253 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7365 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 399: -#line 4522 "fe/idl.ypp" /* yacc.c:1651 */ + case 401: +#line 4602 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7261 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7373 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 400: -#line 4527 "fe/idl.ypp" /* yacc.c:1651 */ + case 402: +#line 4607 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7269 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7381 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 402: -#line 4537 "fe/idl.ypp" /* yacc.c:1651 */ + case 404: +#line 4617 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7277 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7389 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 405: -#line 4546 "fe/idl.ypp" /* yacc.c:1651 */ + case 407: +#line 4626 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7285 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7397 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 406: -#line 4550 "fe/idl.ypp" /* yacc.c:1651 */ + case 408: +#line 4630 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7293 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7405 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 407: -#line 4554 "fe/idl.ypp" /* yacc.c:1651 */ + case 409: +#line 4634 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; @@ -7325,67 +7437,67 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7329 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7441 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 408: -#line 4589 "fe/idl.ypp" /* yacc.c:1651 */ + case 410: +#line 4669 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7337 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7449 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 409: -#line 4593 "fe/idl.ypp" /* yacc.c:1651 */ + case 411: +#line 4673 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7345 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7457 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 410: -#line 4597 "fe/idl.ypp" /* yacc.c:1651 */ + case 412: +#line 4677 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7353 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7465 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 411: -#line 4602 "fe/idl.ypp" /* yacc.c:1651 */ + case 413: +#line 4682 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7361 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7473 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 413: -#line 4612 "fe/idl.ypp" /* yacc.c:1651 */ + case 415: +#line 4692 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7369 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7481 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 416: -#line 4621 "fe/idl.ypp" /* yacc.c:1651 */ + case 418: +#line 4701 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7377 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7489 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 417: -#line 4625 "fe/idl.ypp" /* yacc.c:1651 */ + case 419: +#line 4705 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7385 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7497 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 418: -#line 4629 "fe/idl.ypp" /* yacc.c:1651 */ + case 420: +#line 4709 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Argument *a = 0; @@ -7424,22 +7536,22 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7428 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7540 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 419: -#line 4671 "fe/idl.ypp" /* yacc.c:1651 */ + case 421: +#line 4751 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dcval) = idl_global->scopes ().bottom ()->lookup_primitive_type ( (yyvsp[0].etval) ); } -#line 7439 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7551 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 422: -#line 4680 "fe/idl.ypp" /* yacc.c:1651 */ + case 424: +#line 4760 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = 0; @@ -7543,186 +7655,186 @@ yyreduce: (yyval.dcval) = d; } -#line 7547 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7659 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 423: -#line 4787 "fe/idl.ypp" /* yacc.c:1651 */ + case 425: +#line 4867 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dival) = AST_Argument::dir_IN; } -#line 7555 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7667 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 424: -#line 4791 "fe/idl.ypp" /* yacc.c:1651 */ + case 426: +#line 4871 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dival) = AST_Argument::dir_OUT; } -#line 7563 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7675 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 425: -#line 4795 "fe/idl.ypp" /* yacc.c:1651 */ + case 427: +#line 4875 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.dival) = AST_Argument::dir_INOUT; } -#line 7571 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7683 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 426: -#line 4802 "fe/idl.ypp" /* yacc.c:1651 */ + case 428: +#line 4882 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen); } -#line 7579 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7691 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 427: -#line 4806 "fe/idl.ypp" /* yacc.c:1651 */ + case 429: +#line 4886 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen); } -#line 7587 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7699 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 428: -#line 4811 "fe/idl.ypp" /* yacc.c:1651 */ + case 430: +#line 4891 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7596 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7708 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 429: -#line 4816 "fe/idl.ypp" /* yacc.c:1651 */ + case 431: +#line 4896 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 7604 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7716 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 430: -#line 4823 "fe/idl.ypp" /* yacc.c:1651 */ + case 432: +#line 4903 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen); } -#line 7612 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7724 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 431: -#line 4827 "fe/idl.ypp" /* yacc.c:1651 */ + case 433: +#line 4907 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen); } -#line 7620 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7732 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 432: -#line 4832 "fe/idl.ypp" /* yacc.c:1651 */ + case 434: +#line 4912 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7629 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7741 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 433: -#line 4837 "fe/idl.ypp" /* yacc.c:1651 */ + case 435: +#line 4917 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 7637 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7749 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 434: -#line 4844 "fe/idl.ypp" /* yacc.c:1651 */ + case 436: +#line 4924 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen); } -#line 7645 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7757 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 435: -#line 4848 "fe/idl.ypp" /* yacc.c:1651 */ + case 437: +#line 4928 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen); } -#line 7653 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7765 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 436: -#line 4853 "fe/idl.ypp" /* yacc.c:1651 */ + case 438: +#line 4933 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7662 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7774 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 437: -#line 4858 "fe/idl.ypp" /* yacc.c:1651 */ + case 439: +#line 4938 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.nlval) = 0; } -#line 7670 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7782 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 438: -#line 4865 "fe/idl.ypp" /* yacc.c:1651 */ + case 440: +#line 4945 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen); } -#line 7678 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7790 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 439: -#line 4869 "fe/idl.ypp" /* yacc.c:1651 */ + case 441: +#line 4949 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen); } -#line 7686 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7798 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 440: -#line 4874 "fe/idl.ypp" /* yacc.c:1651 */ + case 442: +#line 4954 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen); (yyval.slval) = (yyvsp[-1].slval); } -#line 7695 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7807 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 441: -#line 4879 "fe/idl.ypp" /* yacc.c:1651 */ + case 443: +#line 4959 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.slval) = 0; } -#line 7703 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7815 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 442: -#line 4886 "fe/idl.ypp" /* yacc.c:1651 */ + case 444: +#line 4966 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 7714 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7826 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 443: -#line 4897 "fe/idl.ypp" /* yacc.c:1651 */ + case 445: +#line 4977 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen); } -#line 7722 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7834 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 444: -#line 4901 "fe/idl.ypp" /* yacc.c:1651 */ + case 446: +#line 4981 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, @@ -7740,19 +7852,19 @@ yyreduce: (yyval.slval) = (yyvsp[-3].slval); } } -#line 7744 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7856 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 445: -#line 4919 "fe/idl.ypp" /* yacc.c:1651 */ + case 447: +#line 4999 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.slval) = 0; } -#line 7752 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7864 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 446: -#line 4926 "fe/idl.ypp" /* yacc.c:1651 */ + case 448: +#line 5006 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = @@ -7777,11 +7889,11 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 7781 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7893 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 447: -#line 4954 "fe/idl.ypp" /* yacc.c:1651 */ + case 449: +#line 5034 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Decl *d = ScopeAsDecl (s); @@ -7815,11 +7927,11 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 7819 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7931 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 450: -#line 4997 "fe/idl.ypp" /* yacc.c:1651 */ + case 452: +#line 5077 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -7843,11 +7955,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 7847 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 7959 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 451: -#line 5024 "fe/idl.ypp" /* yacc.c:1651 */ + case 453: +#line 5104 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Component *c = 0; @@ -7886,27 +7998,27 @@ yyreduce: */ idl_global->scopes ().push (c); } -#line 7890 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8002 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 452: -#line 5063 "fe/idl.ypp" /* yacc.c:1651 */ + case 454: +#line 5143 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen); } -#line 7898 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8010 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 453: -#line 5067 "fe/idl.ypp" /* yacc.c:1651 */ + case 455: +#line 5147 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen); } -#line 7906 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8018 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 454: -#line 5071 "fe/idl.ypp" /* yacc.c:1651 */ + case 456: +#line 5151 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen); @@ -7915,27 +8027,27 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 7919 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8031 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 455: -#line 5084 "fe/idl.ypp" /* yacc.c:1651 */ + case 457: +#line 5164 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen); } -#line 7927 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8039 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 456: -#line 5088 "fe/idl.ypp" /* yacc.c:1651 */ + case 458: +#line 5168 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 7935 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8047 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 457: -#line 5092 "fe/idl.ypp" /* yacc.c:1651 */ + case 459: +#line 5172 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -7969,147 +8081,147 @@ yyreduce: (yyvsp[-2].idlist) = 0; } } -#line 7973 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8085 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 458: -#line 5129 "fe/idl.ypp" /* yacc.c:1651 */ + case 460: +#line 5209 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 7981 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8093 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 459: -#line 5133 "fe/idl.ypp" /* yacc.c:1651 */ + case 461: +#line 5213 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 7989 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8101 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 460: -#line 5137 "fe/idl.ypp" /* yacc.c:1651 */ + case 462: +#line 5217 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = 0; } -#line 7997 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8109 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 463: -#line 5149 "fe/idl.ypp" /* yacc.c:1651 */ + case 465: +#line 5229 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 8005 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8117 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 464: -#line 5153 "fe/idl.ypp" /* yacc.c:1651 */ + case 466: +#line 5233 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8013 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8125 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 465: -#line 5157 "fe/idl.ypp" /* yacc.c:1651 */ + case 467: +#line 5237 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 8021 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8133 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 466: -#line 5161 "fe/idl.ypp" /* yacc.c:1651 */ + case 468: +#line 5241 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8029 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8141 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 467: -#line 5165 "fe/idl.ypp" /* yacc.c:1651 */ + case 469: +#line 5245 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen); } -#line 8037 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8149 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 468: -#line 5169 "fe/idl.ypp" /* yacc.c:1651 */ + case 470: +#line 5249 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8045 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8157 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 469: -#line 5173 "fe/idl.ypp" /* yacc.c:1651 */ + case 471: +#line 5253 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen); } -#line 8053 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8165 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 470: -#line 5177 "fe/idl.ypp" /* yacc.c:1651 */ + case 472: +#line 5257 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8061 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8173 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 471: -#line 5181 "fe/idl.ypp" /* yacc.c:1651 */ + case 473: +#line 5261 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen); } -#line 8069 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8181 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 472: -#line 5185 "fe/idl.ypp" /* yacc.c:1651 */ + case 474: +#line 5265 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8077 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8189 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 473: -#line 5189 "fe/idl.ypp" /* yacc.c:1651 */ + case 475: +#line 5269 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 8085 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8197 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 474: -#line 5193 "fe/idl.ypp" /* yacc.c:1651 */ + case 476: +#line 5273 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8093 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8205 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 475: -#line 5197 "fe/idl.ypp" /* yacc.c:1651 */ + case 477: +#line 5277 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 8101 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8213 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 476: -#line 5201 "fe/idl.ypp" /* yacc.c:1651 */ + case 478: +#line 5281 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8109 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8221 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 477: -#line 5207 "fe/idl.ypp" /* yacc.c:1651 */ + case 479: +#line 5287 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8196,21 +8308,21 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8200 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8312 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 478: -#line 5297 "fe/idl.ypp" /* yacc.c:1651 */ + case 480: +#line 5377 "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 8210 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8322 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 479: -#line 5303 "fe/idl.ypp" /* yacc.c:1651 */ + case 481: +#line 5383 "fe/idl.ypp" /* yacc.c:1651 */ { Identifier *corba_id = 0; @@ -8233,11 +8345,11 @@ yyreduce: conc_name), 1); } -#line 8237 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8349 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 480: -#line 5328 "fe/idl.ypp" /* yacc.c:1651 */ + case 482: +#line 5408 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8340,37 +8452,37 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8344 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8456 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 481: -#line 5434 "fe/idl.ypp" /* yacc.c:1651 */ + case 483: +#line 5514 "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 8354 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8466 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 482: -#line 5443 "fe/idl.ypp" /* yacc.c:1651 */ + case 484: +#line 5523 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.bval) = true; } -#line 8362 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8474 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 483: -#line 5447 "fe/idl.ypp" /* yacc.c:1651 */ + case 485: +#line 5527 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.bval) = false; } -#line 8370 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8482 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 484: -#line 5453 "fe/idl.ypp" /* yacc.c:1651 */ + case 486: +#line 5533 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8440,11 +8552,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8444 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8556 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 485: -#line 5525 "fe/idl.ypp" /* yacc.c:1651 */ + case 487: +#line 5605 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8514,11 +8626,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8518 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8630 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 486: -#line 5597 "fe/idl.ypp" /* yacc.c:1651 */ + case 488: +#line 5677 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); bool so_far_so_good = true; @@ -8588,11 +8700,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8592 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8704 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 487: -#line 5670 "fe/idl.ypp" /* yacc.c:1651 */ + case 489: +#line 5750 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Home *h = 0; @@ -8629,70 +8741,70 @@ yyreduce: */ idl_global->scopes ().push (h); } -#line 8633 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8745 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 488: -#line 5707 "fe/idl.ypp" /* yacc.c:1651 */ + case 490: +#line 5787 "fe/idl.ypp" /* yacc.c:1651 */ { /* * Done with this component - pop it off the scopes stack. */ idl_global->scopes ().pop (); } -#line 8644 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8756 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 489: -#line 5717 "fe/idl.ypp" /* yacc.c:1651 */ + case 491: +#line 5797 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen); } -#line 8652 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8764 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 490: -#line 5721 "fe/idl.ypp" /* yacc.c:1651 */ + case 492: +#line 5801 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen); } -#line 8660 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8772 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 491: -#line 5725 "fe/idl.ypp" /* yacc.c:1651 */ + case 493: +#line 5805 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8668 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8780 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 492: -#line 5729 "fe/idl.ypp" /* yacc.c:1651 */ + case 494: +#line 5809 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); } -#line 8676 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8788 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 493: -#line 5733 "fe/idl.ypp" /* yacc.c:1651 */ + case 495: +#line 5813 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen); } -#line 8684 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8796 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 494: -#line 5737 "fe/idl.ypp" /* yacc.c:1651 */ + case 496: +#line 5817 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen); } -#line 8692 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8804 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 495: -#line 5741 "fe/idl.ypp" /* yacc.c:1651 */ + case 497: +#line 5821 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen); @@ -8738,107 +8850,107 @@ yyreduce: (yyvsp[-6].nlval) = 0; } } -#line 8742 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8854 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 496: -#line 5790 "fe/idl.ypp" /* yacc.c:1651 */ + case 498: +#line 5870 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8750 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8862 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 497: -#line 5794 "fe/idl.ypp" /* yacc.c:1651 */ + case 499: +#line 5874 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8758 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8870 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 498: -#line 5798 "fe/idl.ypp" /* yacc.c:1651 */ + case 500: +#line 5878 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = 0; } -#line 8766 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8878 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 499: -#line 5806 "fe/idl.ypp" /* yacc.c:1651 */ + case 501: +#line 5886 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 8774 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8886 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 500: -#line 5810 "fe/idl.ypp" /* yacc.c:1651 */ + case 502: +#line 5890 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idlist) = 0; } -#line 8782 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8894 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 501: -#line 5817 "fe/idl.ypp" /* yacc.c:1651 */ + case 503: +#line 5897 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen); } -#line 8790 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8902 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 502: -#line 5821 "fe/idl.ypp" /* yacc.c:1651 */ + case 504: +#line 5901 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen); } -#line 8798 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8910 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 503: -#line 5825 "fe/idl.ypp" /* yacc.c:1651 */ + case 505: +#line 5905 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen); } -#line 8806 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8918 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 507: -#line 5838 "fe/idl.ypp" /* yacc.c:1651 */ + case 509: +#line 5918 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen); } -#line 8814 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8926 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 508: -#line 5842 "fe/idl.ypp" /* yacc.c:1651 */ + case 510: +#line 5922 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8822 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8934 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 509: -#line 5846 "fe/idl.ypp" /* yacc.c:1651 */ + case 511: +#line 5926 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen); } -#line 8830 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8942 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 510: -#line 5850 "fe/idl.ypp" /* yacc.c:1651 */ + case 512: +#line 5930 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8838 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8950 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 511: -#line 5858 "fe/idl.ypp" /* yacc.c:1651 */ + case 513: +#line 5938 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -8861,19 +8973,19 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 8865 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8977 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 512: -#line 5881 "fe/idl.ypp" /* yacc.c:1651 */ + case 514: +#line 5961 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 8873 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 8985 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 513: -#line 5885 "fe/idl.ypp" /* yacc.c:1651 */ + case 515: +#line 5965 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -8891,11 +9003,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 8895 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9007 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 514: -#line 5907 "fe/idl.ypp" /* yacc.c:1651 */ + case 516: +#line 5987 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -8922,19 +9034,19 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 8926 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9038 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 515: -#line 5934 "fe/idl.ypp" /* yacc.c:1651 */ + case 517: +#line 6014 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 8934 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9046 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 516: -#line 5938 "fe/idl.ypp" /* yacc.c:1651 */ + case 518: +#line 6018 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -8952,11 +9064,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 8956 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9068 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 522: -#line 5971 "fe/idl.ypp" /* yacc.c:1651 */ + case 524: +#line 6051 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -8979,11 +9091,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8983 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9095 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 523: -#line 5999 "fe/idl.ypp" /* yacc.c:1651 */ + case 525: +#line 6079 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); UTL_ScopedName n ((yyvsp[0].idval), @@ -9006,11 +9118,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 9010 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9122 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 524: -#line 6026 "fe/idl.ypp" /* yacc.c:1651 */ + case 526: +#line 6106 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_EventType *e = 0; @@ -9054,27 +9166,27 @@ yyreduce: delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 9058 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9170 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 525: -#line 6070 "fe/idl.ypp" /* yacc.c:1651 */ + case 527: +#line 6150 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9066 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9178 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 526: -#line 6074 "fe/idl.ypp" /* yacc.c:1651 */ + case 528: +#line 6154 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9074 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9186 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 527: -#line 6078 "fe/idl.ypp" /* yacc.c:1651 */ + case 529: +#line 6158 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9083,19 +9195,19 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9087 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9199 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 528: -#line 6092 "fe/idl.ypp" /* yacc.c:1651 */ + case 530: +#line 6172 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idval) = (yyvsp[0].idval); } -#line 9095 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9207 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 529: -#line 6101 "fe/idl.ypp" /* yacc.c:1651 */ + case 531: +#line 6181 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); @@ -9108,29 +9220,29 @@ yyreduce: ACE_TEXT (" custom yet\n"))); (yyval.idval) = 0; } -#line 9112 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9224 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 530: -#line 6118 "fe/idl.ypp" /* yacc.c:1651 */ + case 532: +#line 6198 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 9122 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9234 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 531: -#line 6127 "fe/idl.ypp" /* yacc.c:1651 */ + case 533: +#line 6207 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 9130 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9242 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 532: -#line 6131 "fe/idl.ypp" /* yacc.c:1651 */ + case 534: +#line 6211 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -9159,11 +9271,11 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 9163 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9275 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 533: -#line 6164 "fe/idl.ypp" /* yacc.c:1651 */ + case 535: +#line 6244 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_EventType *e = 0; @@ -9212,27 +9324,27 @@ yyreduce: */ idl_global->scopes ().push (e); } -#line 9216 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9328 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 534: -#line 6213 "fe/idl.ypp" /* yacc.c:1651 */ + case 536: +#line 6293 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9224 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9336 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 535: -#line 6217 "fe/idl.ypp" /* yacc.c:1651 */ + case 537: +#line 6297 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9232 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9344 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 536: -#line 6221 "fe/idl.ypp" /* yacc.c:1651 */ + case 538: +#line 6301 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9241,108 +9353,108 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9245 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9357 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 537: -#line 6233 "fe/idl.ypp" /* yacc.c:1651 */ + case 539: +#line 6313 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idval) = (yyvsp[0].idval); } -#line 9253 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9365 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 538: -#line 6237 "fe/idl.ypp" /* yacc.c:1651 */ + case 540: +#line 6317 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.idval) = (yyvsp[0].idval); } -#line 9261 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9373 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 539: -#line 6244 "fe/idl.ypp" /* yacc.c:1651 */ + case 541: +#line 6324 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_type; } -#line 9269 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9381 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 540: -#line 6248 "fe/idl.ypp" /* yacc.c:1651 */ + case 542: +#line 6328 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_struct; } -#line 9277 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9389 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 541: -#line 6252 "fe/idl.ypp" /* yacc.c:1651 */ + case 543: +#line 6332 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_union; } -#line 9285 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9397 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 542: -#line 6256 "fe/idl.ypp" /* yacc.c:1651 */ + case 544: +#line 6336 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_eventtype; } -#line 9293 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9405 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 543: -#line 6260 "fe/idl.ypp" /* yacc.c:1651 */ + case 545: +#line 6340 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_sequence; } -#line 9301 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9413 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 544: -#line 6264 "fe/idl.ypp" /* yacc.c:1651 */ + case 546: +#line 6344 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_interface; } -#line 9309 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9421 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 545: -#line 6268 "fe/idl.ypp" /* yacc.c:1651 */ + case 547: +#line 6348 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_valuetype; } -#line 9317 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9429 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 546: -#line 6272 "fe/idl.ypp" /* yacc.c:1651 */ + case 548: +#line 6352 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_enum; } -#line 9325 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9437 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 547: -#line 6276 "fe/idl.ypp" /* yacc.c:1651 */ + case 549: +#line 6356 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_except; } -#line 9333 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9445 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 548: -#line 6280 "fe/idl.ypp" /* yacc.c:1651 */ + case 550: +#line 6360 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.ntval) = AST_Decl::NT_const; t_param_const_type = (yyvsp[0].etval); } -#line 9342 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9454 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 549: -#line 6288 "fe/idl.ypp" /* yacc.c:1651 */ + case 551: +#line 6368 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[0].plval) == 0) { @@ -9370,11 +9482,11 @@ yyreduce: (yyval.plval) = (yyvsp[0].plval); } -#line 9374 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9486 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 550: -#line 6319 "fe/idl.ypp" /* yacc.c:1651 */ + case 552: +#line 6399 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[-2].plval) == 0) { @@ -9387,19 +9499,19 @@ yyreduce: delete (yyvsp[0].pival); (yyvsp[0].pival) = 0; } -#line 9391 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9503 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 551: -#line 6332 "fe/idl.ypp" /* yacc.c:1651 */ + case 553: +#line 6412 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.plval) = 0; } -#line 9399 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9511 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 552: -#line 6339 "fe/idl.ypp" /* yacc.c:1651 */ + case 554: +#line 6419 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.pival), @@ -9424,11 +9536,11 @@ yyreduce: tao_enum_constant_decl = 0; } } -#line 9428 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9540 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 553: -#line 6364 "fe/idl.ypp" /* yacc.c:1651 */ + case 555: +#line 6444 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.pival), FE_Utils::T_Param_Info, @@ -9443,19 +9555,19 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 9447 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9559 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 554: -#line 6382 "fe/idl.ypp" /* yacc.c:1651 */ + case 556: +#line 6462 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.slval), UTL_StrList ((yyvsp[-1].sval), (yyvsp[0].slval)), 1); } -#line 9455 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9567 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 555: -#line 6389 "fe/idl.ypp" /* yacc.c:1651 */ + case 557: +#line 6469 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_StrList *sl = 0; ACE_NEW_RETURN (sl, UTL_StrList ((yyvsp[0].sval), 0), 1); @@ -9470,37 +9582,37 @@ yyreduce: (yyval.slval) = (yyvsp[-2].slval); } } -#line 9474 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9586 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 556: -#line 6404 "fe/idl.ypp" /* yacc.c:1651 */ + case 558: +#line 6484 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.slval) = 0; } -#line 9482 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9594 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 557: -#line 6411 "fe/idl.ypp" /* yacc.c:1651 */ + case 559: +#line 6491 "fe/idl.ypp" /* yacc.c:1651 */ { ACE_NEW_RETURN ((yyval.sval), UTL_String ((yyvsp[0].strval), true), 1); } -#line 9492 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9604 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 558: -#line 6420 "fe/idl.ypp" /* yacc.c:1651 */ + case 560: +#line 6500 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen); } -#line 9500 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9612 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 559: -#line 6424 "fe/idl.ypp" /* yacc.c:1651 */ + case 561: +#line 6504 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9518,102 +9630,102 @@ yyreduce: // Push it on the scopes stack. idl_global->scopes ().push (p); } -#line 9522 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9634 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 560: -#line 6442 "fe/idl.ypp" /* yacc.c:1651 */ + case 562: +#line 6522 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen); } -#line 9530 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9642 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 561: -#line 6446 "fe/idl.ypp" /* yacc.c:1651 */ + case 563: +#line 6526 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen); } -#line 9538 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9650 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 562: -#line 6450 "fe/idl.ypp" /* yacc.c:1651 */ + case 564: +#line 6530 "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 9549 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9661 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 563: -#line 6460 "fe/idl.ypp" /* yacc.c:1651 */ + case 565: +#line 6540 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9556 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9668 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 564: -#line 6466 "fe/idl.ypp" /* yacc.c:1651 */ + case 566: +#line 6546 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9563 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9675 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 565: -#line 6469 "fe/idl.ypp" /* yacc.c:1651 */ + case 567: +#line 6549 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9570 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9682 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 566: -#line 6475 "fe/idl.ypp" /* yacc.c:1651 */ + case 568: +#line 6555 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9577 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9689 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 567: -#line 6478 "fe/idl.ypp" /* yacc.c:1651 */ + case 569: +#line 6558 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9584 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9696 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 568: -#line 6481 "fe/idl.ypp" /* yacc.c:1651 */ + case 570: +#line 6561 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9591 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9703 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 569: -#line 6484 "fe/idl.ypp" /* yacc.c:1651 */ + case 571: +#line 6564 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9598 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9710 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 570: -#line 6487 "fe/idl.ypp" /* yacc.c:1651 */ + case 572: +#line 6567 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 9606 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9718 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 571: -#line 6491 "fe/idl.ypp" /* yacc.c:1651 */ + case 573: +#line 6571 "fe/idl.ypp" /* yacc.c:1651 */ { } -#line 9613 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9725 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 572: -#line 6497 "fe/idl.ypp" /* yacc.c:1651 */ + case 574: +#line 6577 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9682,11 +9794,11 @@ yyreduce: delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; } -#line 9686 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9798 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 573: -#line 6566 "fe/idl.ypp" /* yacc.c:1651 */ + case 575: +#line 6646 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen); UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9733,11 +9845,11 @@ yyreduce: delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; } -#line 9737 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9849 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 574: -#line 6616 "fe/idl.ypp" /* yacc.c:1651 */ + case 576: +#line 6696 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[0].alval) == 0) { @@ -9749,11 +9861,11 @@ yyreduce: (yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval)); (yyval.alval) = (yyvsp[0].alval); } -#line 9753 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9865 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 575: -#line 6631 "fe/idl.ypp" /* yacc.c:1651 */ + case 577: +#line 6711 "fe/idl.ypp" /* yacc.c:1651 */ { if ((yyvsp[-3].alval) == 0) { @@ -9765,19 +9877,19 @@ yyreduce: (yyvsp[-3].alval)->enqueue_tail ((yyvsp[0].dcval)); (yyval.alval) = (yyvsp[-3].alval); } -#line 9769 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9881 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 576: -#line 6643 "fe/idl.ypp" /* yacc.c:1651 */ + case 578: +#line 6723 "fe/idl.ypp" /* yacc.c:1651 */ { (yyval.alval) = 0; } -#line 9777 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9889 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 577: -#line 6650 "fe/idl.ypp" /* yacc.c:1651 */ + case 579: +#line 6730 "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 @@ -9833,27 +9945,27 @@ yyreduce: 0); } } -#line 9837 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9949 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 579: -#line 6713 "fe/idl.ypp" /* yacc.c:1651 */ + case 581: +#line 6793 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen); } -#line 9845 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9957 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 580: -#line 6717 "fe/idl.ypp" /* yacc.c:1651 */ + case 582: +#line 6797 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen); } -#line 9853 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 9965 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 581: -#line 6721 "fe/idl.ypp" /* yacc.c:1651 */ + case 583: +#line 6801 "fe/idl.ypp" /* yacc.c:1651 */ { UTL_Scope *s = idl_global->scopes ().top_non_null (); AST_Connector *parent = 0; @@ -9905,102 +10017,102 @@ yyreduce: idl_global->scopes ().push (c); } } -#line 9909 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10021 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 582: -#line 6776 "fe/idl.ypp" /* yacc.c:1651 */ + case 584: +#line 6856 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen); } -#line 9917 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10029 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 583: -#line 6780 "fe/idl.ypp" /* yacc.c:1651 */ + case 585: +#line 6860 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen); } -#line 9925 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10037 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 584: -#line 6784 "fe/idl.ypp" /* yacc.c:1651 */ + case 586: +#line 6864 "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 9936 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10048 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 587: -#line 6799 "fe/idl.ypp" /* yacc.c:1651 */ + case 589: +#line 6879 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 9944 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10056 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 588: -#line 6803 "fe/idl.ypp" /* yacc.c:1651 */ + case 590: +#line 6883 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 9952 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10064 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 589: -#line 6807 "fe/idl.ypp" /* yacc.c:1651 */ + case 591: +#line 6887 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 9960 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10072 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 590: -#line 6811 "fe/idl.ypp" /* yacc.c:1651 */ + case 592: +#line 6891 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 9968 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10080 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 591: -#line 6815 "fe/idl.ypp" /* yacc.c:1651 */ + case 593: +#line 6895 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 9976 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10088 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 592: -#line 6819 "fe/idl.ypp" /* yacc.c:1651 */ + case 594: +#line 6899 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 9984 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10096 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 593: -#line 6823 "fe/idl.ypp" /* yacc.c:1651 */ + case 595: +#line 6903 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 9992 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10104 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; - case 594: -#line 6827 "fe/idl.ypp" /* yacc.c:1651 */ + case 596: +#line 6907 "fe/idl.ypp" /* yacc.c:1651 */ { idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10000 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10112 "fe/idl.tab.cpp" /* yacc.c:1651 */ break; -#line 10004 "fe/idl.tab.cpp" /* yacc.c:1651 */ +#line 10116 "fe/idl.tab.cpp" /* yacc.c:1651 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -10228,7 +10340,7 @@ yyreturn: #endif return yyresult; } -#line 6832 "fe/idl.ypp" /* yacc.c:1910 */ +#line 6912 "fe/idl.ypp" /* yacc.c:1910 */ /* programs */ diff --git a/TAO/TAO_IDL/fe/idl.tab.hpp b/TAO/TAO_IDL/fe/idl.tab.hpp index 8dbe57af632..daedad32a84 100644 --- a/TAO/TAO_IDL/fe/idl.tab.hpp +++ b/TAO/TAO_IDL/fe/idl.tab.hpp @@ -138,7 +138,7 @@ extern int tao_yydebug; union YYSTYPE { -#line 156 "fe/idl.ypp" /* yacc.c:1913 */ +#line 158 "fe/idl.ypp" /* yacc.c:1913 */ AST_Decl *dcval; /* Decl value */ UTL_StrList *slval; /* String list */ diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp index 8b4f152cd0e..4ccd0083ad9 100644 --- a/TAO/TAO_IDL/fe/idl.ypp +++ b/TAO/TAO_IDL/fe/idl.ypp @@ -124,6 +124,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_annotation_appl.h" #include "ast_union_branch.h" #include "ast_enum_val.h" +#include "ast_annotation_member.h" #include "fe_declarator.h" #include "fe_interface_header.h" @@ -143,6 +144,7 @@ extern "C" int tao_yywrap (void); extern char tao_yytext[]; extern int tao_yyleng; AST_Enum *tao_enum_constant_decl = 0; +AST_String *tao_string_decl = 0; AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none; #define TAO_YYDEBUG_LEXER_TEXT (tao_yytext[tao_yyleng] = '\0', tao_yytext) // Compile Optional Tracing Output for Parser, can be enabled with --bison-trace @@ -334,7 +336,7 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none; %type <exval> expression const_expr or_expr xor_expr and_expr shift_expr %type <exval> add_expr mult_expr unary_expr primary_expr literal -%type <exval> positive_int_expr array_dim +%type <exval> positive_int_expr array_dim annotation_member_default %type <ulval> case_label @@ -343,6 +345,7 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none; %type <etval> const_type integer_type char_type boolean_type %type <etval> floating_pt_type fixed_type any_type signed_int %type <etval> unsigned_int base_type_spec octet_type object_type +%type <etval> annotation_member_type %type <dival> direction @@ -1103,13 +1106,7 @@ value_def valuetype : IDL_CUSTOM value_concrete_decl { - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("error in %C line %d\n"), - idl_global->filename ()->get_string (), - idl_global->lineno ())); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Sorry, I (TAO_IDL) can't handle") - ACE_TEXT (" custom yet\n"))); + idl_global->err ()->unsupported_error ("custom is not supported"); } | value_concrete_decl ; @@ -1891,19 +1888,19 @@ const_type { c = AST_PredefinedType::narrow_from_decl (d); - $<etval>$ = FE_Utils::PredefinedTypeToExprType (c->pt ()); + $$ = FE_Utils::PredefinedTypeToExprType (c->pt ()); } else if (d->node_type () == AST_Decl::NT_string) { - $<etval>$ = AST_Expression::EV_string; + $$ = AST_Expression::EV_string; } else if (d->node_type () == AST_Decl::NT_wstring) { - $<etval>$ = AST_Expression::EV_wstring; + $$ = AST_Expression::EV_wstring; } else if (d->node_type () == AST_Decl::NT_enum) { - $<etval>$ = AST_Expression::EV_enum; + $$ = AST_Expression::EV_enum; tao_enum_constant_decl = AST_Enum::narrow_from_decl (d); } @@ -2247,66 +2244,125 @@ positive_int_expr : ; annotation_dcl - : IDL_ANNOTATION_DECL IDENTIFIER '{' annotation_body '}' { - if (idl_global->idl_version_ >= IDL_VERSION_4) - { - ACE_DEBUG ((LM_WARNING, - ACE_TEXT ("WARNING: in %C on line %d:\n") - ACE_TEXT ("Declaring annotations is not supported at the ") - ACE_TEXT ("momment, this annotation is being ignored!\n"), - idl_global->filename ()->get_string (), - idl_global->lineno () - )); - } - else + : IDL_ANNOTATION_DECL defining_id '{' + { + if (idl_global->idl_version_ < IDL_VERSION_4) { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("ERROR: in %C on line %d:\n") - ACE_TEXT ("Annotations are an IDL4 feature, ") - ACE_TEXT ("they not supported in IDL %C!\n"), - idl_global->filename ()->get_string (), - idl_global->lineno (), - idl_global->idl_version_.to_string () - )); - idl_global->err()->syntax_error (idl_global->parse_state()); + idl_global->err ()->idl_version_error ( + "Annotations are an IDL4 feature"); } + + Identifier *id = $2; + UTL_ScopedName name (id, 0); + AST_Annotation_Decl::escape_name (&name); + AST_Annotation_Decl *annotation_decl = idl_global->gen ()-> + create_annotation_decl (&name); + idl_global->scopes ().top_non_null ()-> + fe_add_annotation_decl (annotation_decl); + idl_global->scopes ().push (annotation_decl); + } + annotation_body '}' + { + Identifier *id = $2; + idl_global->scopes ().pop (); + id->destroy (); + delete id; } ; annotation_body - : annotation_body annotation_statement ';' + : annotation_body annotation_statement | %empty ; annotation_statement : annotation_member - | const_dcl - | type_dcl - ; - -annotation_member_dcl - : annotation_member_type simple_declarator + | const_dcl ';' + | enum_type ';' + | IDL_TYPEDEF + { + idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); + idl_global->in_typedef (true); + } + type_declarator ';' ; annotation_member_type - : const_type /* Also covers scoped_name wanted by the spec grammar */ + : const_type | any_type ; -defaulted_annotation_member_dcl - : annotation_member_dcl IDL_DEFAULT IDL_CONST const_type +annotation_member + : annotation_member_type defining_id annotation_member_default ';' + { + UTL_Scope *scope = idl_global->scopes ().top_non_null (); + UTL_Scope *root = idl_global->scopes ().bottom (); + + AST_Expression::ExprType type = $1; + Identifier *name = $2; + UTL_ScopedName scoped_name (name, 0); + AST_Expression *default_value = $3; + + AST_Decl * type_obj; + switch (type) + { + case AST_Expression::EV_string: + case AST_Expression::EV_wstring: + type_obj = tao_string_decl; + break; + case AST_Expression::EV_enum: + type_obj = tao_enum_constant_decl; + break; + default: + type_obj = root->lookup_primitive_type (type); + } + + FE_Declarator *declarator = new FE_Declarator ( + &scoped_name, FE_Declarator::FD_simple, 0); + AST_Annotation_Member *member = idl_global->gen ()-> + create_annotation_member ( + type, declarator->compose (type_obj), declarator->name ()); + scope->fe_add_annotation_member (member); + + if (default_value) + { + // Check if types are compatible, else report error + AST_Expression::AST_ExprValue *result = + default_value->check_and_coerce (type, tao_enum_constant_decl); + tao_enum_constant_decl = 0; + if (result) + { + member->value (default_value); + } + else + { + idl_global->err ()->coercion_error (default_value, type); + } + delete result; + } + } ; -annotation_member - : annotation_member_dcl - | defaulted_annotation_member_dcl +annotation_member_default + : IDL_DEFAULT const_expr + { + $$ = $2; + } + | %empty + { + $$ = 0; + } ; at_least_one_annotation : annotations_maybe annotation_appl { AST_Annotation_Appls *annotations = $1; - annotations->push_back ($2); + AST_Annotation_Appl *annotation = $2; + if (annotation) + { + annotations->push_back (annotation); + } $$ = annotations; } ; @@ -2315,7 +2371,11 @@ annotations_maybe : annotations_maybe annotation_appl { AST_Annotation_Appls *annotations = $1; - annotations->push_back ($2); + AST_Annotation_Appl *annotation = $2; + if (annotation) + { + annotations->push_back (annotation); + } $$ = annotations; } | %empty @@ -2333,7 +2393,26 @@ annotation_appl "Annotations are an IDL4 feature"); } - $$ = idl_global->gen ()->create_annotation_appl ($2, $3); + AST_Annotation_Appl *appl = 0; + UTL_ScopedName *name = $2; + AST_Annotation_Decl::escape_name (name); + AST_Annotation_Appl::Params *params = $3; + + // Check for Annotation Declaration + AST_Decl *d = idl_global->scopes ().top_non_null ()-> + lookup_by_name (name); + if (!d /*&& !idl_global->ignore_missing_annotations_*/) + { + idl_global->err ()->lookup_error (name); + } + else + { + AST_Annotation_Decl *decl = AST_Annotation_Decl::narrow_from_decl (d); + appl = idl_global->gen ()->create_annotation_appl (name, params); + appl->apply_from (decl); + } + + $$ = appl; } ; @@ -3820,21 +3899,21 @@ string_type_spec } else { - $$ = idl_global->gen ()->create_string ($4); + tao_string_decl = idl_global->gen ()->create_string ($4); + /* * Add this AST_String to the types defined in the global scope. */ - (void) idl_global->root ()->fe_add_string ( - AST_String::narrow_from_decl ( - $$ - ) - ); + idl_global->root ()->fe_add_string ( + AST_String::narrow_from_decl ( + tao_string_decl)); - if (!idl_global->in_typedef () - && !idl_global->anon_silent ()) + if (!idl_global->in_typedef () && !idl_global->anon_silent ()) { idl_global->err ()->anonymous_type_diagnostic (); } + + $$ = tao_string_decl; } delete ev; @@ -3843,24 +3922,23 @@ string_type_spec | string_head { idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); + /* * Create a node representing a string. */ ACE_CDR::ULong bound = 0UL; - - $$ = + tao_string_decl = idl_global->gen ()->create_string ( idl_global->gen ()->create_expr (bound, AST_Expression::EV_ulong) ); + /* * Add this AST_String to the types defined in the global scope. */ - (void) idl_global->root ()->fe_add_string ( - AST_String::narrow_from_decl ( - $$ - ) - ); + idl_global->root ()->fe_add_string ( + AST_String::narrow_from_decl ( + tao_string_decl)); } ; @@ -3897,19 +3975,21 @@ wstring_type_spec } else { - $$ = idl_global->gen ()->create_wstring ($4); + AST_String *string = idl_global->gen ()->create_wstring ($4); + /* * Add this AST_String to the types defined in the global scope. */ - (void) idl_global->root ()->fe_add_string ( - AST_String::narrow_from_decl ($$) - ); + idl_global->root ()->fe_add_string ( + AST_String::narrow_from_decl ( + string)); - if (!idl_global->in_typedef () - && !idl_global->anon_silent ()) + if (!idl_global->in_typedef () && !idl_global->anon_silent ()) { idl_global->err ()->anonymous_type_diagnostic (); } + + $$ = string; } } | wstring_head @@ -3920,18 +4000,18 @@ wstring_type_spec * Create a node representing a wstring. */ ACE_CDR::ULong bound = 0UL; - - $$ = + AST_String *string = idl_global->gen ()->create_wstring ( idl_global->gen ()->create_expr (bound, AST_Expression::EV_ulong) ); + /* * Add this AST_String to the types defined in the global scope. */ - (void) idl_global->root ()->fe_add_string ( - AST_String::narrow_from_decl ($$) - ); + idl_global->root ()->fe_add_string ( + AST_String::narrow_from_decl ( + string)); } ; diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index ea3d152e501..f86edc5aaaf 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -617,7 +617,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[604] = +static const flex_int16_t yy_accept[605] = { 0, 110, 110, 114, 112, 110, 111, 111, 112, 112, 112, 112, 112, 85, 81, 112, 112, 112, 75, 76, 76, @@ -683,9 +683,9 @@ static const flex_int16_t yy_accept[604] = 7, 47, 9, 76, 76, 53, 54, 76, 76, 41, 0, 0, 0, 94, 94, 0, 0, 97, 97, 0, 0, 0, 0, 0, 61, 51, 76, 56, 0, 0, - 107, 107, 0, 0, 0, 74, 40, 0, 103, 0, + 107, 107, 0, 0, 0, 0, 40, 0, 103, 0, - 95, 95, 0 + 95, 95, 74, 0 } ; static const YY_CHAR yy_ec[256] = @@ -731,155 +731,155 @@ static const YY_CHAR yy_meta[62] = 7 } ; -static const flex_int16_t yy_base[632] = +static const flex_int16_t yy_base[634] = { 0, - 0, 60, 1188, 1189, 61, 1189, 1189, 58, 1151, 56, - 59, 67, 83, 75, 1169, 1167, 1164, 1146, 0, 1159, - 71, 1143, 1149, 54, 1128, 68, 37, 71, 48, 1137, - 1126, 33, 1125, 77, 1138, 87, 76, 66, 91, 52, - 86, 101, 100, 144, 154, 1153, 140, 147, 158, 147, - 1165, 157, 162, 152, 179, 207, 1189, 176, 170, 199, - 238, 1189, 227, 0, 244, 1189, 1189, 1189, 1122, 0, - 1142, 167, 1134, 1123, 1134, 1112, 1121, 1104, 1108, 1112, - 1107, 1124, 132, 1105, 1117, 1101, 1112, 1099, 1114, 1115, - 1114, 138, 1101, 1095, 1101, 1097, 175, 150, 1098, 1093, - - 1106, 1097, 1088, 1087, 1101, 1085, 1086, 66, 1101, 1093, - 1100, 154, 1085, 1081, 1082, 1088, 1075, 1079, 163, 1089, - 1081, 1083, 1083, 1070, 260, 0, 187, 1189, 1119, 272, - 1079, 1083, 1077, 1067, 1101, 266, 210, 221, 267, 1189, - 1111, 1110, 275, 1109, 280, 0, 285, 298, 1189, 312, - 1189, 314, 0, 308, 313, 0, 1066, 1083, 238, 302, - 322, 1106, 290, 1072, 1086, 1055, 1073, 0, 1055, 1060, - 1066, 1052, 1053, 288, 1048, 1066, 1064, 1045, 1051, 1049, - 1057, 1041, 1056, 1054, 1057, 1039, 1051, 1040, 1033, 1048, - 1051, 1044, 1049, 1031, 1027, 1027, 1037, 1040, 1021, 0, - - 1023, 281, 1020, 1029, 1021, 1035, 1017, 1019, 1018, 289, - 1019, 1014, 1019, 1027, 1016, 1021, 1010, 1007, 1023, 1025, - 1007, 1054, 1053, 1010, 1016, 1006, 1018, 378, 335, 1189, - 1189, 337, 1046, 0, 342, 348, 1189, 1002, 1026, 368, - 1045, 255, 353, 0, 1189, 0, 1011, 0, 995, 993, - 1002, 1005, 0, 0, 994, 1003, 297, 1002, 991, 984, - 992, 984, 0, 982, 985, 985, 994, 994, 977, 995, - 0, 977, 974, 975, 980, 0, 984, 975, 977, 979, - 965, 966, 984, 964, 982, 981, 972, 971, 974, 963, - 972, 975, 955, 960, 970, 957, 968, 967, 355, 955, - - 961, 0, 962, 0, 948, 956, 994, 381, 958, 948, - 956, 953, 947, 1189, 203, 413, 949, 953, 947, 937, - 296, 1189, 982, 1189, 981, 932, 0, 395, 429, 979, - 930, 948, 0, 946, 946, 932, 942, 0, 931, 919, - 929, 929, 935, 0, 919, 918, 919, 918, 0, 0, - 926, 914, 0, 927, 0, 927, 913, 925, 913, 923, - 0, 902, 901, 907, 904, 919, 135, 903, 907, 906, - 910, 0, 911, 897, 898, 907, 913, 908, 908, 910, - 892, 0, 895, 888, 0, 893, 1189, 458, 364, 886, - 434, 892, 934, 933, 890, 896, 886, 898, 897, 342, - - 466, 1189, 925, 0, 893, 874, 880, 888, 872, 886, - 870, 0, 869, 0, 863, 878, 861, 0, 866, 0, - 883, 864, 758, 0, 761, 0, 0, 741, 703, 720, + 0, 60, 1192, 1193, 61, 1193, 1193, 58, 1155, 56, + 59, 67, 83, 75, 1173, 1171, 1168, 1150, 0, 1163, + 71, 1147, 1153, 54, 1132, 68, 37, 71, 48, 1141, + 1130, 33, 1129, 77, 1142, 87, 76, 66, 91, 52, + 86, 101, 100, 144, 154, 1157, 140, 147, 158, 147, + 1169, 157, 162, 152, 179, 207, 1193, 176, 170, 199, + 238, 1193, 227, 0, 244, 1193, 1193, 1193, 1126, 0, + 1146, 167, 1138, 1127, 1138, 1116, 1125, 1108, 1112, 1116, + 1111, 1128, 132, 1109, 1121, 1105, 1116, 1103, 1118, 1119, + 1118, 138, 1105, 1099, 1105, 1101, 175, 150, 1102, 1097, + + 1110, 1101, 1092, 1091, 1105, 1089, 1090, 66, 1105, 1097, + 1104, 154, 1089, 1085, 1086, 1092, 1079, 1083, 163, 1093, + 1085, 1087, 1087, 1074, 260, 0, 187, 1193, 1123, 272, + 1083, 1087, 1081, 1071, 1105, 266, 210, 221, 267, 1193, + 1115, 1114, 275, 1113, 280, 0, 285, 298, 1193, 312, + 1193, 314, 0, 308, 313, 0, 1070, 1087, 238, 302, + 322, 1110, 290, 1076, 1090, 1059, 1077, 0, 1059, 1064, + 1070, 1056, 1057, 288, 1052, 1070, 1068, 1049, 1055, 1053, + 1061, 1045, 1060, 1058, 1061, 1043, 1055, 1044, 1037, 1052, + 1055, 1048, 1053, 1035, 1031, 1031, 1041, 1044, 1025, 0, + + 1027, 281, 1024, 1033, 1025, 1039, 1021, 1023, 1022, 289, + 1023, 1018, 1023, 1031, 1020, 1025, 1014, 1011, 1027, 1029, + 1011, 1058, 1057, 1014, 1020, 1010, 1022, 378, 335, 1193, + 1193, 337, 1050, 0, 342, 348, 1193, 1006, 1030, 368, + 1049, 255, 353, 0, 1193, 0, 1015, 0, 999, 997, + 1006, 1009, 0, 0, 998, 1007, 297, 1006, 995, 988, + 996, 988, 0, 986, 989, 989, 998, 998, 981, 999, + 0, 981, 978, 979, 984, 0, 988, 979, 981, 983, + 969, 970, 988, 968, 986, 985, 976, 975, 978, 967, + 976, 979, 959, 964, 974, 961, 972, 971, 355, 959, + + 965, 0, 966, 0, 952, 960, 998, 381, 962, 952, + 960, 957, 951, 1193, 203, 413, 953, 957, 951, 941, + 296, 1193, 986, 1193, 985, 936, 0, 395, 429, 983, + 934, 952, 0, 950, 950, 936, 946, 0, 935, 923, + 933, 933, 939, 0, 923, 922, 923, 922, 0, 0, + 930, 918, 0, 931, 0, 931, 917, 929, 917, 927, + 0, 906, 905, 911, 908, 923, 135, 907, 911, 910, + 914, 0, 915, 901, 902, 911, 917, 912, 912, 914, + 896, 0, 899, 892, 0, 897, 1193, 458, 364, 890, + 434, 896, 938, 937, 894, 900, 890, 902, 901, 342, + + 466, 1193, 929, 0, 897, 878, 884, 892, 876, 890, + 874, 0, 873, 0, 867, 882, 865, 0, 870, 0, + 887, 868, 758, 0, 761, 0, 0, 741, 703, 720, 719, 0, 700, 0, 684, 692, 675, 0, 0, 673, 0, 672, 685, 0, 677, 684, 683, 661, 678, 481, - 1189, 496, 400, 386, 511, 516, 683, 712, 437, 676, + 1193, 496, 400, 386, 511, 516, 683, 712, 437, 676, 661, 668, 664, 647, 524, 687, 625, 613, 0, 614, 606, 580, 0, 0, 579, 578, 0, 585, 586, 0, 570, 578, 569, 538, 0, 529, 542, 520, 539, 518, 503, 508, 0, 483, 481, 475, 462, 0, 539, 411, - 1189, 443, 473, 565, 1189, 503, 406, 1189, 573, 417, + 1193, 443, 473, 565, 1193, 503, 406, 1193, 573, 417, 432, 577, 438, 414, 370, 449, 0, 410, 382, 383, 0, 392, 375, 369, 372, 358, 0, 0, 357, 0, 332, 0, 0, 319, 0, 334, 0, 320, 0, 319, - 525, 1189, 531, 313, 593, 553, 597, 1189, 601, 569, + 525, 1193, 531, 313, 593, 553, 597, 1193, 601, 569, 473, 618, 622, 625, 243, 215, 0, 0, 0, 0, 0, 0, 0, 189, 169, 0, 0, 180, 141, 0, - 640, 644, 647, 1189, 649, 659, 663, 1189, 668, 673, + 640, 644, 647, 1193, 649, 659, 663, 1193, 668, 673, 148, 134, 531, 36, 0, 0, 43, 0, 683, 675, - 1189, 679, 63, 687, 689, 1189, 0, 698, 1189, 702, + 1193, 679, 63, 687, 689, 0, 0, 698, 1193, 702, - 1189, 712, 1189, 733, 742, 747, 754, 762, 771, 776, - 782, 791, 797, 799, 803, 812, 818, 820, 822, 825, - 831, 837, 843, 849, 855, 864, 873, 882, 891, 900, - 909 + 1193, 712, 1193, 1193, 733, 742, 747, 754, 762, 771, + 776, 782, 791, 797, 799, 803, 812, 818, 820, 822, + 825, 831, 837, 843, 849, 855, 864, 873, 882, 891, + 900, 909, 918 } ; -static const flex_int16_t yy_def[632] = +static const flex_int16_t yy_def[634] = { 0, - 603, 1, 603, 603, 603, 603, 603, 604, 605, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 603, 603, 603, 603, 604, 603, 607, - 603, 608, 603, 13, 603, 603, 603, 609, 56, 603, - 603, 603, 603, 610, 603, 603, 603, 603, 603, 606, - 606, 611, 612, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 603, 45, 45, 603, 127, 603, - 603, 603, 603, 603, 603, 603, 604, 604, 604, 603, - 603, 603, 603, 613, 603, 614, 603, 603, 603, 609, - 603, 609, 59, 603, 603, 610, 603, 606, 611, 603, - 615, 603, 603, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 616, 603, 603, 603, 603, 603, 603, 604, 603, - 603, 603, 617, 614, 603, 603, 603, 603, 606, 603, - 603, 611, 611, 618, 603, 619, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - - 606, 606, 606, 606, 606, 606, 616, 603, 603, 603, - 603, 603, 228, 603, 228, 603, 603, 603, 603, 603, - 604, 603, 603, 603, 603, 603, 606, 611, 611, 620, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 603, 603, 603, 603, - 603, 603, 621, 603, 603, 603, 603, 603, 603, 611, - - 329, 603, 622, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 603, - 603, 603, 623, 603, 603, 603, 603, 621, 603, 603, - 603, 603, 603, 603, 329, 624, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 603, 623, - - 603, 623, 625, 603, 603, 626, 603, 603, 603, 603, - 603, 603, 603, 603, 611, 603, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 625, 603, 625, 626, 603, 627, 603, 603, 603, 628, - 603, 603, 603, 603, 603, 603, 606, 606, 606, 606, - 606, 606, 606, 606, 606, 606, 606, 606, 606, 606, - 603, 603, 627, 603, 627, 603, 628, 603, 628, 629, - 630, 603, 603, 603, 606, 606, 606, 606, 603, 629, - 603, 629, 630, 603, 631, 603, 606, 603, 603, 631, - - 603, 631, 0, 603, 603, 603, 603, 603, 603, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603, - 603 + 604, 1, 604, 604, 604, 604, 604, 605, 606, 604, + 604, 604, 604, 604, 604, 604, 604, 604, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 604, 604, 604, 604, 605, 604, 608, + 604, 609, 604, 13, 604, 604, 604, 610, 56, 604, + 604, 604, 604, 611, 604, 604, 604, 604, 604, 607, + 607, 612, 613, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 604, 45, 45, 604, 127, 604, + 604, 604, 604, 604, 604, 604, 605, 605, 605, 604, + 604, 604, 604, 614, 604, 615, 604, 604, 604, 610, + 604, 610, 59, 604, 604, 611, 604, 607, 612, 604, + 616, 604, 604, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 617, 604, 604, 604, 604, 604, 604, 605, 604, + 604, 604, 618, 615, 604, 604, 604, 604, 607, 604, + 604, 612, 612, 619, 604, 620, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + + 607, 607, 607, 607, 607, 607, 617, 604, 604, 604, + 604, 604, 228, 604, 228, 604, 604, 604, 604, 604, + 605, 604, 604, 604, 604, 604, 607, 612, 612, 621, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 604, 604, 604, 604, + 604, 604, 622, 604, 604, 604, 604, 604, 604, 612, + + 329, 604, 623, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 604, + 604, 604, 624, 604, 604, 604, 604, 622, 604, 604, + 604, 604, 604, 604, 329, 625, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 604, 624, + + 604, 624, 626, 604, 604, 627, 604, 604, 604, 604, + 604, 604, 604, 604, 612, 604, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 626, 604, 626, 627, 604, 628, 604, 604, 604, 629, + 604, 604, 604, 604, 604, 604, 607, 607, 607, 607, + 607, 607, 607, 607, 607, 607, 607, 607, 607, 607, + 604, 604, 628, 604, 628, 604, 629, 604, 629, 630, + 631, 604, 604, 604, 607, 607, 607, 607, 604, 630, + 604, 630, 631, 604, 632, 633, 607, 604, 604, 632, + + 604, 632, 604, 0, 604, 604, 604, 604, 604, 604, + 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, + 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, + 604, 604, 604 } ; -static const flex_int16_t yy_nxt[1251] = +static const flex_int16_t yy_nxt[1255] = { 0, 4, 5, 6, 7, 5, 8, 4, 9, 4, 4, 10, 11, 12, 13, 14, 14, 15, 16, 4, 17, @@ -905,10 +905,10 @@ static const flex_int16_t yy_nxt[1251] = 588, 133, 161, 62, 63, 134, 207, 215, 393, 208, 59, 146, 60, 60, 61, 49, 144, 216, 62, 63, - 56, 56, 56, 62, 63, 189, 49, 587, 603, 586, - 190, 62, 148, 149, 603, 149, 154, 154, 62, 63, + 56, 56, 56, 62, 63, 189, 49, 587, 604, 586, + 190, 62, 148, 149, 604, 149, 154, 154, 62, 63, 155, 155, 155, 160, 585, 50, 62, 148, 149, 59, - 603, 61, 61, 61, 149, 59, 50, 65, 65, 65, + 604, 61, 61, 61, 149, 59, 50, 65, 65, 65, 160, 125, 62, 63, 125, 584, 126, 136, 62, 63, 136, 137, 49, 161, 128, 128, 223, 62, 63, 583, 229, 229, 231, 62, 63, 130, 130, 130, 232, 232, @@ -981,46 +981,47 @@ static const flex_int16_t yy_nxt[1251] = 577, 590, 590, 590, 590, 590, 590, 590, 590, 590, 593, 593, 593, 593, 593, 593, 593, 593, 593, 600, - 600, 600, 600, 600, 600, 600, 600, 600, 480, 479, - 478, 477, 476, 475, 474, 473, 472, 471, 470, 469, - 468, 467, 402, 464, 463, 462, 461, 460, 393, 459, - 457, 454, 449, 448, 447, 446, 445, 444, 443, 442, - 441, 440, 439, 438, 437, 436, 435, 434, 431, 430, - 429, 428, 427, 426, 425, 424, 423, 422, 421, 420, - 419, 418, 417, 416, 415, 414, 413, 412, 411, 410, - 409, 408, 407, 406, 405, 404, 402, 399, 324, 322, - 398, 397, 396, 395, 603, 392, 391, 390, 389, 308, - - 386, 385, 384, 383, 382, 377, 376, 375, 374, 373, - 372, 371, 370, 369, 368, 367, 366, 365, 364, 363, - 362, 361, 360, 359, 358, 357, 356, 355, 354, 353, - 352, 351, 350, 349, 348, 347, 346, 345, 344, 343, - 342, 341, 340, 337, 336, 335, 334, 333, 332, 331, - 72, 327, 326, 324, 312, 311, 310, 309, 222, 308, - 306, 305, 304, 303, 302, 301, 300, 299, 298, 297, - 296, 293, 292, 291, 290, 289, 288, 287, 284, 283, - 282, 281, 280, 279, 278, 277, 276, 275, 274, 273, - 272, 271, 270, 269, 268, 267, 266, 265, 264, 263, - - 262, 261, 260, 259, 255, 254, 253, 252, 251, 250, - 249, 248, 247, 245, 239, 238, 230, 230, 230, 228, - 227, 226, 225, 224, 222, 221, 220, 219, 218, 217, - 214, 213, 212, 211, 210, 209, 206, 205, 204, 201, - 200, 199, 198, 197, 196, 195, 194, 193, 188, 187, - 186, 185, 182, 181, 180, 179, 178, 177, 176, 175, - 172, 171, 170, 169, 168, 167, 166, 165, 164, 163, - 158, 157, 140, 135, 103, 98, 95, 94, 80, 75, - 74, 71, 69, 68, 67, 66, 52, 603, 3, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603, - - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603 + 600, 600, 600, 600, 600, 600, 600, 600, 603, 603, + 603, 603, 480, 479, 478, 477, 476, 475, 474, 473, + 472, 471, 470, 469, 468, 467, 402, 464, 463, 462, + 461, 460, 393, 459, 457, 454, 449, 448, 447, 446, + 445, 444, 443, 442, 441, 440, 439, 438, 437, 436, + 435, 434, 431, 430, 429, 428, 427, 426, 425, 424, + 423, 422, 421, 420, 419, 418, 417, 416, 415, 414, + 413, 412, 411, 410, 409, 408, 407, 406, 405, 404, + 402, 399, 324, 322, 398, 397, 396, 395, 604, 392, + + 391, 390, 389, 308, 386, 385, 384, 383, 382, 377, + 376, 375, 374, 373, 372, 371, 370, 369, 368, 367, + 366, 365, 364, 363, 362, 361, 360, 359, 358, 357, + 356, 355, 354, 353, 352, 351, 350, 349, 348, 347, + 346, 345, 344, 343, 342, 341, 340, 337, 336, 335, + 334, 333, 332, 331, 72, 327, 326, 324, 312, 311, + 310, 309, 222, 308, 306, 305, 304, 303, 302, 301, + 300, 299, 298, 297, 296, 293, 292, 291, 290, 289, + 288, 287, 284, 283, 282, 281, 280, 279, 278, 277, + 276, 275, 274, 273, 272, 271, 270, 269, 268, 267, + + 266, 265, 264, 263, 262, 261, 260, 259, 255, 254, + 253, 252, 251, 250, 249, 248, 247, 245, 239, 238, + 230, 230, 230, 228, 227, 226, 225, 224, 222, 221, + 220, 219, 218, 217, 214, 213, 212, 211, 210, 209, + 206, 205, 204, 201, 200, 199, 198, 197, 196, 195, + 194, 193, 188, 187, 186, 185, 182, 181, 180, 179, + 178, 177, 176, 175, 172, 171, 170, 169, 168, 167, + 166, 165, 164, 163, 158, 157, 140, 135, 103, 98, + 95, 94, 80, 75, 74, 71, 69, 68, 67, 66, + 52, 604, 3, 604, 604, 604, 604, 604, 604, 604, + + 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, + 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, + 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, + 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, + 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, + 604, 604, 604, 604 } ; -static const flex_int16_t yy_chk[1251] = +static const flex_int16_t yy_chk[1255] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1102,63 +1103,64 @@ static const flex_int16_t yy_chk[1251] = 598, 598, 464, 589, 600, 600, 463, 594, 462, 595, 461, 598, 598, 598, 602, 602, 460, 458, 598, 457, 449, 448, 600, 447, 446, 445, 443, 442, 440, 437, - 436, 435, 602, 604, 604, 604, 604, 604, 604, 604, - 604, 604, 605, 433, 605, 605, 605, 605, 605, 605, - 605, 606, 606, 606, 606, 606, 607, 607, 607, 431, - 430, 607, 608, 429, 608, 608, 608, 608, 608, 608, - 608, 609, 609, 609, 609, 609, 609, 609, 609, 609, - 610, 610, 611, 611, 611, 611, 611, 611, 611, 611, - 611, 612, 428, 612, 612, 612, 612, 612, 612, 612, - - 613, 613, 613, 614, 614, 615, 615, 615, 425, 423, - 615, 615, 616, 616, 616, 616, 616, 616, 616, 616, - 616, 617, 617, 617, 618, 618, 619, 619, 620, 620, - 620, 621, 621, 621, 621, 621, 621, 621, 621, 621, - 622, 622, 622, 623, 623, 623, 623, 623, 623, 623, - 623, 623, 624, 624, 624, 625, 625, 625, 625, 625, - 625, 625, 625, 625, 626, 626, 626, 626, 626, 626, - 626, 626, 626, 627, 627, 627, 627, 627, 627, 627, - 627, 627, 628, 628, 628, 628, 628, 628, 628, 628, - 628, 629, 629, 629, 629, 629, 629, 629, 629, 629, - - 630, 630, 630, 630, 630, 630, 630, 630, 630, 631, - 631, 631, 631, 631, 631, 631, 631, 631, 422, 421, - 419, 417, 416, 415, 413, 411, 410, 409, 408, 407, - 406, 405, 403, 399, 398, 397, 396, 395, 394, 393, - 392, 390, 386, 384, 383, 381, 380, 379, 378, 377, - 376, 375, 374, 373, 371, 370, 369, 368, 366, 365, - 364, 363, 362, 360, 359, 358, 357, 356, 354, 352, - 351, 348, 347, 346, 345, 343, 342, 341, 340, 339, - 337, 336, 335, 334, 332, 331, 330, 326, 325, 323, - 320, 319, 318, 317, 313, 312, 311, 310, 309, 307, - - 306, 305, 303, 301, 300, 298, 297, 296, 295, 294, - 293, 292, 291, 290, 289, 288, 287, 286, 285, 284, - 283, 282, 281, 280, 279, 278, 277, 275, 274, 273, - 272, 270, 269, 268, 267, 266, 265, 264, 262, 261, - 260, 259, 258, 256, 255, 252, 251, 250, 249, 247, - 241, 239, 238, 233, 227, 226, 225, 224, 223, 222, - 221, 220, 219, 218, 217, 216, 215, 214, 213, 212, - 211, 209, 208, 207, 206, 205, 204, 203, 201, 199, - 198, 197, 196, 195, 194, 193, 192, 191, 190, 189, - 188, 187, 186, 185, 184, 183, 182, 181, 180, 179, - - 178, 177, 176, 175, 173, 172, 171, 170, 169, 167, - 166, 165, 164, 162, 158, 157, 144, 142, 141, 135, - 134, 133, 132, 131, 129, 124, 123, 122, 121, 120, - 118, 117, 116, 115, 114, 113, 111, 110, 109, 107, - 106, 105, 104, 103, 102, 101, 100, 99, 96, 95, - 94, 93, 91, 90, 89, 88, 87, 86, 85, 84, - 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, - 71, 69, 51, 46, 35, 33, 31, 30, 25, 23, - 22, 20, 18, 17, 16, 15, 9, 3, 603, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603, - - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603, - 603, 603, 603, 603, 603, 603, 603, 603, 603, 603 + 436, 435, 602, 605, 605, 605, 605, 605, 605, 605, + 605, 605, 606, 433, 606, 606, 606, 606, 606, 606, + 606, 607, 607, 607, 607, 607, 608, 608, 608, 431, + 430, 608, 609, 429, 609, 609, 609, 609, 609, 609, + 609, 610, 610, 610, 610, 610, 610, 610, 610, 610, + 611, 611, 612, 612, 612, 612, 612, 612, 612, 612, + 612, 613, 428, 613, 613, 613, 613, 613, 613, 613, + + 614, 614, 614, 615, 615, 616, 616, 616, 425, 423, + 616, 616, 617, 617, 617, 617, 617, 617, 617, 617, + 617, 618, 618, 618, 619, 619, 620, 620, 621, 621, + 621, 622, 622, 622, 622, 622, 622, 622, 622, 622, + 623, 623, 623, 624, 624, 624, 624, 624, 624, 624, + 624, 624, 625, 625, 625, 626, 626, 626, 626, 626, + 626, 626, 626, 626, 627, 627, 627, 627, 627, 627, + 627, 627, 627, 628, 628, 628, 628, 628, 628, 628, + 628, 628, 629, 629, 629, 629, 629, 629, 629, 629, + 629, 630, 630, 630, 630, 630, 630, 630, 630, 630, + + 631, 631, 631, 631, 631, 631, 631, 631, 631, 632, + 632, 632, 632, 632, 632, 632, 632, 632, 633, 633, + 633, 633, 422, 421, 419, 417, 416, 415, 413, 411, + 410, 409, 408, 407, 406, 405, 403, 399, 398, 397, + 396, 395, 394, 393, 392, 390, 386, 384, 383, 381, + 380, 379, 378, 377, 376, 375, 374, 373, 371, 370, + 369, 368, 366, 365, 364, 363, 362, 360, 359, 358, + 357, 356, 354, 352, 351, 348, 347, 346, 345, 343, + 342, 341, 340, 339, 337, 336, 335, 334, 332, 331, + 330, 326, 325, 323, 320, 319, 318, 317, 313, 312, + + 311, 310, 309, 307, 306, 305, 303, 301, 300, 298, + 297, 296, 295, 294, 293, 292, 291, 290, 289, 288, + 287, 286, 285, 284, 283, 282, 281, 280, 279, 278, + 277, 275, 274, 273, 272, 270, 269, 268, 267, 266, + 265, 264, 262, 261, 260, 259, 258, 256, 255, 252, + 251, 250, 249, 247, 241, 239, 238, 233, 227, 226, + 225, 224, 223, 222, 221, 220, 219, 218, 217, 216, + 215, 214, 213, 212, 211, 209, 208, 207, 206, 205, + 204, 203, 201, 199, 198, 197, 196, 195, 194, 193, + 192, 191, 190, 189, 188, 187, 186, 185, 184, 183, + + 182, 181, 180, 179, 178, 177, 176, 175, 173, 172, + 171, 170, 169, 167, 166, 165, 164, 162, 158, 157, + 144, 142, 141, 135, 134, 133, 132, 131, 129, 124, + 123, 122, 121, 120, 118, 117, 116, 115, 114, 113, + 111, 110, 109, 107, 106, 105, 104, 103, 102, 101, + 100, 99, 96, 95, 94, 93, 91, 90, 89, 88, + 87, 86, 85, 84, 82, 81, 80, 79, 78, 77, + 76, 75, 74, 73, 71, 69, 51, 46, 35, 33, + 31, 30, 25, 23, 22, 20, 18, 17, 16, 15, + 9, 3, 604, 604, 604, 604, 604, 604, 604, 604, + + 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, + 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, + 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, + 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, + 604, 604, 604, 604, 604, 604, 604, 604, 604, 604, + 604, 604, 604, 604 } ; static yy_state_type yy_last_accepting_state; @@ -1295,9 +1297,9 @@ static AST_Decl * idl_find_node (const char *); #undef ECHO #endif -#line 1301 "fe/idl.yy.cpp" -/* SO we don't choke on files that use \r\n */ #line 1303 "fe/idl.yy.cpp" +/* SO we don't choke on files that use \r\n */ +#line 1305 "fe/idl.yy.cpp" #define INITIAL 0 @@ -1520,7 +1522,7 @@ YY_DECL #line 123 "fe/idl.ll" -#line 1526 "fe/idl.yy.cpp" +#line 1528 "fe/idl.yy.cpp" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1548,13 +1550,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 604 ) + if ( yy_current_state >= 605 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_current_state != 603 ); + while ( yy_current_state != 604 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -1943,9 +1945,10 @@ YY_RULE_SETUP } YY_BREAK case 74: +/* rule 74 can match eol */ YY_RULE_SETUP #line 208 "fe/idl.ll" -return IDL_ANNOTATION_DECL; +return IDL_ANNOTATION_DECL; // Allow annotation names that start with "annotation" YY_BREAK case 75: YY_RULE_SETUP @@ -2303,7 +2306,7 @@ YY_RULE_SETUP #line 417 "fe/idl.ll" ECHO; YY_BREAK -#line 2309 "fe/idl.yy.cpp" +#line 2312 "fe/idl.yy.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -2602,7 +2605,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 604 ) + if ( yy_current_state >= 605 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -2630,11 +2633,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 604 ) + if ( yy_current_state >= 605 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 603); + yy_is_jam = (yy_current_state == 604); return yy_is_jam ? 0 : yy_current_state; } diff --git a/TAO/TAO_IDL/include/ast_annotation_appl.h b/TAO/TAO_IDL/include/ast_annotation_appl.h index f41f62d8f97..5e9324f0aa8 100644 --- a/TAO/TAO_IDL/include/ast_annotation_appl.h +++ b/TAO/TAO_IDL/include/ast_annotation_appl.h @@ -14,6 +14,10 @@ /** * Abstract Syntax Tree Node for an application of an annotation. + * + * Params are implemented as a stack of name, value pairs which are independent + * from the finished annotation members. The members which are AST_Fields subclasses + * stored the same way as fields in AST_Struct. */ class TAO_IDL_FE_Export AST_Annotation_Appl : public virtual AST_Annotation_Decl { @@ -23,8 +27,11 @@ public: */ ///{ struct Param { + Param (); Identifier *id; AST_Expression *expr; + bool used; + typedef ACE_Unbounded_Stack_Iterator<Param*> Iterator; }; typedef ACE_Unbounded_Stack<Param*> Params; ///} @@ -54,16 +61,47 @@ public: static AST_Decl::NodeType const NT; /** - * Get name of the annoation as written by the user + * Get name of the annotation as written by the user */ const char* original_name () const; + /** + * Apply a Annotation Declaration to this Application. This will either fully + * instantiate this object or result in an error, in which case it returns false. + */ + bool apply_from (AST_Annotation_Decl *decl); + + /** + * Return pointer to the stack of parameters passed. BACKENDS SHOULDN'T USE + * THIS UNLESS YOU NEED EXACTLY WHAT THE USER PASSED. Backends should use the + * lookup and scope iterator APIs that this class inherits from AST_Scope + * and AST_Struct. Can be null. + */ + Params *params (); + + /** + * AST_Annotation_Decl kept in case desired by someone + * + * Will be null if accessed before apply_from() is called or if being used + * without a declaration. + */ + AST_Annotation_Decl *annotation_decl (); + + /** + * Return the parameter with the specified name if it's in the stack else + * returns 0. + */ + Param *find_param (const char *name); + private: /// Name of the Annotation as written const char *original_name_; - /// Parameters List + /// Parameters List (Can be null) Params *params_; + + /// The AST_Annotation_Decl (Possibly could be null) + AST_Annotation_Decl *annotation_decl_; }; typedef ACE_Vector<AST_Annotation_Appl*> AST_Annotation_Appls; diff --git a/TAO/TAO_IDL/include/ast_annotation_decl.h b/TAO/TAO_IDL/include/ast_annotation_decl.h index 6742e2e89f4..e8e12388a7b 100644 --- a/TAO/TAO_IDL/include/ast_annotation_decl.h +++ b/TAO/TAO_IDL/include/ast_annotation_decl.h @@ -18,9 +18,11 @@ public: virtual ~AST_Annotation_Decl (); - // Narrowing + /// Narrowing + ///{ DEF_NARROW_FROM_DECL (AST_Annotation_Decl); DEF_NARROW_FROM_SCOPE (AST_Annotation_Decl); + ///} /// AST Dumping virtual void dump (ACE_OSTREAM_TYPE &o); @@ -30,6 +32,20 @@ public: static AST_Decl::NodeType const NT; + /** + * Work around for AST node lookup, so that annotations do not conflict with + * other IDL types and variables that have the same name. This is done by + * prepending '@' to all annotation names. + */ + ///{ + static void escape_name (Identifier *name); + static void escape_name (UTL_ScopedName *name); + ///} + + virtual bool annotatable () const; + + virtual AST_Annotation_Member *fe_add_annotation_member ( + AST_Annotation_Member *annotation_member); }; #endif diff --git a/TAO/TAO_IDL/include/ast_annotation_member.h b/TAO/TAO_IDL/include/ast_annotation_member.h new file mode 100644 index 00000000000..5686a2f639f --- /dev/null +++ b/TAO/TAO_IDL/include/ast_annotation_member.h @@ -0,0 +1,69 @@ +/** + * Abstract Syntax Tree Node for a Member Value of an Annotation + */ + +#ifndef AST_ANNOTATION_MEMBER_HEADER +#define AST_ANNOTATION_MEMBER_HEADER + +#include "ast_field.h" +#include "ast_expression.h" + +class AST_Expression; + +/** + * Abstract Syntax Tree Node for a Member Value of an Annotation + */ +class TAO_IDL_FE_Export AST_Annotation_Member : public virtual AST_Field +{ +public: + AST_Annotation_Member ( + AST_Expression::ExprType expr_type, + AST_Type *type, UTL_ScopedName *name); + + AST_Annotation_Member ( + AST_Decl::NodeType nt, + AST_Expression::ExprType expr_type, + AST_Type *type, UTL_ScopedName *name); + + /// Pseudo-Copy Constructor for Creating Annotation Applications + AST_Annotation_Member ( + UTL_ScopedName *name, + AST_Annotation_Member *other); + + virtual ~AST_Annotation_Member (); + + static AST_Decl::NodeType const NT; + + /// Cleanup + virtual void destroy (); + + /// Narrowing + ///{ + DEF_NARROW_FROM_DECL (AST_Annotation_Member); + DEF_NARROW_FROM_SCOPE (AST_Annotation_Member); + ///} + + /// AST Dumping + virtual void dump (ACE_OSTREAM_TYPE &o); + + /// Get and Set the Value + ///{ + AST_Expression *value (); + void value (AST_Expression *value); + ///} + + /// Get the ExprType + AST_Expression::ExprType expr_type (); + + /// Returns true if the expression value is null or invalid + bool invalid_value (); + +private: + /// Keep ExprType at hand for convience + AST_Expression::ExprType expr_type_; + + /// Value of the Member, can be null + AST_Expression *value_; +}; + +#endif diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index 5357d8514bd..b38dd61d0da 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -181,12 +181,23 @@ public: , NT_param_holder // Denotes a template param placeholder , NT_annotation_decl // The declaration of an annotation , NT_annotation_appl // Application of an annotation to an IDL element + , NT_annotation_member // Value Inside an Annotation }; AST_Decl (NodeType type, UTL_ScopedName *n, bool anonymous = false); + /** + * A sort of copy constructor that creates a copy of the AST_Decl for a new + * scope. + * The new name must be calculated before hand. + * This was created for Annotation Applications and Extended Structs. + */ + AST_Decl ( + UTL_ScopedName *name, + AST_Decl *other); + virtual ~AST_Decl (void); // Cleanup method. diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h index d1cb903b520..535e6740ab8 100644 --- a/TAO/TAO_IDL/include/ast_field.h +++ b/TAO/TAO_IDL/include/ast_field.h @@ -99,6 +99,16 @@ public: UTL_ScopedName *n, Visibility vis = vis_NA); + /** + * A sort of copy constructor that creates a copy of the AST_Field for a new + * scope. + * The new name must be calculated before hand. + * This was created for Annotation Instances and Extended Structs. + */ + AST_Field ( + UTL_ScopedName *name, + AST_Field *other); + virtual ~AST_Field (void); // Data Accessors. diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h index 3c31d7a7c13..d4fd9fbac16 100644 --- a/TAO/TAO_IDL/include/ast_generator.h +++ b/TAO/TAO_IDL/include/ast_generator.h @@ -96,6 +96,8 @@ class AST_Fixed; #include "ast_annotation_appl.h" +class AST_Annotation_Member; + // Defines base class for node generators. class TAO_IDL_FE_Export AST_Generator @@ -419,6 +421,11 @@ public: virtual AST_Annotation_Decl * create_annotation_decl ( UTL_ScopedName *name); + virtual AST_Annotation_Member * create_annotation_member ( + AST_Expression::ExprType expr_type, + AST_Type *type, + UTL_ScopedName *name); + virtual AST_Annotation_Appl * create_annotation_appl ( UTL_ScopedName *name, AST_Annotation_Appl::Params *params); diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h index 269a86075b2..03998ee62f0 100644 --- a/TAO/TAO_IDL/include/ast_module.h +++ b/TAO/TAO_IDL/include/ast_module.h @@ -230,6 +230,10 @@ public: virtual AST_PortType *fe_add_porttype (AST_PortType *pt); + virtual + AST_Annotation_Decl *fe_add_annotation_decl ( + AST_Annotation_Decl *annotation_decl); + // Reset the last_in_same_parent_scope_ member to ourself // (called by AST_Root::destroy on the CORBA module containing // the basic types, since it isn't destroyed between processing diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h index 311e89c3e04..15c8beb6eb5 100644 --- a/TAO/TAO_IDL/include/ast_predefined_type.h +++ b/TAO/TAO_IDL/include/ast_predefined_type.h @@ -95,6 +95,8 @@ public: , PT_abstract // Predefined type "CORBA::AbstractBase" , PT_void // Predefined type "void" , PT_pseudo // Predefined type for pseudo objects + , PT_string + , PT_enum }; AST_PredefinedType (PredefinedType t, diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index 76655748590..d6525e8b5ea 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -412,10 +412,16 @@ public: bool dump_builtins_; /** - * If true, Dump only the IDL defined using eval() and exit + * If true, Dump only the IDL defined using eval() and exit using + * ignore_files_ */ bool just_dump_builtins_; + /** + * Exit right before parsing input files. + */ + bool ignore_files_; + IDL_GlobalData (void); ~IDL_GlobalData (void); diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h index 9fff3e91ef6..40e9e711583 100644 --- a/TAO/TAO_IDL/include/utl_err.h +++ b/TAO/TAO_IDL/include/utl_err.h @@ -76,6 +76,8 @@ class AST_Fixed; class AST_Union; class AST_UnionLabel; class UTL_String; +class AST_Annotation_Decl; +class AST_Annotation_Member; class TAO_IDL_FE_Export UTL_Error { @@ -155,6 +157,7 @@ public: EIDL_FIXED_UNSUPPORTED, // fixed data type is not supported EIDL_IDL_VERSION_ERROR, // An error related to differences in IDL version EIDL_UNSUPPORTED, // Unsupported feature was used in input IDL + EIDL_ANNOTATION_PARAM_ERROR, // Error in Annotation Parameters EIDL_MISC, // Very Specific Error or Warning EIDL_OK // No error }; @@ -423,6 +426,26 @@ public: * If node is not defined the current file and line are reported. */ void misc_warning (const char *reason, AST_Decl *node = 0); + + /** + * Report that an invalid annotation parameter was passed + */ + void invalid_annotation_param_error ( + AST_Annotation_Appl *appl, AST_Annotation_Decl *decl, + Identifier *invalid_id); + + /** + * Report that an annotation parameter has an invalid type + */ + void invalid_annotation_param_type ( + AST_Annotation_Appl *appl, AST_Annotation_Member *member, + AST_Expression *offending_value); + + /** + * Report that an annotation parameter needs to be defined + */ + void annotation_param_missing_error ( + AST_Annotation_Appl *appl, AST_Annotation_Member *member); }; #endif // _UTL_ERR_UTL_ERR_HH diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index a21d5a0e40d..38f37284ffa 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -131,6 +131,8 @@ class AST_Mirror_Port; class AST_Connector; class UTL_StrList; class UTL_NameList; +class AST_Annotation_Decl; +class AST_Annotation_Member; // Forward declaration of active iterator for UTL_Scope. class UTL_ScopeActiveIterator; @@ -492,6 +494,14 @@ public: virtual AST_Mirror_Port *fe_add_mirror_port (AST_Mirror_Port *mp); + virtual + AST_Annotation_Decl *fe_add_annotation_decl ( + AST_Annotation_Decl *annotation_decl); + + virtual + AST_Annotation_Member *fe_add_annotation_member ( + AST_Annotation_Member *annotation_member); + protected: /// Quick check on the head of a name to see if it's global. bool is_global_name (Identifier *i); diff --git a/TAO/TAO_IDL/narrow/narrow.cpp b/TAO/TAO_IDL/narrow/narrow.cpp index b30fcbeb799..180ac2888df 100644 --- a/TAO/TAO_IDL/narrow/narrow.cpp +++ b/TAO/TAO_IDL/narrow/narrow.cpp @@ -79,6 +79,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_interface_fwd.h" #include "utl_scope.h" #include "ast_annotation_decl.h" +#include "ast_annotation_appl.h" // Narrowing functions for AST @@ -126,6 +127,8 @@ ScopeAsDecl (UTL_Scope *s) return AST_Enum::narrow_from_scope (s); case AST_Decl::NT_annotation_decl: return AST_Annotation_Decl::narrow_from_scope (s); + case AST_Decl::NT_annotation_appl: + return AST_Annotation_Appl::narrow_from_scope (s); default: return 0; } diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp index d1e7d486b87..4ea6368baeb 100644 --- a/TAO/TAO_IDL/tao_idl.cpp +++ b/TAO/TAO_IDL/tao_idl.cpp @@ -385,6 +385,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Dump Builtin IDL defined by Compiler:\n"))); idl_global->root ()->dump (*ACE_DEFAULT_LOG_STREAM); + idl_global->ignore_files_ = true; + } + + if (idl_global->ignore_files_) + { throw Bailout (idl_global->err_count ()); } diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp index a5a84fd8cd1..1eb4e9f91be 100644 --- a/TAO/TAO_IDL/util/utl_err.cpp +++ b/TAO/TAO_IDL/util/utl_err.cpp @@ -78,6 +78,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_fixed.h" #include "ast_union.h" #include "ast_union_label.h" +#include "ast_annotation_decl.h" +#include "ast_annotation_member.h" +#include "ast_annotation_appl.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" @@ -237,6 +240,8 @@ error_string (UTL_Error::ErrorCode c) return "fixed data types are not supported"; case UTL_Error::EIDL_IDL_VERSION_ERROR: return "Invalid use of this version of IDL"; + case UTL_Error::EIDL_ANNOTATION_PARAM_ERROR: + return "Error in annotation parameter(s): "; case UTL_Error::EIDL_UNSUPPORTED: case UTL_Error::EIDL_MISC: return ""; // Supply Case by Case Message @@ -1612,3 +1617,69 @@ UTL_Error::misc_warning (const char *reason, AST_Decl *node) } } +void +UTL_Error::invalid_annotation_param_error ( + AST_Annotation_Appl *appl, AST_Annotation_Decl *decl, + Identifier *invalid_id) +{ + bool is_builtin = decl->builtin (); + idl_error_header (EIDL_ANNOTATION_PARAM_ERROR, + static_cast<AST_Decl*>(appl)); + invalid_id->dump (*ACE_DEFAULT_LOG_STREAM);; + ACE_ERROR ((LM_ERROR, ACE_TEXT (" is not a member of %Cannotation "), + is_builtin ? "builtin " : "")); + decl->name ()->dump (*ACE_DEFAULT_LOG_STREAM);; + if (!is_builtin) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT (" declared in \"%C\" on line %d"), + get_filename (decl), get_lineno (decl))); + } + ACE_ERROR ((LM_ERROR, ACE_TEXT ("\n"))); +} + +void +UTL_Error::invalid_annotation_param_type ( + AST_Annotation_Appl *appl, AST_Annotation_Member *member, + AST_Expression *offending_value) +{ + bool is_builtin = member->builtin (); + idl_error_header (EIDL_ANNOTATION_PARAM_ERROR, + static_cast<AST_Decl*>(appl)); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%Cnnotation member \""), + is_builtin ? "Builtin a" : "A")); + member->dump (*ACE_DEFAULT_LOG_STREAM); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("\""))); + if (!is_builtin) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT (" declared in \"%C\" on line %d"), + get_filename (member), get_lineno (member))); + } + ACE_ERROR ((LM_ERROR, ACE_TEXT (" can not be set to "))); + offending_value->dump (*ACE_DEFAULT_LOG_STREAM);; + ACE_ERROR ((LM_ERROR, ACE_TEXT (" because the types are incompatible!\n"))); +} + +void +UTL_Error::annotation_param_missing_error ( + AST_Annotation_Appl *appl, AST_Annotation_Member *member) +{ + bool is_builtin = member->builtin (); + idl_error_header (EIDL_ANNOTATION_PARAM_ERROR, + static_cast<AST_Decl*>(appl)); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%Cnnotation member: \""), + is_builtin ? "Builtin a" : "A")); + member->dump (*ACE_DEFAULT_LOG_STREAM); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("\""))); + if (!is_builtin) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT (" declared in \"%C\" on line %d"), + get_filename (member), get_lineno (member))); + } + ACE_ERROR ((LM_ERROR, + ACE_TEXT (" needs to be defined because it does not have a default value!\n"), + get_filename (member), get_lineno (member))); +} diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index a2afe891cbc..022c9d9f1c1 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -118,6 +118,7 @@ IDL_GlobalData::IDL_GlobalData (void) in_eval_ (false), dump_builtins_ (false), just_dump_builtins_ (false), + ignore_files_ (false), pd_root (0), pd_gen (0), pd_primary_key_base (0), @@ -1919,24 +1920,33 @@ IDL_GlobalData::print_warnings () } /* - * These functions are generated in idl.yy.cpp but for some reason they are not - * put in the header file, so to use them we must declare them here. + * These are generated in idl.yy.cpp but they are not put in the header file, + * so to use them we must declare them here. */ struct yy_buffer_state; extern yy_buffer_state *tao_yy_scan_string (const char *); -extern int tao_yylex_destroy (); +extern void tao_yypush_buffer_state (yy_buffer_state *); +extern void tao_yypop_buffer_state (); +extern void tao_yylex_destroy (); void IDL_GlobalData::eval (const char *string) { in_eval_ = true; + // Get IDL_Global Context + UTL_String *old_filename = filename (); + pd_filename = 0; + long old_lineno = lineno (); + idl_global->set_lineno (-1); + UTL_String *old_idl_src_file = idl_src_file (); + // Name this pseudo-file "builtin" - UTL_String *utl_string = 0; - ACE_NEW (utl_string, UTL_String ("builtin", true)); - idl_global->idl_src_file (utl_string); + UTL_String utl_string ("builtin", true); + idl_global->idl_src_file (new UTL_String (&utl_string, true)); + idl_global->set_filename (new UTL_String (&utl_string, true)); - // Set up flex to read from string + // Set up Flex to read from string tao_yy_scan_string (string); // emulate DRV_drive() @@ -1944,16 +1954,15 @@ IDL_GlobalData::eval (const char *string) idl_global->check_primary_keys (); AST_check_fwd_decls (); - // Have flex Cleanup + // Have Flex Cleanup tao_yylex_destroy (); - // emulate DRV_refresh() - idl_global->set_err_count (0); - idl_global->set_filename (0); - idl_global->set_main_filename (0); - idl_global->set_real_filename (0); - idl_global->set_stripped_filename (0); - idl_global->set_lineno (-1); + // Restore IDL_Global Context + idl_global->set_filename (old_filename); + idl_src_file()->destroy (); + delete idl_src_file (); + idl_src_file (old_idl_src_file); + idl_global->set_lineno (old_lineno); idl_global->reset_flag_seen (); in_eval_ = false; diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp index 2b37b3b33a1..67c7d715957 100644 --- a/TAO/TAO_IDL/util/utl_identifier.cpp +++ b/TAO/TAO_IDL/util/utl_identifier.cpp @@ -218,7 +218,11 @@ Identifier::dump (ACE_OSTREAM_TYPE &o) return; } - o << this->pv_string; + /* + * Annotation ids are prefixed with '@' to effectively create an alternative + * namespace for them. This hides that hack from dumping. + */ + o << ((pv_string[0] == '@') ? pv_string + 1 : pv_string); } void diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp index 89f834cbf25..06063645126 100644 --- a/TAO/TAO_IDL/util/utl_scope.cpp +++ b/TAO/TAO_IDL/util/utl_scope.cpp @@ -2228,3 +2228,15 @@ UTL_ScopeActiveIterator::iteration_stage (void) { return this->stage; } + +AST_Annotation_Decl * +UTL_Scope::fe_add_annotation_decl (AST_Annotation_Decl * /*annotation_decl*/) +{ + return 0; +} + +AST_Annotation_Member * +UTL_Scope::fe_add_annotation_member (AST_Annotation_Member * /*annotation_member*/) +{ + return 0; +} |