diff options
| author | Adam Mitz <mitza@ociweb.com> | 2015-03-27 17:01:22 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2015-03-27 17:01:22 -0500 |
| commit | 6b5c388813e1bbac774902e449d1a9f3c25fff96 (patch) | |
| tree | 217b9ef9b9003ca757c59fca90d75ffb18534039 /TAO | |
| parent | 308544833e69154ae835dd7d818f558d648e5148 (diff) | |
| download | ATCD-6b5c388813e1bbac774902e449d1a9f3c25fff96.tar.gz | |
Work in progress on supporting the fixed type in ACE_CDR and TAO_IDL_FE.
Diffstat (limited to 'TAO')
26 files changed, 2283 insertions, 2129 deletions
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp index bc045389580..436f7de9e1a 100644 --- a/TAO/TAO_IDL/ast/ast_constant.cpp +++ b/TAO/TAO_IDL/ast/ast_constant.cpp @@ -272,10 +272,7 @@ AST_Constant::exprtype_to_string (void) return "CORBA::WChar"; case AST_Expression::EV_wstring: return "CORBA::WChar *const"; - case AST_Expression::EV_enum: - case AST_Expression::EV_longdouble: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp index 91ff8f5713f..517486af7a3 100644 --- a/TAO/TAO_IDL/ast/ast_expression.cpp +++ b/TAO/TAO_IDL/ast/ast_expression.cpp @@ -488,6 +488,24 @@ AST_Expression::AST_Expression (char *sv) this->pd_ev->u.wstrval = sv; } +AST_Expression::AST_Expression (const ACE_CDR::Fixed &f) + : pd_ec (EC_none), + pd_ev (0), + pd_v1 (0), + pd_v2 (0), + pd_n (0), + tdef (0), + param_holder_ (0) +{ + this->fill_definition_details (); + + ACE_NEW (this->pd_ev, + AST_ExprValue); + + this->pd_ev->et = EV_fixed; + this->pd_ev->u.fixedval = f; +} + AST_Expression::~AST_Expression (void) { } @@ -606,14 +624,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, ev->u.sval = (short) ev->u.oval; ev->et = AST_Expression::EV_short; return ev; - case AST_Expression::EV_longdouble: - case AST_Expression::EV_string: - case AST_Expression::EV_wstring: - case AST_Expression::EV_enum: - case AST_Expression::EV_void: - case AST_Expression::EV_none: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } case AST_Expression::EV_ushort: @@ -709,14 +720,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, ev->u.usval = (unsigned short) ev->u.oval; ev->et = AST_Expression::EV_ushort; return ev; - case AST_Expression::EV_longdouble: - case AST_Expression::EV_wstring: - case AST_Expression::EV_string: - case AST_Expression::EV_enum: - case AST_Expression::EV_void: - case AST_Expression::EV_none: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } case AST_Expression::EV_long: @@ -795,14 +799,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, ev->u.lval = (long) ev->u.oval; ev->et = AST_Expression::EV_long; return ev; - case AST_Expression::EV_longdouble: - case AST_Expression::EV_wstring: - case AST_Expression::EV_string: - case AST_Expression::EV_enum: - case AST_Expression::EV_void: - case AST_Expression::EV_none: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } case AST_Expression::EV_ulong: @@ -891,14 +888,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, ev->u.ulval = (unsigned long) ev->u.oval; ev->et = AST_Expression::EV_ulong; return ev; - case AST_Expression::EV_longdouble: - case AST_Expression::EV_wstring: - case AST_Expression::EV_string: - case AST_Expression::EV_enum: - case AST_Expression::EV_void: - case AST_Expression::EV_none: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } case AST_Expression::EV_longlong: @@ -968,14 +958,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, ev->u.llval = (ACE_CDR::LongLong) ev->u.oval; ev->et = AST_Expression::EV_longlong; return ev; - case AST_Expression::EV_longdouble: - case AST_Expression::EV_wstring: - case AST_Expression::EV_string: - case AST_Expression::EV_enum: - case AST_Expression::EV_void: - case AST_Expression::EV_none: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } case AST_Expression::EV_ulonglong: @@ -1062,14 +1045,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, ev->u.ullval = ev->u.oval; ev->et = AST_Expression::EV_ulonglong; return ev; - case AST_Expression::EV_longdouble: - case AST_Expression::EV_wstring: - case AST_Expression::EV_string: - case AST_Expression::EV_enum: - case AST_Expression::EV_void: - case AST_Expression::EV_none: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } case AST_Expression::EV_bool: @@ -1121,14 +1097,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, ev->u.bval = (ev->u.oval == 0) ? false : true; ev->et = AST_Expression::EV_bool; return ev; - case AST_Expression::EV_longdouble: - case AST_Expression::EV_wstring: - case AST_Expression::EV_string: - case AST_Expression::EV_enum: - case AST_Expression::EV_void: - case AST_Expression::EV_none: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } case AST_Expression::EV_float: @@ -1191,14 +1160,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, ev->u.fval = (float) ev->u.oval; ev->et = AST_Expression::EV_float; return ev; - case AST_Expression::EV_longdouble: - case AST_Expression::EV_wstring: - case AST_Expression::EV_string: - case AST_Expression::EV_enum: - case AST_Expression::EV_void: - case AST_Expression::EV_none: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } case AST_Expression::EV_double: @@ -1257,14 +1219,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, ev->u.dval = (double) ev->u.oval; ev->et = AST_Expression::EV_double; return ev; - case AST_Expression::EV_longdouble: - case AST_Expression::EV_wstring: - case AST_Expression::EV_string: - case AST_Expression::EV_enum: - case AST_Expression::EV_void: - case AST_Expression::EV_none: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } case AST_Expression::EV_char: @@ -1371,14 +1326,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, ev->u.cval = (char) ev->u.oval; ev->et = AST_Expression::EV_char; return ev; - case AST_Expression::EV_longdouble: - case AST_Expression::EV_wstring: - case AST_Expression::EV_string: - case AST_Expression::EV_enum: - case AST_Expression::EV_void: - case AST_Expression::EV_none: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } case AST_Expression::EV_wchar: @@ -1474,14 +1422,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, ev->u.wcval = (ACE_CDR::WChar) ev->u.oval; ev->et = AST_Expression::EV_wchar; return ev; - case AST_Expression::EV_longdouble: - case AST_Expression::EV_wstring: - case AST_Expression::EV_string: - case AST_Expression::EV_enum: - case AST_Expression::EV_void: - case AST_Expression::EV_none: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } case AST_Expression::EV_octet: @@ -1588,14 +1529,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, return ev; case AST_Expression::EV_octet: return ev; - case AST_Expression::EV_longdouble: - case AST_Expression::EV_wstring: - case AST_Expression::EV_string: - case AST_Expression::EV_enum: - case AST_Expression::EV_void: - case AST_Expression::EV_none: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } case AST_Expression::EV_enum: @@ -1625,10 +1559,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev, default: return 0; } - case AST_Expression::EV_longdouble: - case AST_Expression::EV_wstring: - case AST_Expression::EV_any: - case AST_Expression::EV_object: + default: return 0; } @@ -2871,6 +2802,8 @@ AST_Expression::operator== (AST_Expression *vc) return pd_ev->u.llval == vc->ev ()->u.llval ? true : false; case EV_ulonglong: return pd_ev->u.ullval == vc->ev()->u.ullval ? true : false; + case EV_fixed: + return pd_ev->u.fixedval == vc->ev()->u.fixedval; case EV_longdouble: case EV_wstring: case EV_enum: @@ -2952,6 +2885,8 @@ AST_Expression::compare (AST_Expression *vc) return this->pd_ev->u.llval == vc->ev ()->u.llval ? true : false; case EV_ulonglong: return this->pd_ev->u.ullval == vc->ev ()->u.ullval ? true : false; + case EV_fixed: + return this->pd_ev->u.fixedval == vc->ev ()->u.fixedval; case EV_longdouble: case EV_wstring: case EV_enum: @@ -3052,9 +2987,12 @@ dump_expr_val (ACE_OSTREAM_TYPE &o, case AST_Expression::EV_longlong: // o << ev->u.llval; break; - case AST_Expression::EV_ulonglong: + case AST_Expression::EV_ulonglong: // o << ev->u.ullval; break; + case AST_Expression::EV_fixed: + o << ev->u.fixedval; + break; case AST_Expression::EV_longdouble: case AST_Expression::EV_wstring: case AST_Expression::EV_enum: diff --git a/TAO/TAO_IDL/ast/ast_fixed.cpp b/TAO/TAO_IDL/ast/ast_fixed.cpp new file mode 100644 index 00000000000..2e07452ee7a --- /dev/null +++ b/TAO/TAO_IDL/ast/ast_fixed.cpp @@ -0,0 +1,59 @@ +#include "ast_fixed.h" + +#include "ast_visitor.h" + +AST_Fixed::AST_Fixed (UTL_ScopedName *name, + AST_Expression *digits, + AST_Expression *scale) + : COMMON_Base (), + AST_Decl (AST_Decl::NT_fixed, name, true), + AST_Type (AST_Decl::NT_fixed, name), + AST_ConcreteType (AST_Decl::NT_fixed, name), + pd_digits (digits), + pd_scale (scale) +{ + pd_scale->evaluate (AST_Expression::EK_const); //TODO +} + +AST_Fixed::~AST_Fixed () +{ +} + +void AST_Fixed::dump (ACE_OSTREAM_TYPE &os) +{ + dump_i (os, "fixed <"); + pd_digits->dump (os); + dump_i (os, ", "); + pd_scale->dump (os); + dump_i (os, ">"); +} + +void AST_Fixed::destroy () +{ + pd_digits->destroy (); + delete pd_digits; + pd_digits = 0; + + pd_scale->destroy (); + delete pd_scale; + pd_scale = 0; + + AST_ConcreteType::destroy (); +} + +int AST_Fixed::ast_accept (ast_visitor *visitor) +{ + return visitor->visit_fixed (this); +} + +AST_Expression *AST_Fixed::digits () +{ + return pd_digits; +} + +AST_Expression *AST_Fixed::scale () +{ + return pd_scale; +} + +IMPL_NARROW_FROM_DECL(AST_Fixed) diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp index 94d2b85bf58..195fe037dd7 100644 --- a/TAO/TAO_IDL/ast/ast_generator.cpp +++ b/TAO/TAO_IDL/ast/ast_generator.cpp @@ -103,6 +103,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_native.h" #include "ast_factory.h" #include "ast_finder.h" +#include "ast_fixed.h" #include "utl_identifier.h" @@ -803,6 +804,17 @@ AST_Generator::create_expr (ACE_CDR::Double d) return retval; } +AST_Expression * +AST_Generator::create_expr (const ACE_CDR::Fixed &f) +{ + AST_Expression *retval = 0; + ACE_NEW_RETURN (retval, + AST_Expression (f), + 0); + + return retval; +} + AST_EnumVal * AST_Generator::create_enum_val (ACE_CDR::ULong v, UTL_ScopedName *n) @@ -894,6 +906,17 @@ AST_Generator::create_wstring (AST_Expression *ms) return retval; } +AST_Fixed * +AST_Generator::create_fixed (AST_Expression *digits, + AST_Expression *scale) +{ + Identifier id ("fixed"); + UTL_ScopedName name (&id, 0); + AST_Fixed *retval = 0; + ACE_NEW_RETURN (retval, AST_Fixed (&name, digits, scale), 0); + return retval; +} + AST_Typedef * AST_Generator::create_typedef (AST_Type *bt, UTL_ScopedName *n, diff --git a/TAO/TAO_IDL/ast/ast_visitor.cpp b/TAO/TAO_IDL/ast/ast_visitor.cpp index 70fdc7f9317..82a9b7b5b89 100644 --- a/TAO/TAO_IDL/ast/ast_visitor.cpp +++ b/TAO/TAO_IDL/ast/ast_visitor.cpp @@ -8,3 +8,8 @@ ast_visitor::ast_visitor (void) ast_visitor::~ast_visitor (void) { } + +int ast_visitor::visit_fixed (AST_Fixed *node) +{ + return 0; +} diff --git a/TAO/TAO_IDL/be/be_expression.cpp b/TAO/TAO_IDL/be/be_expression.cpp index d6bb5291280..ea5be92eff2 100644 --- a/TAO/TAO_IDL/be/be_expression.cpp +++ b/TAO/TAO_IDL/be/be_expression.cpp @@ -90,6 +90,11 @@ be_expression::be_expression (ACE_CDR::Double d) { } +be_expression::be_expression (const ACE_CDR::Fixed &f) + : AST_Expression (f) +{ +} + int be_expression::accept (be_visitor *visitor) { diff --git a/TAO/TAO_IDL/be/be_fixed.cpp b/TAO/TAO_IDL/be/be_fixed.cpp new file mode 100644 index 00000000000..e4657b0e038 --- /dev/null +++ b/TAO/TAO_IDL/be/be_fixed.cpp @@ -0,0 +1,28 @@ +#include "be_fixed.h" +#include "be_visitor.h" + + +be_fixed::be_fixed (UTL_ScopedName *name, + AST_Expression *digits, + AST_Expression *scale) + : COMMON_Base (), + AST_Decl (AST_Decl::NT_fixed, name, true), + AST_Type (AST_Decl::NT_fixed,name), + AST_ConcreteType (AST_Decl::NT_fixed, name), + AST_Fixed (name, digits, scale), + be_decl (AST_Decl::NT_fixed, name), + be_type (AST_Decl::NT_fixed, name) +{} + +int be_fixed::accept (be_visitor *visitor) +{ + return visitor->visit_fixed (this); +} + +void be_fixed::destroy () +{ + be_type::destroy (); + AST_Fixed::destroy (); +} + +IMPL_NARROW_FROM_DECL (be_fixed) diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp index e3ad62f4899..c55a98046d6 100644 --- a/TAO/TAO_IDL/be/be_generator.cpp +++ b/TAO/TAO_IDL/be/be_generator.cpp @@ -111,6 +111,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "be_string.h" #include "be_typedef.h" #include "be_native.h" +#include "be_fixed.h" #include "be_factory.h" #include "be_finder.h" #include "utl_identifier.h" @@ -819,6 +820,17 @@ be_generator::create_expr (ACE_CDR::Double d) return retval; } +AST_Expression * +be_generator::create_expr (const ACE_CDR::Fixed &f) +{ + be_expression *retval = 0; + ACE_NEW_RETURN (retval, + be_expression (f), + 0); + + return retval; +} + AST_EnumVal * be_generator::create_enum_val (ACE_CDR::ULong v, UTL_ScopedName *n) @@ -911,6 +923,17 @@ be_generator::create_wstring (AST_Expression *v) return retval; } +AST_Fixed * +be_generator::create_fixed (AST_Expression *digits, + AST_Expression *scale) +{ + Identifier id ("fixed"); + UTL_ScopedName name (&id, 0); + AST_Fixed *retval = 0; + ACE_NEW_RETURN (retval, be_fixed (&name, digits, scale), 0); + return retval; +} + AST_Typedef * be_generator::create_typedef (AST_Type *bt, UTL_ScopedName *n, diff --git a/TAO/TAO_IDL/be/be_visitor.cpp b/TAO/TAO_IDL/be/be_visitor.cpp index 7a0af9fdfe4..1377ed76eff 100644 --- a/TAO/TAO_IDL/be/be_visitor.cpp +++ b/TAO/TAO_IDL/be/be_visitor.cpp @@ -330,3 +330,8 @@ be_visitor::visit_native (be_native *) return 0; } +int +be_visitor::visit_fixed (be_fixed *) +{ + return 0; +} diff --git a/TAO/TAO_IDL/be_include/be_expression.h b/TAO/TAO_IDL/be_include/be_expression.h index 9ffcf5aee56..b80471cda85 100644 --- a/TAO/TAO_IDL/be_include/be_expression.h +++ b/TAO/TAO_IDL/be_include/be_expression.h @@ -54,6 +54,8 @@ public: be_expression (ACE_CDR::Double d); + be_expression (const ACE_CDR::Fixed &f); + // Visiting. virtual int accept (be_visitor *visitor); }; diff --git a/TAO/TAO_IDL/be_include/be_fixed.h b/TAO/TAO_IDL/be_include/be_fixed.h new file mode 100644 index 00000000000..7f9936c8b7d --- /dev/null +++ b/TAO/TAO_IDL/be_include/be_fixed.h @@ -0,0 +1,24 @@ +#ifndef BE_FIXED_H +#define BE_FIXED_H + +#include "ast_fixed.h" +#include "be_type.h" + +class AST_Expression; +class be_visitor; + +class be_fixed : public virtual AST_Fixed, public virtual be_type +{ +public: + be_fixed (UTL_ScopedName *name, + AST_Expression *digits, + AST_Expression *scale); + + virtual int accept (be_visitor *visitor); + + virtual void destroy (); + + DEF_NARROW_FROM_DECL (be_fixed); +}; + +#endif diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h index b6b1ed03ecb..9fcdcbab9f8 100644 --- a/TAO/TAO_IDL/be_include/be_generator.h +++ b/TAO/TAO_IDL/be_include/be_generator.h @@ -239,6 +239,8 @@ public: virtual AST_Expression *create_expr (ACE_CDR::Double d); + virtual AST_Expression *create_expr (const ACE_CDR::Fixed &f); + virtual AST_EnumVal *create_enum_val (ACE_CDR::ULong v, UTL_ScopedName *n); @@ -258,6 +260,9 @@ public: virtual AST_String *create_wstring (AST_Expression *v); + virtual AST_Fixed *create_fixed (AST_Expression *digits, + AST_Expression *scale); + virtual AST_Typedef *create_typedef (AST_Type *bt, UTL_ScopedName *n, bool is_local, diff --git a/TAO/TAO_IDL/be_include/be_visitor.h b/TAO/TAO_IDL/be_include/be_visitor.h index e467d8abb67..e6ec9470ee7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor.h +++ b/TAO/TAO_IDL/be_include/be_visitor.h @@ -66,6 +66,7 @@ class be_string; class be_typedef; class be_root; class be_native; +class be_fixed; class be_param_holder; class be_visitor_context; @@ -137,6 +138,7 @@ public: virtual int visit_typedef (be_typedef *node); virtual int visit_root (be_root *node); virtual int visit_native (be_native *node); + virtual int visit_fixed (be_fixed *node); protected: // Not abstract but we want to force subclassing anyway. diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp index f1cd561f3b9..2deefd7aba6 100644 --- a/TAO/TAO_IDL/fe/fe_lookup.cpp +++ b/TAO/TAO_IDL/fe/fe_lookup.cpp @@ -1,43 +1,13 @@ -// - #include "fe_private.h" #include "ace/OS_NS_string.h" /* C++ code produced by gperf version 2.8 (ACE version) */ -/* Command-line: ../../bin/ace_gperf -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_ -L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$ fe/keywords.dat */ +/* Command-line: /tao_builds/mitza/DOC_fixed/ACE/bin/ace_gperf -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_ -L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$ fe/keywords.dat */ unsigned int TAO_IDL_CPP_Keyword_Table::hash (const char *str, unsigned int len) { static const unsigned char asso_values[] = { -#if defined (ACE_MVS) - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 15, - 35, 65, 0, 0, 35, 5, 0, 60, 252, 252, - 252, 252, 252, 252, 252, 252, 0, 30, 0, 5, - 5, 20, 50, 40, 252, 252, 252, 252, 252, 252, - 252, 252, 20, 110, 0, 45, 35, 95, 55, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, -#else 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, @@ -51,9 +21,8 @@ TAO_IDL_CPP_Keyword_Table::hash (const char *str, unsigned int len) 0, 0, 35, 5, 0, 60, 252, 0, 30, 0, 5, 5, 20, 50, 40, 20, 110, 0, 45, 35, 95, 55, 252, 252, 252, 252, 252, 252, -#endif /* ACE_MVS */ }; - return len + asso_values[(int) str[1]] + asso_values[(int) str[0]] + asso_values[(int) str[len - 1]]; + return len + asso_values[static_cast<int>(str[1])] + asso_values[static_cast<int>(str[0])] + asso_values[static_cast<int>(str[len - 1])]; } const struct TAO_IDL_CPP_Keyword_Entry * @@ -71,7 +40,7 @@ TAO_IDL_CPP_Keyword_Table::lookup (const char *str, unsigned int len) WORDLIST_SIZE = 80 }; - static const struct TAO_IDL_CPP_Keyword_Entry wordlist[] = + static const struct TAO_IDL_CPP_Keyword_Entry wordlist[] = { {"",0},{"",0},{"",0},{"",0},{"",0},{"",0}, {"delete", "_cxx_delete"}, diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index 90dfd63f5b0..de6944ca636 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -243,9 +243,7 @@ oneway return IDL_ONEWAY; } "-"?(([0-9]+"."[0-9]*)|("."?[0-9]+))[dD] { - ACE_NEW_RETURN (tao_yylval.sval, - UTL_String (ace_yytext, true), - IDL_FIXED_PT_LITERAL); + tao_yylval.fixval = ACE_CDR::Fixed::from_string (ace_yytext); return IDL_FIXED_PT_LITERAL; } diff --git a/TAO/TAO_IDL/fe/idl.tab.cpp b/TAO/TAO_IDL/fe/idl.tab.cpp index 4635a6d9bb0..153137294d6 100644 --- a/TAO/TAO_IDL/fe/idl.tab.cpp +++ b/TAO/TAO_IDL/fe/idl.tab.cpp @@ -88,6 +88,7 @@ #include "ast_array.h" #include "ast_attribute.h" #include "ast_field.h" +#include "ast_fixed.h" #include "ast_expression.h" #include "ast_operation.h" #include "ast_generator.h" @@ -146,7 +147,7 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none; // Force the pretty debugging code to compile. #define TAO_YYDEBUG 1 -#line 150 "fe/idl.tab.cpp" /* yacc.c:339 */ +#line 151 "fe/idl.tab.cpp" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -272,7 +273,7 @@ extern int tao_yydebug; typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 153 "fe/idl.ypp" /* yacc.c:355 */ +#line 154 "fe/idl.ypp" /* yacc.c:355 */ AST_Decl *dcval; /* Decl value */ UTL_StrList *slval; /* String list */ @@ -299,6 +300,7 @@ union YYSTYPE ACE_CDR::Float fval; /* Float value */ ACE_CDR::Char cval; /* Char value */ ACE_CDR::WChar wcval; /* WChar value */ + ACE_CDR::Fixed fixval; /* Fixed point value */ UTL_String *sval; /* String value */ char *wsval; /* WString value */ char *strval; /* char * value */ @@ -309,7 +311,7 @@ union YYSTYPE FE_Utils::T_PARAMLIST_INFO *plval; /* List of template params */ FE_Utils::T_ARGLIST *alval; /* List of template args */ -#line 313 "fe/idl.tab.cpp" /* yacc.c:355 */ +#line 315 "fe/idl.tab.cpp" /* yacc.c:355 */ }; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 @@ -324,7 +326,7 @@ int tao_yyparse (void); /* Copy the second part of user declarations. */ -#line 328 "fe/idl.tab.cpp" /* yacc.c:358 */ +#line 330 "fe/idl.tab.cpp" /* yacc.c:358 */ #ifdef short # undef short @@ -566,16 +568,16 @@ union yyalloc /* YYFINAL -- State number of the termination state. */ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1338 +#define YYLAST 1339 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 107 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 382 /* YYNRULES -- Number of rules. */ -#define YYNRULES 566 +#define YYNRULES 567 /* YYNSTATES -- Number of states. */ -#define YYNSTATES 816 +#define YYNSTATES 817 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned by yylex, with out-of-bounds checking. */ @@ -630,63 +632,63 @@ static const yytype_uint8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 359, 359, 362, 363, 367, 370, 373, 379, 384, - 383, 394, 393, 404, 403, 414, 413, 424, 423, 434, - 433, 444, 443, 454, 453, 464, 463, 474, 473, 484, - 483, 494, 493, 504, 503, 514, 513, 528, 527, 540, - 579, 584, 539, 601, 609, 624, 634, 665, 669, 608, - 693, 697, 698, 702, 703, 708, 714, 707, 802, 808, - 801, 879, 880, 885, 924, 929, 884, 947, 946, 960, - 998, 1029, 1063, 1062, 1074, 1081, 1082, 1083, 1084, 1088, - 1099, 1104, 1148, 1153, 1103, 1182, 1226, 1231, 1180, 1250, - 1248, 1290, 1289, 1303, 1309, 1316, 1323, 1330, 1356, 1383, - 1448, 1449, 1453, 1454, 1455, 1461, 1460, 1471, 1470, 1483, - 1484, 1489, 1488, 1499, 1498, 1509, 1508, 1519, 1518, 1529, - 1528, 1539, 1538, 1549, 1548, 1559, 1558, 1572, 1585, 1583, - 1611, 1618, 1629, 1628, 1656, 1654, 1681, 1693, 1739, 1767, - 1798, 1803, 1808, 1813, 1797, 1884, 1885, 1886, 1887, 1888, - 1889, 1890, 1902, 1907, 1976, 1978, 1980, 1981, 1995, 1996, - 2010, 2011, 2024, 2025, 2035, 2048, 2049, 2059, 2072, 2073, - 2083, 2093, 2106, 2107, 2117, 2127, 2140, 2191, 2192, 2201, - 2206, 2212, 2220, 2225, 2230, 2236, 2241, 2246, 2254, 2326, - 2325, 2336, 2341, 2346, 2351, 2378, 2387, 2386, 2458, 2459, - 2463, 2471, 2472, 2500, 2501, 2502, 2503, 2504, 2505, 2506, - 2507, 2511, 2512, 2513, 2514, 2518, 2519, 2520, 2524, 2525, - 2529, 2542, 2540, 2568, 2575, 2576, 2580, 2593, 2591, 2619, - 2626, 2643, 2662, 2663, 2667, 2672, 2677, 2685, 2690, 2695, - 2703, 2708, 2713, 2721, 2729, 2734, 2742, 2750, 2758, 2766, - 2775, 2774, 2790, 2824, 2829, 2789, 2848, 2851, 2852, 2856, - 2856, 2866, 2871, 2865, 2934, 2933, 2948, 2947, 2962, 2967, - 3003, 3008, 3070, 3075, 2961, 3099, 3107, 3121, 3131, 3139, - 3140, 3248, 3251, 3252, 3257, 3262, 3256, 3298, 3297, 3311, - 3322, 3342, 3350, 3349, 3365, 3370, 3364, 3387, 3386, 3439, - 3463, 3488, 3493, 3526, 3531, 3487, 3557, 3562, 3560, 3567, - 3571, 3608, 3613, 3606, 3694, 3755, 3765, 3754, 3778, 3787, - 3792, 3785, 3839, 3865, 3875, 3880, 3873, 3916, 3941, 3950, - 3949, 3991, 4002, 4022, 4030, 4035, 4029, 4097, 4098, 4103, - 4108, 4113, 4118, 4102, 4187, 4192, 4197, 4202, 4186, 4280, - 4285, 4315, 4320, 4279, 4338, 4343, 4408, 4413, 4336, 4450, - 4456, 4463, 4470, 4471, 4483, 4489, 4531, 4482, 4553, 4552, - 4563, 4562, 4575, 4580, 4578, 4585, 4590, 4595, 4589, 4636, - 4635, 4646, 4645, 4658, 4663, 4661, 4668, 4673, 4678, 4672, - 4725, 4733, 4734, 4735, 4845, 4850, 4855, 4864, 4869, 4863, - 4881, 4889, 4894, 4888, 4906, 4914, 4919, 4913, 4931, 4939, - 4944, 4938, 4956, 4963, 4976, 4974, 5000, 5007, 5036, 5074, - 5075, 5079, 5109, 5149, 5154, 5108, 5173, 5178, 5171, 5221, - 5220, 5231, 5238, 5239, 5244, 5243, 5254, 5253, 5264, 5263, - 5274, 5273, 5284, 5283, 5294, 5293, 5304, 5303, 5315, 5406, - 5413, 5439, 5546, 5556, 5562, 5568, 5641, 5714, 5789, 5788, - 5838, 5843, 5848, 5853, 5858, 5863, 5837, 5918, 5917, 5928, - 5935, 5942, 5950, 5955, 5949, 5967, 5968, 5972, 5974, 5973, - 5984, 5983, 5998, 6022, 5996, 6050, 6078, 6048, 6104, 6105, - 6106, 6110, 6111, 6115, 6143, 6174, 6219, 6224, 6172, 6241, - 6251, 6270, 6282, 6281, 6321, 6371, 6376, 6319, 6393, 6398, - 6406, 6411, 6416, 6421, 6426, 6431, 6436, 6441, 6446, 6451, - 6460, 6495, 6494, 6516, 6523, 6549, 6567, 6578, 6598, 6605, - 6616, 6621, 6640, 6645, 6615, 6660, 6667, 6672, 6679, 6678, - 6687, 6686, 6695, 6694, 6706, 6776, 6827, 6843, 6857, 6864, - 6924, 6929, 6934, 6928, 6995, 7000, 6994, 7015, 7016, 7021, - 7020, 7031, 7030, 7041, 7040, 7051, 7050 + 0, 361, 361, 364, 365, 369, 372, 375, 381, 386, + 385, 396, 395, 406, 405, 416, 415, 426, 425, 436, + 435, 446, 445, 456, 455, 466, 465, 476, 475, 486, + 485, 496, 495, 506, 505, 516, 515, 530, 529, 542, + 581, 586, 541, 603, 611, 626, 636, 667, 671, 610, + 695, 699, 700, 704, 705, 710, 716, 709, 804, 810, + 803, 881, 882, 887, 926, 931, 886, 949, 948, 962, + 1000, 1031, 1065, 1064, 1076, 1083, 1084, 1085, 1086, 1090, + 1101, 1106, 1150, 1155, 1105, 1184, 1228, 1233, 1182, 1252, + 1250, 1292, 1291, 1305, 1311, 1318, 1325, 1332, 1358, 1385, + 1450, 1451, 1455, 1456, 1457, 1463, 1462, 1473, 1472, 1485, + 1486, 1491, 1490, 1501, 1500, 1511, 1510, 1521, 1520, 1531, + 1530, 1541, 1540, 1551, 1550, 1561, 1560, 1574, 1587, 1585, + 1613, 1620, 1631, 1630, 1658, 1656, 1683, 1695, 1741, 1769, + 1800, 1805, 1810, 1815, 1799, 1886, 1887, 1888, 1889, 1890, + 1891, 1892, 1904, 1909, 1978, 1980, 1982, 1983, 1997, 1998, + 2012, 2013, 2026, 2027, 2037, 2050, 2051, 2061, 2074, 2075, + 2085, 2095, 2108, 2109, 2119, 2129, 2142, 2193, 2194, 2203, + 2208, 2214, 2222, 2227, 2232, 2238, 2242, 2247, 2252, 2260, + 2332, 2331, 2342, 2347, 2352, 2357, 2384, 2393, 2392, 2464, + 2465, 2469, 2477, 2478, 2506, 2507, 2508, 2509, 2510, 2511, + 2512, 2513, 2517, 2518, 2519, 2520, 2524, 2525, 2526, 2530, + 2531, 2535, 2548, 2546, 2574, 2581, 2582, 2586, 2599, 2597, + 2625, 2632, 2649, 2668, 2669, 2673, 2678, 2683, 2691, 2696, + 2701, 2709, 2714, 2719, 2727, 2735, 2740, 2748, 2756, 2764, + 2772, 2781, 2780, 2796, 2830, 2835, 2795, 2854, 2857, 2858, + 2862, 2862, 2872, 2877, 2871, 2940, 2939, 2954, 2953, 2968, + 2973, 3009, 3014, 3076, 3081, 2967, 3105, 3113, 3127, 3137, + 3145, 3146, 3254, 3257, 3258, 3263, 3268, 3262, 3304, 3303, + 3317, 3328, 3348, 3356, 3355, 3371, 3376, 3370, 3393, 3392, + 3445, 3469, 3494, 3499, 3532, 3537, 3493, 3563, 3568, 3566, + 3573, 3577, 3614, 3619, 3612, 3700, 3761, 3771, 3760, 3784, + 3793, 3798, 3791, 3845, 3871, 3881, 3886, 3879, 3922, 3947, + 3956, 3955, 3997, 4008, 4028, 4036, 4041, 4035, 4103, 4104, + 4109, 4114, 4119, 4124, 4108, 4193, 4198, 4203, 4208, 4192, + 4286, 4291, 4321, 4326, 4285, 4344, 4349, 4414, 4419, 4342, + 4456, 4462, 4469, 4476, 4477, 4489, 4495, 4537, 4488, 4559, + 4558, 4569, 4568, 4581, 4586, 4584, 4591, 4596, 4601, 4595, + 4642, 4641, 4652, 4651, 4664, 4669, 4667, 4674, 4679, 4684, + 4678, 4731, 4739, 4740, 4741, 4851, 4856, 4861, 4870, 4875, + 4869, 4887, 4895, 4900, 4894, 4912, 4920, 4925, 4919, 4937, + 4945, 4950, 4944, 4962, 4969, 4982, 4980, 5006, 5013, 5042, + 5080, 5081, 5085, 5115, 5155, 5160, 5114, 5179, 5184, 5177, + 5227, 5226, 5237, 5244, 5245, 5250, 5249, 5260, 5259, 5270, + 5269, 5280, 5279, 5290, 5289, 5300, 5299, 5310, 5309, 5321, + 5412, 5419, 5445, 5552, 5562, 5568, 5574, 5647, 5720, 5795, + 5794, 5844, 5849, 5854, 5859, 5864, 5869, 5843, 5924, 5923, + 5934, 5941, 5948, 5956, 5961, 5955, 5973, 5974, 5978, 5980, + 5979, 5990, 5989, 6004, 6028, 6002, 6056, 6084, 6054, 6110, + 6111, 6112, 6116, 6117, 6121, 6149, 6180, 6225, 6230, 6178, + 6247, 6257, 6276, 6288, 6287, 6327, 6377, 6382, 6325, 6399, + 6404, 6412, 6417, 6422, 6427, 6432, 6437, 6442, 6447, 6452, + 6457, 6466, 6501, 6500, 6522, 6529, 6555, 6573, 6584, 6604, + 6611, 6622, 6627, 6646, 6651, 6621, 6666, 6673, 6678, 6685, + 6684, 6693, 6692, 6701, 6700, 6712, 6782, 6833, 6849, 6863, + 6870, 6930, 6935, 6940, 6934, 7001, 7006, 7000, 7021, 7022, + 7027, 7026, 7037, 7036, 7047, 7046, 7057, 7056 }; #endif @@ -816,12 +818,12 @@ static const yytype_uint16 yytoknum[] = }; # endif -#define YYPACT_NINF -568 +#define YYPACT_NINF -589 #define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-568))) + (!!((Yystate) == (-589))) -#define YYTABLE_NINF -507 +#define YYTABLE_NINF -508 #define yytable_value_is_error(Yytable_value) \ 0 @@ -830,88 +832,88 @@ static const yytype_uint16 yytoknum[] = STATE-NUM. */ static const yytype_int16 yypact[] = { - -568, 101, 1189, -568, -568, -568, -568, -568, -568, -568, - -568, -568, -568, 34, 39, 55, 98, -568, 34, 34, - -568, 37, 37, -568, -568, -568, -568, -21, -568, 631, - 12, 43, -568, -568, 14, -568, -568, -568, -568, -568, - -568, 170, -568, -568, -568, -568, -568, -568, 54, -568, - 126, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -568, -568, -568, -568, -568, -568, -568, -568, -568, 77, - -568, -568, -568, 77, -568, -568, 90, 119, 286, 37, - 34, 580, 34, 34, 34, 34, -568, -568, -568, 69, - 34, 72, -568, 106, 34, -568, 77, 34, 128, 131, - 34, -568, 16, -568, 75, 209, 222, -568, 140, 143, - 1158, 36, -568, -568, 158, 212, -568, 189, 202, 203, - 44, -568, 67, -568, -568, -568, -568, -568, -568, 220, - -568, -568, -568, -568, -568, -568, 232, -568, -568, -568, - -568, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -568, -568, -568, -568, 126, -568, -568, -568, 84, -568, - -568, 229, -568, 249, 253, 255, 262, -568, 264, 265, - 266, 267, 268, 270, 271, 273, -568, -568, -568, 274, - 275, -568, -568, -568, -568, 232, -568, -568, -568, -568, - -568, -568, -568, -568, -568, 232, -568, -568, -568, -568, - -568, -568, -568, -568, 279, -568, 277, -568, -568, 263, - -568, 34, -568, -568, -568, -568, -568, -568, -568, 286, - -568, -568, -568, -568, 287, -568, -568, -568, -568, 354, - -568, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -568, 51, 51, 51, 36, 232, -568, -568, 281, 291, - 293, 120, 122, 110, -568, -568, -568, 292, -568, -568, - -568, -568, -568, -568, -568, -568, -568, 385, -568, 36, - 306, 349, -568, -568, -568, -568, -568, -568, -568, 294, - -568, -568, -568, -568, -568, -568, -568, -568, -568, 349, - 312, 313, -568, -568, -568, 34, 34, 314, 315, -568, - -568, -568, 307, -568, 34, 316, 263, -568, -568, 401, - -568, 317, 318, -568, -568, -568, 301, 36, 36, 36, - 36, 36, 36, 36, 36, 36, 36, -568, 321, 37, - -568, -568, -568, -568, 322, -568, 37, -568, 36, 36, - 36, -568, -568, -568, -568, -568, -568, -568, 139, -568, - 303, -568, -568, -568, -568, -568, -568, -568, -568, 37, - 349, -568, -568, -568, -568, -568, 1267, -568, 319, -568, - -568, -568, 291, 293, 120, 122, 122, 110, 110, -568, - -568, -568, 34, 36, -568, 232, 1023, 777, 36, 223, - -568, -568, -568, -568, -568, -568, 254, 80, 360, 941, - -568, -568, -568, -568, 38, 357, 37, 37, -568, -568, - -568, -568, -568, 38, -568, 328, -568, 324, 325, 326, - 416, -568, 1058, 232, -568, 37, 349, 185, 334, 336, - 423, 345, 1158, -568, -568, 341, -568, -568, -568, 346, - -568, -568, -568, -568, -568, -568, 724, -568, -568, -568, - -568, -568, 347, -568, -568, -568, 350, 348, -568, 351, - 353, 359, 352, 356, -568, -568, -568, 429, 232, -568, - -568, -568, -568, -568, -568, 37, 37, 37, -568, 362, - -568, -568, -568, -568, -568, -568, -568, 34, 34, -568, - 363, -568, -568, -568, 1140, 859, 408, 311, -568, 232, - 34, -568, -568, 41, 62, 366, 369, 373, 34, 374, - -568, -568, -568, -568, -568, -568, -568, -568, -568, 375, - 377, 232, -568, -568, -568, -568, -568, -568, -568, -568, - -568, -568, -568, 380, -568, 381, 383, 384, 386, 387, - -568, 232, -568, -568, -568, -568, -568, 390, 391, 468, - 254, 254, -568, -568, -568, -568, -568, -568, -568, -568, - 393, 34, 382, 63, 63, 63, 399, -568, 402, 406, - 407, 410, 412, 413, -568, -568, -568, 414, 415, 418, - 419, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -568, 36, 36, 325, 34, 420, 411, 421, -568, 436, - 424, 428, 432, 427, 185, 1242, 37, -568, -568, -568, - -568, -568, -568, 516, -568, -568, -568, -568, -568, -568, - -568, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -568, -568, 430, 430, -568, -568, -568, -568, 311, 34, - -568, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -568, -568, -568, 37, -568, -568, -568, -568, 438, 232, - -568, 430, 444, 447, 500, -568, -568, -568, -568, -568, - 431, 416, 37, 232, 448, 441, -568, 435, -568, -568, - -568, 437, 504, 502, 502, 34, 487, 451, -568, -568, - 232, 455, -568, -568, 442, -568, 502, 45, -568, -568, - 443, -568, -568, -568, -568, -568, -568, -568, -568, 486, - 546, 449, 187, 502, -568, -568, -568, -568, -568, -568, - -568, -568, 311, -568, 462, 452, 502, 453, 495, 34, - 37, -568, -568, 469, -568, -568, -568, -568, -568, 454, - -568, -568, -568, 474, 36, 470, 475, 35, 580, 230, - -568, -568, -568, -568, -568, -568, -568, -568, 232, -568, - 473, -568, 476, 311, 523, -568, -568, -568, -568, -568, - -568, -568, -568, 34, 504, 37, 37, 463, 34, 546, - -568, -568, -568, -568, 478, 34, 481, -568, -568, 466, - 467, -568, -568, -568, 187, 34, 471, -568, -568, -568, - -568, -568, 37, -568, -568, -568, 472, 498, -568, -568, - 480, 483, -568, -568, 503, -568 + -589, 52, 1190, -589, -589, -589, -589, -589, -589, -589, + -589, -589, -589, 65, 86, 146, 12, -589, 65, 65, + -589, 37, 37, -589, -589, -589, -589, 9, -589, 534, + 54, 74, -589, -589, 56, -589, -589, -589, -589, -589, + -589, 167, -589, -589, -589, -589, -589, -589, 108, -589, + 82, -589, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589, -589, -589, -589, -589, -589, -589, -589, 58, + -589, -589, -589, 58, -589, -589, 69, 116, 200, 37, + 65, 312, 65, 65, 65, 65, -589, -589, -589, 64, + 65, 72, -589, 136, 65, -589, 58, 65, 138, 161, + 65, -589, 5, -589, 16, 252, 254, -589, 201, 216, + 632, 36, -589, -589, 228, 271, -589, 255, 261, 262, + 34, -589, 67, -589, -589, -589, -589, -589, -589, 263, + -589, -589, -589, -589, -589, -589, 269, -589, -589, -589, + -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589, -589, -589, 82, -589, -589, -589, 140, -589, + -589, 265, -589, 266, 267, 270, 272, -589, 274, 275, + 279, 282, 289, 291, 296, 301, -589, -589, -589, 304, + 305, -589, -589, -589, -589, 269, -589, -589, -589, -589, + -589, -589, -589, -589, -589, 269, -589, -589, -589, -589, + -589, -589, -589, -589, 306, -589, 307, -589, -589, 260, + -589, 65, -589, -589, -589, -589, -589, -589, -589, 200, + -589, -589, -589, -589, 268, -589, -589, -589, -589, 355, + -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589, 51, 51, 51, 36, 269, -589, -589, 302, + 303, 313, 91, 3, 105, -589, -589, -589, 309, -589, + -589, -589, -589, -589, -589, -589, -589, -589, 354, -589, + 36, 277, 350, -589, -589, -589, -589, -589, -589, -589, + 298, -589, -589, -589, -589, -589, -589, -589, -589, -589, + 350, 315, 321, -589, -589, -589, 65, 65, 323, 324, + -589, -589, -589, 322, -589, 65, 325, 260, -589, -589, + 411, -589, 326, 329, -589, -589, -589, 311, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, -589, 331, + 37, -589, -589, -589, -589, 333, -589, 37, -589, 36, + 36, 36, -589, -589, -589, -589, -589, -589, -589, 229, + -589, 328, -589, -589, -589, -589, -589, -589, -589, -589, + 37, 350, -589, -589, -589, -589, -589, 1268, -589, 327, + -589, -589, -589, 303, 313, 91, 3, 3, 105, 105, + -589, -589, -589, 65, 36, -589, 269, 1024, 778, 36, + 225, -589, -589, -589, -589, -589, -589, 253, 80, 413, + 942, -589, -589, -589, -589, 38, 360, 37, 37, -589, + -589, -589, -589, -589, 38, -589, 339, -589, 336, 330, + 338, 428, -589, 1059, 269, -589, 37, 350, 215, 346, + 348, 434, 351, 632, -589, -589, 353, -589, -589, -589, + 358, -589, -589, -589, -589, -589, -589, 581, -589, -589, + -589, -589, -589, 359, -589, -589, -589, 364, 361, -589, + 366, 370, 371, 378, 379, -589, -589, -589, 460, 269, + -589, -589, -589, -589, -589, -589, 37, 37, 37, -589, + 384, -589, -589, -589, -589, -589, -589, -589, 65, 65, + -589, 389, -589, -589, -589, 1141, 860, 452, 489, -589, + 269, 65, -589, -589, 41, 63, 398, 400, 403, 65, + 405, -589, -589, -589, -589, -589, -589, -589, -589, -589, + 397, 406, 269, -589, -589, -589, -589, -589, -589, -589, + -589, -589, -589, -589, 407, -589, 409, 423, 424, 425, + 426, -589, 269, -589, -589, -589, -589, -589, 427, 430, + 516, 253, 253, -589, -589, -589, -589, -589, -589, -589, + -589, 439, 65, 416, 70, 70, 70, 444, -589, 445, + 448, 449, 450, 451, 453, -589, -589, -589, 455, 456, + 457, 458, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589, 36, 36, 330, 65, 459, 464, 462, -589, + 477, 473, 474, 476, 475, 215, 1243, 37, -589, -589, + -589, -589, -589, -589, 541, -589, -589, -589, -589, -589, + -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589, -589, 461, 461, -589, -589, -589, -589, 489, + 65, -589, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589, -589, -589, 37, -589, -589, -589, -589, 480, + 269, -589, 461, 481, 482, 513, -589, -589, -589, -589, + -589, 465, 428, 37, 269, 484, 399, -589, 471, -589, + -589, -589, 472, 533, 537, 537, 65, 522, 486, -589, + -589, 269, 490, -589, -589, 498, -589, 537, 168, -589, + -589, 499, -589, -589, -589, -589, -589, -589, -589, -589, + 521, 578, 500, 264, 537, -589, -589, -589, -589, -589, + -589, -589, -589, 489, -589, 493, 483, 537, 502, 546, + 65, 37, -589, -589, 519, -589, -589, -589, -589, -589, + 506, -589, -589, -589, 525, 36, 526, 524, 35, 312, + 192, -589, -589, -589, -589, -589, -589, -589, -589, 269, + -589, 530, -589, 538, 489, 574, -589, -589, -589, -589, + -589, -589, -589, -589, 65, 533, 37, 37, 515, 65, + 578, -589, -589, -589, -589, 535, 65, 539, -589, -589, + 512, 527, -589, -589, -589, 264, 65, 529, -589, -589, + -589, -589, -589, 37, -589, -589, -589, 536, 554, -589, + -589, 540, 542, -589, -589, 558, -589 }; /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. @@ -919,176 +921,176 @@ static const yytype_int16 yypact[] = means the default is an error. */ static const yytype_uint16 yydefact[] = { - 4, 0, 0, 1, 35, 140, 37, 67, 189, 250, - 266, 301, 349, 0, 0, 0, 0, 91, 0, 0, - 460, 0, 0, 530, 551, 3, 5, 39, 21, 58, + 4, 0, 0, 1, 35, 140, 37, 67, 190, 251, + 267, 302, 350, 0, 0, 0, 0, 91, 0, 0, + 461, 0, 0, 531, 552, 3, 5, 39, 21, 58, 0, 0, 19, 61, 74, 63, 23, 75, 80, 76, - 81, 74, 77, 78, 62, 15, 9, 195, 252, 191, - 300, 192, 218, 219, 193, 17, 11, 13, 25, 420, - 419, 422, 27, 458, 29, 490, 492, 491, 489, 74, - 508, 509, 488, 74, 31, 33, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 136, 230, 194, 74, - 0, 74, 85, 74, 0, 79, 74, 0, 426, 501, + 81, 74, 77, 78, 62, 15, 9, 196, 253, 192, + 301, 193, 219, 220, 194, 17, 11, 13, 25, 421, + 420, 423, 27, 459, 29, 491, 493, 492, 490, 74, + 509, 510, 489, 74, 31, 33, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 136, 231, 195, 74, + 0, 74, 85, 74, 0, 79, 74, 0, 427, 502, 0, 132, 0, 131, 0, 0, 0, 43, 0, 0, 0, 0, 6, 7, 0, 94, 69, 0, 0, 0, - 234, 236, 0, 240, 241, 244, 245, 246, 247, 243, - 248, 249, 315, 323, 328, 89, 202, 99, 198, 200, - 201, 199, 203, 232, 233, 204, 208, 205, 207, 206, - 209, 210, 252, 215, 0, 216, 217, 211, 0, 214, - 212, 322, 213, 327, 0, 0, 0, 268, 0, 0, - 0, 0, 0, 0, 0, 0, 502, 495, 504, 0, - 0, 554, 550, 36, 243, 153, 141, 145, 149, 150, - 146, 147, 148, 151, 152, 38, 68, 190, 196, 251, - 267, 302, 350, 70, 499, 71, 0, 500, 92, 431, - 461, 0, 417, 134, 418, 531, 552, 40, 22, 0, - 515, 511, 512, 517, 514, 518, 516, 513, 510, 0, - 45, 523, 179, 180, 181, 183, 185, 186, 187, 184, - 182, 0, 0, 0, 0, 176, 549, 154, 155, 156, - 158, 160, 162, 165, 168, 172, 177, 0, 548, 20, - 93, 72, 64, 24, 82, 235, 242, 237, 239, 0, - 0, 96, 314, 311, 319, 324, 16, 10, 253, 0, - 18, 12, 14, 26, 423, 28, 472, 459, 30, 96, - 0, 0, 32, 34, 558, 0, 0, 0, 0, 86, - 429, 427, 469, 133, 0, 0, 431, 4, 519, 0, - 524, 0, 520, 173, 174, 175, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 59, 546, 0, - 110, 101, 238, 188, 0, 316, 0, 90, 0, 0, - 0, 259, 269, 433, 476, 503, 496, 505, 555, 142, - 230, 197, 223, 224, 225, 231, 303, 351, 110, 0, - 96, 467, 462, 135, 532, 553, 0, 41, 0, 46, - 521, 178, 157, 159, 161, 163, 164, 166, 167, 169, - 170, 171, 0, 0, 73, 130, 0, 0, 0, 0, - 95, 312, 320, 325, 254, 258, 0, 0, 424, 0, - 110, 101, 339, 344, 0, 454, 0, 0, 563, 337, - 338, 559, 561, 0, 565, 0, 557, 0, 0, 220, - 0, 258, 0, 430, 428, 0, 96, 0, 3, 0, - 0, 0, 0, 60, 547, 127, 125, 359, 360, 0, - 109, 117, 111, 121, 119, 123, 0, 113, 115, 364, - 107, 105, 0, 100, 102, 103, 0, 0, 317, 0, - 0, 0, 0, 259, 264, 261, 260, 234, 280, 275, - 276, 277, 278, 270, 279, 0, 0, 0, 444, 0, - 432, 434, 436, 438, 440, 442, 446, 0, 0, 477, - 0, 475, 478, 480, 0, 0, 0, 0, 450, 449, - 0, 453, 452, 0, 0, 0, 0, 0, 0, 0, - 556, 143, 334, 330, 333, 221, 310, 304, 309, 259, - 0, 468, 463, 542, 538, 540, 533, 537, 42, 525, - 47, 522, 128, 0, 66, 0, 0, 0, 0, 0, - 363, 393, 390, 391, 392, 354, 362, 0, 0, 0, - 0, 0, 84, 104, 318, 313, 321, 326, 255, 257, - 0, 0, 0, 0, 0, 0, 0, 425, 0, 0, - 0, 0, 0, 0, 482, 485, 474, 0, 0, 0, - 0, 340, 345, 448, 544, 545, 564, 560, 562, 451, - 566, 0, 0, 331, 0, 0, 306, 0, 88, 0, - 0, 0, 0, 0, 535, 0, 0, 126, 118, 112, - 122, 120, 124, 0, 114, 116, 365, 108, 106, 265, - 262, 271, 457, 455, 456, 445, 435, 437, 439, 441, - 443, 447, 0, 0, 479, 481, 498, 507, 0, 0, - 144, 335, 332, 222, 305, 307, 353, 464, 543, 539, - 541, 534, 536, 0, 53, 39, 48, 52, 0, 129, - 355, 0, 0, 0, 368, 483, 486, 341, 346, 229, - 0, 0, 0, 55, 0, 0, 54, 0, 366, 263, - 272, 0, 0, 400, 400, 0, 404, 226, 336, 308, - 465, 0, 49, 51, 381, 356, 400, 0, 369, 376, - 0, 375, 397, 484, 487, 342, 401, 347, 227, 471, - 0, 0, 0, 400, 367, 287, 294, 292, 273, 283, - 284, 291, 0, 371, 372, 0, 400, 0, 408, 0, - 0, 466, 529, 0, 528, 380, 394, 395, 396, 0, - 386, 387, 357, 0, 0, 0, 0, 0, 0, 289, - 377, 373, 398, 343, 402, 405, 348, 228, 470, 56, - 526, 382, 383, 0, 412, 288, 295, 293, 274, 282, - 297, 285, 290, 0, 0, 0, 0, 0, 0, 0, - 384, 388, 409, 358, 0, 0, 0, 378, 374, 0, - 0, 406, 57, 527, 0, 0, 0, 296, 298, 286, - 399, 403, 0, 385, 389, 410, 0, 0, 407, 416, - 0, 413, 411, 414, 0, 415 + 235, 237, 0, 241, 242, 245, 246, 247, 248, 244, + 249, 250, 316, 324, 329, 89, 203, 99, 199, 201, + 202, 200, 204, 233, 234, 205, 209, 206, 208, 207, + 210, 211, 253, 216, 0, 217, 218, 212, 0, 215, + 213, 323, 214, 328, 0, 0, 0, 269, 0, 0, + 0, 0, 0, 0, 0, 0, 503, 496, 505, 0, + 0, 555, 551, 36, 244, 153, 141, 145, 149, 150, + 146, 147, 148, 151, 152, 38, 68, 191, 197, 252, + 268, 303, 351, 70, 500, 71, 0, 501, 92, 432, + 462, 0, 418, 134, 419, 532, 553, 40, 22, 0, + 516, 512, 513, 518, 515, 519, 517, 514, 511, 0, + 45, 524, 179, 180, 181, 183, 186, 185, 187, 188, + 184, 182, 0, 0, 0, 0, 176, 550, 154, 155, + 156, 158, 160, 162, 165, 168, 172, 177, 0, 549, + 20, 93, 72, 64, 24, 82, 236, 243, 238, 240, + 0, 0, 96, 315, 312, 320, 325, 16, 10, 254, + 0, 18, 12, 14, 26, 424, 28, 473, 460, 30, + 96, 0, 0, 32, 34, 559, 0, 0, 0, 0, + 86, 430, 428, 470, 133, 0, 0, 432, 4, 520, + 0, 525, 0, 521, 173, 174, 175, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 59, 547, + 0, 110, 101, 239, 189, 0, 317, 0, 90, 0, + 0, 0, 260, 270, 434, 477, 504, 497, 506, 556, + 142, 231, 198, 224, 225, 226, 232, 304, 352, 110, + 0, 96, 468, 463, 135, 533, 554, 0, 41, 0, + 46, 522, 178, 157, 159, 161, 163, 164, 166, 167, + 169, 170, 171, 0, 0, 73, 130, 0, 0, 0, + 0, 95, 313, 321, 326, 255, 259, 0, 0, 425, + 0, 110, 101, 340, 345, 0, 455, 0, 0, 564, + 338, 339, 560, 562, 0, 566, 0, 558, 0, 0, + 221, 0, 259, 0, 431, 429, 0, 96, 0, 3, + 0, 0, 0, 0, 60, 548, 127, 125, 360, 361, + 0, 109, 117, 111, 121, 119, 123, 0, 113, 115, + 365, 107, 105, 0, 100, 102, 103, 0, 0, 318, + 0, 0, 0, 0, 260, 265, 262, 261, 235, 281, + 276, 277, 278, 279, 271, 280, 0, 0, 0, 445, + 0, 433, 435, 437, 439, 441, 443, 447, 0, 0, + 478, 0, 476, 479, 481, 0, 0, 0, 0, 451, + 450, 0, 454, 453, 0, 0, 0, 0, 0, 0, + 0, 557, 143, 335, 331, 334, 222, 311, 305, 310, + 260, 0, 469, 464, 543, 539, 541, 534, 538, 42, + 526, 47, 523, 128, 0, 66, 0, 0, 0, 0, + 0, 364, 394, 391, 392, 393, 355, 363, 0, 0, + 0, 0, 0, 84, 104, 319, 314, 322, 327, 256, + 258, 0, 0, 0, 0, 0, 0, 0, 426, 0, + 0, 0, 0, 0, 0, 483, 486, 475, 0, 0, + 0, 0, 341, 346, 449, 545, 546, 565, 561, 563, + 452, 567, 0, 0, 332, 0, 0, 307, 0, 88, + 0, 0, 0, 0, 0, 536, 0, 0, 126, 118, + 112, 122, 120, 124, 0, 114, 116, 366, 108, 106, + 266, 263, 272, 458, 456, 457, 446, 436, 438, 440, + 442, 444, 448, 0, 0, 480, 482, 499, 508, 0, + 0, 144, 336, 333, 223, 306, 308, 354, 465, 544, + 540, 542, 535, 537, 0, 53, 39, 48, 52, 0, + 129, 356, 0, 0, 0, 369, 484, 487, 342, 347, + 230, 0, 0, 0, 55, 0, 0, 54, 0, 367, + 264, 273, 0, 0, 401, 401, 0, 405, 227, 337, + 309, 466, 0, 49, 51, 382, 357, 401, 0, 370, + 377, 0, 376, 398, 485, 488, 343, 402, 348, 228, + 472, 0, 0, 0, 401, 368, 288, 295, 293, 274, + 284, 285, 292, 0, 372, 373, 0, 401, 0, 409, + 0, 0, 467, 530, 0, 529, 381, 395, 396, 397, + 0, 387, 388, 358, 0, 0, 0, 0, 0, 0, + 290, 378, 374, 399, 344, 403, 406, 349, 229, 471, + 56, 527, 383, 384, 0, 413, 289, 296, 294, 275, + 283, 298, 286, 291, 0, 0, 0, 0, 0, 0, + 0, 385, 389, 410, 359, 0, 0, 0, 379, 375, + 0, 0, 407, 57, 528, 0, 0, 0, 297, 299, + 287, 400, 404, 0, 386, 390, 411, 0, 0, 408, + 417, 0, 414, 412, 415, 0, 416 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -568, -568, 272, 211, -568, -526, -568, -568, -568, -568, - -568, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -523, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -568, -568, -568, -568, -568, -95, -568, -568, -568, -568, - -568, -568, -568, -568, -568, -568, -568, 278, -568, -568, - 68, -568, -568, -568, 566, -568, -568, -568, -568, -568, - -568, -568, 570, -568, 300, -568, -568, -254, -568, -568, - 201, -568, -568, -568, -568, -315, -349, -568, -568, -568, - -568, -568, -568, -568, -568, -322, -568, -568, -19, -568, - -568, -13, -568, 8, -568, -568, -568, -568, 367, 19, - -102, -568, 290, 296, 289, 11, 25, -72, 65, -568, - -307, 13, -568, -568, -568, -33, 226, -417, -568, -568, - -568, 48, -568, -568, -567, -73, -568, -568, -12, -568, - -55, -568, -568, -48, -44, -54, -53, -52, -568, -568, - -30, -568, -28, -568, -568, -568, -568, 190, 276, -568, - -217, -568, -568, -568, -25, -568, -23, -568, -568, -568, - -568, -568, -568, -568, -568, -568, -131, -568, -568, -568, - -568, -568, -128, -568, -568, -568, -568, -568, -568, -568, - -34, -568, -568, -568, -568, -568, -568, -568, -47, -568, - -568, -568, -568, -568, -568, -568, -74, -568, -568, -568, - -66, -568, -568, -568, -568, -568, -568, -568, 32, -568, - -568, -320, -568, -568, -568, -568, -568, -568, -568, -568, - -568, -568, 15, -568, -568, -568, -568, -568, -568, -568, - -568, -568, -568, -568, -568, -568, -568, -568, -547, -568, - -568, -568, -568, -568, -146, -568, -568, -568, -568, -568, - -568, -568, -568, -165, -568, -568, -476, -568, -483, -568, - -568, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -568, -568, -568, 17, 18, -568, -568, -568, -568, -568, - -568, -568, -568, -568, 327, -568, -568, -568, -568, -568, - -568, -568, -568, -568, -568, -306, 217, -299, -568, -568, - -568, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -568, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -568, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -568, -568, -568, -568, -568, -568, -568, -568, -568, 558, - -568, -568, -568, -568, -568, -568, -568, -568, -568, -568, - 200, -568, -568, -143, -568, -568, -568, -568, -568, -568, - -568, 40, -568, -568, -568, 240, -568, -568, 256, -568, - -568, -568, -568, -568, -568, -568, -568, -568, -568, -568, - -568, -568 + -589, -589, 334, 278, -589, -569, -589, -589, -589, -589, + -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, + -528, -589, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589, -589, -589, -589, -39, -589, -589, -589, -589, + -589, -589, -589, -589, -589, -589, -589, 276, -589, -589, + 68, -589, -589, -589, 623, -589, -589, -589, -589, -589, + -589, -589, 626, -589, 280, -589, -589, -255, -589, -589, + 244, -589, -589, -589, -589, -316, -350, -589, -589, -589, + -589, -589, -589, -589, -589, -323, -589, -589, -19, -589, + -589, -13, -589, 8, -589, -589, -589, -589, 429, 55, + -102, -589, 332, 341, 343, -9, -7, -22, 66, -589, + -307, 13, -589, -589, -589, -33, 281, -416, -589, -589, + -589, 89, -589, -589, -567, -21, -589, -589, -12, -589, + -55, -589, -589, -57, -48, -54, -53, -52, -589, -589, + -30, -589, -28, -589, -589, -589, -589, 236, 319, -589, + -212, -589, -589, -589, -25, -589, -23, -589, -589, -589, + -589, -589, -589, -589, -589, -589, -84, -589, -589, -589, + -589, -589, -83, -589, -589, -589, -589, -589, -589, -589, + -34, -589, -589, -589, -589, -589, -589, -589, -6, -589, + -589, -589, -589, -589, -589, -589, -74, -589, -589, -589, + -66, -589, -589, -589, -589, -589, -589, -589, 75, -589, + -589, -320, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589, 15, -589, -589, -589, -589, -589, -589, -589, + -589, -589, -589, -589, -589, -589, -589, -589, -588, -589, + -589, -589, -589, -589, -107, -589, -589, -589, -589, -589, + -589, -589, -589, -125, -589, -589, -471, -589, -496, -589, + -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589, -589, 17, 18, -589, -589, -589, -589, -589, + -589, -589, -589, -589, 365, -589, -589, -589, -589, -589, + -589, -589, -589, -589, -589, -300, 273, -294, -589, -589, + -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589, -589, -589, -589, -589, -589, -589, -589, 602, + -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, + 243, -589, -589, -103, -589, -589, -589, -589, -589, -589, + -589, 73, -589, -589, -589, 283, -589, -589, 295, -589, + -589, -589, -589, -589, -589, -589, -589, -589, -589, -589, + -589, -589 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 2, 25, 367, 26, 165, 169, 170, 164, + -1, 1, 2, 25, 368, 26, 165, 169, 170, 164, 168, 114, 109, 118, 171, 173, 175, 179, 180, 77, - 27, 79, 28, 108, 307, 429, 29, 30, 110, 311, - 431, 605, 674, 656, 675, 657, 658, 691, 778, 31, - 111, 382, 32, 33, 117, 330, 439, 34, 80, 35, - 135, 329, 36, 37, 38, 119, 331, 452, 39, 206, - 358, 520, 40, 271, 41, 97, 261, 337, 42, 43, - 387, 453, 454, 551, 550, 386, 440, 536, 547, 548, - 535, 538, 537, 539, 533, 384, 435, 606, 245, 211, - 304, 103, 44, 441, 78, 295, 417, 591, 186, 246, - 333, 248, 249, 250, 251, 252, 253, 254, 255, 256, - 334, 442, 81, 197, 296, 465, 138, 139, 140, 141, - 47, 351, 419, 594, 352, 668, 687, 729, 353, 354, + 27, 79, 28, 108, 308, 430, 29, 30, 110, 312, + 432, 606, 675, 657, 676, 658, 659, 692, 779, 31, + 111, 383, 32, 33, 117, 331, 440, 34, 80, 35, + 135, 330, 36, 37, 38, 119, 332, 453, 39, 206, + 359, 521, 40, 272, 41, 97, 262, 338, 42, 43, + 388, 454, 455, 552, 551, 387, 441, 537, 548, 549, + 536, 539, 538, 540, 534, 385, 436, 607, 246, 211, + 305, 103, 44, 442, 78, 296, 418, 592, 186, 247, + 334, 249, 250, 251, 252, 253, 254, 255, 256, 257, + 335, 443, 81, 197, 297, 466, 138, 139, 140, 141, + 47, 352, 420, 595, 353, 669, 688, 730, 354, 355, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, - 48, 82, 49, 166, 341, 462, 394, 463, 559, 396, - 466, 561, 662, 560, 50, 83, 51, 279, 397, 562, - 663, 697, 746, 473, 718, 747, 719, 748, 786, 743, - 720, 749, 721, 745, 744, 784, 771, 785, 52, 53, - 54, 84, 297, 420, 595, 517, 596, 671, 518, 157, - 338, 459, 158, 270, 389, 159, 160, 339, 460, 161, - 162, 340, 461, 163, 355, 418, 513, 593, 514, 592, - 670, 443, 409, 496, 638, 685, 726, 410, 497, 639, - 686, 728, 444, 85, 298, 421, 597, 445, 613, 677, - 713, 764, 446, 545, 456, 549, 661, 696, 665, 681, - 682, 700, 724, 774, 701, 722, 773, 695, 711, 712, - 739, 762, 794, 740, 763, 795, 546, 741, 703, 725, - 775, 707, 727, 776, 756, 777, 802, 783, 796, 807, - 810, 811, 814, 447, 448, 58, 59, 60, 172, 343, - 479, 61, 209, 360, 301, 359, 398, 480, 568, 569, - 570, 571, 572, 566, 573, 524, 500, 525, 413, 502, - 483, 484, 485, 62, 174, 63, 100, 302, 426, 599, - 672, 709, 362, 425, 731, 287, 344, 490, 399, 491, - 577, 578, 492, 632, 683, 493, 633, 684, 64, 65, - 66, 67, 68, 290, 400, 579, 69, 70, 71, 177, - 289, 72, 291, 401, 580, 73, 229, 230, 312, 432, - 231, 733, 760, 734, 74, 105, 305, 427, 603, 526, - 604, 527, 601, 602, 600, 414, 257, 328, 258, 75, - 76, 106, 306, 182, 294, 415, 348, 416, 506, 507, - 505, 509 + 48, 82, 49, 166, 342, 463, 395, 464, 560, 397, + 467, 562, 663, 561, 50, 83, 51, 280, 398, 563, + 664, 698, 747, 474, 719, 748, 720, 749, 787, 744, + 721, 750, 722, 746, 745, 785, 772, 786, 52, 53, + 54, 84, 298, 421, 596, 518, 597, 672, 519, 157, + 339, 460, 158, 271, 390, 159, 160, 340, 461, 161, + 162, 341, 462, 163, 356, 419, 514, 594, 515, 593, + 671, 444, 410, 497, 639, 686, 727, 411, 498, 640, + 687, 729, 445, 85, 299, 422, 598, 446, 614, 678, + 714, 765, 447, 546, 457, 550, 662, 697, 666, 682, + 683, 701, 725, 775, 702, 723, 774, 696, 712, 713, + 740, 763, 795, 741, 764, 796, 547, 742, 704, 726, + 776, 708, 728, 777, 757, 778, 803, 784, 797, 808, + 811, 812, 815, 448, 449, 58, 59, 60, 172, 344, + 480, 61, 209, 361, 302, 360, 399, 481, 569, 570, + 571, 572, 573, 567, 574, 525, 501, 526, 414, 503, + 484, 485, 486, 62, 174, 63, 100, 303, 427, 600, + 673, 710, 363, 426, 732, 288, 345, 491, 400, 492, + 578, 579, 493, 633, 684, 494, 634, 685, 64, 65, + 66, 67, 68, 291, 401, 580, 69, 70, 71, 177, + 290, 72, 292, 402, 581, 73, 229, 230, 313, 433, + 231, 734, 761, 735, 74, 105, 306, 428, 604, 527, + 605, 528, 602, 603, 601, 415, 258, 329, 259, 75, + 76, 106, 307, 182, 295, 416, 349, 417, 507, 508, + 506, 510 }; /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If @@ -1096,278 +1098,278 @@ static const yytype_int16 yydefgoto[] = number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { - 87, 88, 102, 104, 193, 98, 99, 156, 137, 247, - 45, 152, 194, 153, 390, 46, 154, 55, 155, 56, - 57, 582, 136, 187, 190, 191, 192, 643, 408, 542, - 188, 391, 392, 393, 189, 345, 715, 86, 455, 86, - 86, 86, 411, 422, 584, 7, 715, 156, 198, 412, - 489, 152, 265, 153, 86, 266, 154, 498, 155, 185, - 195, 7, 136, 716, 717, 585, 86, 196, 107, 199, - 200, 201, 202, 716, 717, 267, 268, 204, 478, 654, - 542, 207, 655, 86, 208, 494, 666, 210, 467, 121, - 122, 212, 481, 125, 126, 127, 128, 213, 112, 482, - -137, 3, 116, 11, 17, 115, 424, 523, 90, 232, - 233, 234, 235, 236, 678, 237, 238, 101, 101, 101, - 239, 240, 213, -281, 232, 233, 234, 235, 236, 113, - 237, 238, 101, 241, 242, 239, 240, 176, 243, 244, - -299, 176, 316, 213, 213, 193, 455, 17, 167, 654, - 214, 94, 655, 194, 244, -138, 213, 203, -139, 205, - 115, 101, 667, 115, 187, 190, 191, 192, 115, 402, - 403, 188, 522, 86, 272, 189, 273, 181, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 9, 10, -97, 11, 132, 133, 134, 115, 303, 404, - 185, 704, 320, 321, 405, 183, 787, 406, 407, 324, - 325, 326, 215, 714, -421, 402, 403, -493, 798, 322, - 323, 542, 736, 737, 738, 216, 86, 217, 804, 218, - 742, 120, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 753, 259, 404, 750, 132, 133, 134, - 405, 101, 379, 380, 381, 464, -98, 86, 716, 717, - 260, 115, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 9, 10, 262, 11, 132, 133, - 134, 247, 349, 350, 523, 641, 457, 781, 263, 86, - 264, 363, 89, 91, 120, 121, 122, 123, 124, 125, - 126, 127, 128, 184, 101, 542, 313, 314, 315, 269, - 385, 133, 134, 213, 86, 93, 96, 385, 274, 120, + 87, 88, 102, 104, 193, 98, 99, 156, 137, 248, + 45, 152, 194, 153, 391, 46, 154, 55, 155, 56, + 57, 188, 136, 187, 190, 191, 192, 583, 644, 409, + 189, 543, 392, 393, 394, 346, 716, 655, 456, 86, + 86, 86, 266, 423, 585, 267, 667, 156, 198, 412, + 490, 152, 3, 153, 86, 413, 154, 499, 155, 185, + 195, 17, 136, 717, 718, 94, 586, 196, 86, 199, + 200, 201, 202, 86, 679, 268, 269, 204, 656, 479, + 212, 207, 543, 86, 208, 495, 213, 210, 468, 121, + 122, 214, 7, 125, 126, 127, 128, 213, 107, 482, + 323, 324, 116, 11, 167, 483, 425, 655, 524, 232, + 233, 234, 235, 236, 237, 238, 239, 101, 101, 101, + 240, 241, 213, -282, 232, 233, 234, 235, 236, 237, + 238, 239, 101, 242, 243, 240, 241, 176, 244, 245, + 112, 176, -137, 317, 213, 193, 456, 115, 656, 115, + -138, 213, 7, 194, 245, 115, 181, 203, -139, 205, + 113, 101, 188, 115, 187, 190, 191, 192, 668, 716, + 86, 189, 523, 321, 322, 120, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 9, 10, 705, + 11, 132, 133, 134, -300, 17, 717, 718, 304, 90, + 185, 715, 183, 86, 325, 326, 327, 788, 120, 121, + 122, 123, 124, 125, 126, 127, 128, 184, 743, 799, + 717, 718, -97, 543, -422, 133, 134, 115, 86, 805, + 273, 754, 274, 120, 121, 122, 123, 124, 125, 126, + 127, 128, 129, 130, 131, 403, 404, -494, 101, 132, + 133, 134, 751, -98, 465, 215, 86, 216, 115, 403, + 404, 120, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 9, 10, 405, 11, 132, 133, 134, + 406, 101, 248, 350, 351, 524, 642, 458, 217, 405, + 89, 91, 364, 782, 406, 93, 96, 407, 408, 737, + 738, 739, 218, 380, 381, 382, 101, 543, 314, 315, + 316, 386, 376, 377, 260, 86, 378, 379, 386, 261, + 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, + 130, 131, 9, 10, 101, 11, 132, 133, 134, 618, + 619, 424, 263, 470, 471, 472, 473, 264, 543, 265, + 213, 301, 270, 277, 275, 276, 278, 310, 311, 279, + 281, 282, 333, 156, 475, 283, 336, 152, 284, 153, + 434, 136, 154, 544, 155, 45, 285, 286, 136, 469, + 46, 545, 55, 287, 56, 57, 500, 289, 504, 505, + 293, 294, -495, 101, 300, 500, 318, 337, 319, 328, + 4, 343, 347, 5, 6, 7, 8, 522, 348, 320, + 357, 358, 365, 362, 369, 372, 370, 431, 502, 9, + 10, 371, 11, 384, 544, 389, 12, 511, 542, 512, + 516, 517, 545, -330, -8, 513, 529, 530, 531, 13, + 14, 15, 16, 403, 404, 533, 535, 553, 17, 18, + 554, 555, 19, 790, 791, 20, 556, 564, 565, 566, + 557, 558, 21, 22, 476, 477, 559, -257, 266, 23, + 24, 654, 568, 405, 478, 575, 576, 577, 406, 542, + 807, 407, 408, 582, 587, -353, 588, -50, 584, 589, + 248, 591, 86, 608, 599, 609, 590, 120, 121, 122, + 123, 124, 125, 126, 127, 128, 184, 130, 131, 610, + 611, 612, 613, 615, 133, 134, 616, 156, 156, 617, + 622, 152, 152, 153, 153, 620, 154, 154, 155, 155, + 626, 627, 136, 136, 628, 629, 630, 631, -44, 632, + -44, 635, 636, 648, 661, 637, 638, 645, -371, 351, + 647, 623, 624, 625, -44, -44, 646, -44, -44, 649, + 650, -44, 651, 652, 665, 544, 677, 680, 700, 681, + 101, 689, 693, 545, 695, 703, 699, 707, 709, 711, + 731, 733, 351, -44, 86, 752, 753, -44, 660, 120, 121, 122, 123, 124, 125, 126, 127, 128, 184, 130, - 131, 375, 376, 617, 618, 101, 133, 134, 275, 276, - 423, 277, 469, 470, 471, 472, 542, 377, 378, 278, - 280, 281, 282, 283, 300, 284, 285, 310, 286, 288, - 292, 293, 156, 474, 299, -494, 152, 101, 153, 433, - 136, 154, 543, 155, 45, 317, 309, 136, 468, 46, - 544, 55, 327, 56, 57, 499, 318, 503, 504, 319, - 402, 403, 101, 332, 499, 335, 336, 342, 361, 346, - 347, 356, 357, 364, 368, 371, 521, 369, -329, 430, - 370, 475, 476, 383, 388, 501, 510, 511, 515, 516, - 404, 477, -8, 543, 528, 405, 529, 541, 406, 407, - 512, 544, 530, 532, 534, 552, 553, 265, 554, 581, - 558, 555, 4, 556, -256, 5, 6, 7, 8, 557, - 567, 576, 586, 789, 790, 587, 563, 564, 565, 588, - 590, 9, 10, -352, 11, 598, 607, 608, 12, 609, - 610, 616, 611, 612, 574, 575, 614, 615, 541, 619, - 806, 13, 14, 15, 16, 625, 621, 583, 626, 247, - 17, 18, 627, 628, 19, 589, 629, 20, 630, 631, - 634, 635, 647, 645, 21, 22, 636, 637, 644, 646, - 648, 23, 24, 653, 649, 651, 156, 156, 650, 660, - 152, 152, 153, 153, 676, 154, 154, 155, 155, -50, - 679, 136, 136, 664, 680, -370, 692, 688, 694, 699, - 702, 698, 706, 708, 710, 730, -379, 723, 350, 732, - 622, 623, 624, 735, 751, 752, 754, 755, 761, 759, - 765, 767, 782, 768, 543, 779, 791, 799, 780, 797, - 800, 801, 544, 809, 805, 813, 808, 428, 815, 366, - 693, 350, 95, 86, 812, 92, 308, 659, 120, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 9, 10, 495, 11, 132, 133, 134, 372, 374, 620, - 640, 519, 705, 45, 373, 458, 769, 395, 46, 541, - 55, 772, 56, 57, 689, 642, 87, 669, 788, 803, - 508, 178, 531, 365, 673, -44, 793, -44, 486, 434, - 0, 0, 766, 0, 652, 0, 0, 0, 543, 0, - 0, -44, -44, 690, -44, -44, 544, 0, -44, 0, - 0, 101, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 87, 669, 0, 0, 0, 0, 0, 0, - -44, 0, 0, 45, -44, 0, 0, 0, 46, 543, - 55, 0, 56, 57, 0, 0, 0, 544, -44, 0, - 0, 0, 0, 541, 0, 0, 0, 0, 0, 0, - 0, 758, 0, 0, 156, 770, 87, 757, 152, 0, - 153, 0, 0, 154, 0, 155, 0, 86, 0, 136, - 0, 0, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 184, 130, 131, 541, 0, 0, 0, 0, 133, - 134, 0, 0, 0, 0, 0, 385, 385, 540, 0, - 350, 0, 0, 0, 0, 792, 0, 0, 0, 0, - 0, 0, 350, 0, 0, 0, 0, 0, 436, 0, - -361, 5, 350, 385, 8, -361, -361, -361, -361, -361, - -361, -361, -361, -361, -361, -361, -361, 9, 10, 0, - 11, 0, -361, -361, 12, 101, 0, 402, 403, 437, - 438, -361, 0, 0, 0, 0, 0, 13, 0, 0, - 0, 449, 450, 451, 0, 0, 0, 0, 0, 0, + 131, -44, -380, 724, 736, 755, 133, 134, 756, 760, + 762, 766, 769, 783, 45, 541, 801, 768, 792, 46, + 542, 55, 780, 56, 57, 800, 798, 87, 670, 810, + 781, 802, 806, 816, 814, 674, 219, 694, 220, 95, + 809, 92, 367, 767, 813, 429, 496, 641, 309, 544, + 373, 621, 221, 222, 691, 223, 224, 545, 520, 225, + 374, 396, 101, 375, 770, 706, 690, 773, 789, 643, + 804, 459, 366, 87, 670, 178, 532, 794, 653, 435, + 0, 226, 487, 0, 45, 227, 0, 509, 0, 46, + 544, 55, 0, 56, 57, 0, 0, 0, 545, 228, + 0, 0, 0, 0, 542, 0, 0, 0, 0, 0, + 0, 0, 759, 0, 0, 156, 771, 87, 758, 152, + 0, 153, 0, 0, 154, 0, 155, 0, 0, 0, + 136, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 542, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 386, 386, 0, + 0, 351, 0, 0, 0, 0, 793, 0, 0, 0, + 0, 0, 0, 351, 0, 0, 0, 0, 0, 437, + 0, -362, 5, 351, 386, 8, -362, -362, -362, -362, + -362, -362, -362, -362, -362, -362, -362, -362, 9, 10, + 0, 11, 0, -362, -362, 12, 0, 0, 403, 404, + 438, 439, -362, 0, 0, 0, 0, 0, 13, 0, + 0, 0, 450, 451, 452, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 21, 22, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -361, 0, - 436, 0, -361, 5, 0, -83, 8, -361, -361, -361, - -361, -361, -361, -361, -361, -361, -361, -361, -361, 9, - 10, 0, 11, 0, -361, -361, 12, 0, 0, 402, - 403, 437, 438, -361, 0, 0, 0, 0, 0, 13, - 0, 0, 0, 449, 450, 451, 0, 0, 0, 0, + 0, 21, 22, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, -362, + 0, 437, 0, -362, 5, 0, -83, 8, -362, -362, + -362, -362, -362, -362, -362, -362, -362, -362, -362, -362, + 9, 10, 0, 11, 0, -362, -362, 12, 0, 0, + 403, 404, 438, 439, -362, 0, 0, 0, 0, 0, + 13, 0, 0, 0, 450, 451, 452, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 21, 22, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, -362, 0, 437, 0, -362, 5, 0, -507, 8, + -362, -362, -362, -362, -362, -362, -362, -362, -362, -362, + -362, -362, 9, 10, 0, 11, 0, -362, -362, 12, + 0, 0, 403, 404, 438, 439, -362, 0, 0, 0, + 0, 0, 13, 0, 0, 0, 488, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 489, 0, 0, 0, + 0, 0, 0, 0, 0, 21, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, -362, 0, 437, 0, -362, 5, 0, + -474, 8, -362, -362, -362, -362, -362, -362, -362, -362, + -362, -362, -362, -362, 9, 10, 0, 11, 0, -362, + -362, 12, 0, 0, 403, 404, 438, 439, -362, 0, + 437, 0, -362, 5, 13, 0, 8, -362, -362, -362, + -362, -362, -362, -362, -362, -362, -362, -362, -362, 9, + 10, 0, 11, 0, -362, -362, 12, 21, 22, 403, + 404, 438, 439, -362, 0, 0, 0, 0, 0, 13, + 0, 0, 0, 0, 0, -362, 0, 0, 0, 0, + 0, 0, -65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -361, 0, 436, 0, -361, 5, 0, -506, 8, -361, - -361, -361, -361, -361, -361, -361, -361, -361, -361, -361, - -361, 9, 10, 0, 11, 0, -361, -361, 12, 0, - 0, 402, 403, 437, 438, -361, 0, 0, 0, 0, - 0, 13, 0, 0, 0, 487, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 488, 0, 0, 0, 0, + -362, 0, 437, 0, -362, 5, 0, -87, 8, -362, + -362, -362, -362, -362, -362, -362, -362, -362, -362, -362, + -362, 9, 10, 0, 11, 0, -362, -362, 12, 0, + 0, 403, 404, 438, 439, -362, 0, 0, 0, 0, + 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, + -2, 4, 0, 0, 5, 6, 7, 8, 0, 0, 0, 0, 0, 0, 21, 22, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -361, 0, 436, 0, -361, 5, 0, -473, - 8, -361, -361, -361, -361, -361, -361, -361, -361, -361, - -361, -361, -361, 9, 10, 0, 11, 0, -361, -361, - 12, 0, 0, 402, 403, 437, 438, -361, 0, 436, - 0, -361, 5, 13, 0, 8, -361, -361, -361, -361, - -361, -361, -361, -361, -361, -361, -361, -361, 9, 10, - 0, 11, 0, -361, -361, 12, 21, 22, 402, 403, - 437, 438, -361, 0, 0, 0, 0, 0, 13, 0, - 0, 0, 0, 0, -361, 0, 0, 0, 0, 0, - 0, -65, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 21, 22, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, -361, - 0, 436, 0, -361, 5, 0, -87, 8, -361, -361, - -361, -361, -361, -361, -361, -361, -361, -361, -361, -361, - 9, 10, 219, 11, 220, -361, -361, 12, 0, 0, - 402, 403, 437, 438, -361, 0, 0, 0, 221, 222, - 13, 223, 224, 0, 0, 225, 0, 0, 0, -2, - 4, 0, 0, 5, 6, 7, 8, 0, 0, 0, - 0, 0, 0, 21, 22, 0, 0, 226, 0, 9, - 10, 227, 11, 0, 0, 0, 12, 0, 0, 0, - 0, -361, 0, 0, 0, 228, 0, 0, -497, 13, - 14, 15, 16, 0, 0, 0, 0, 0, 17, 18, - 0, 0, 19, 4, 0, 20, 5, 6, 7, 8, - 0, 0, 21, 22, 0, 0, 0, 0, 0, 23, - 24, 0, 9, 10, 0, 11, 0, 0, 4, 12, - 0, 5, 6, 7, 8, 0, 0, 0, 0, 0, - 0, 0, 13, 14, 15, 16, 0, 9, 10, 0, - 11, 17, 18, 0, 12, 19, 0, 0, 20, 0, - 0, 0, 0, 0, 0, 21, 22, 13, 14, 15, - 16, 0, 23, 24, 653, 0, 17, 18, 0, 0, - 19, 0, 0, 20, 0, 0, 0, 0, 0, 0, - 21, 22, 0, 0, 0, 0, 0, 23, 24 + 9, 10, 0, 11, 0, 0, 0, 12, 0, 0, + 0, 0, -362, 0, 0, 0, 0, 0, 0, -498, + 13, 14, 15, 16, 0, 0, 0, 0, 0, 17, + 18, 0, 0, 19, 4, 0, 20, 5, 6, 7, + 8, 0, 0, 21, 22, 0, 0, 0, 0, 0, + 23, 24, 0, 9, 10, 0, 11, 0, 0, 4, + 12, 0, 5, 6, 7, 8, 0, 0, 0, 0, + 0, 0, 0, 13, 14, 15, 16, 0, 9, 10, + 0, 11, 17, 18, 0, 12, 19, 0, 0, 20, + 0, 0, 0, 0, 0, 0, 21, 22, 13, 14, + 15, 16, 0, 23, 24, 654, 0, 17, 18, 0, + 0, 19, 0, 0, 20, 0, 0, 0, 0, 0, + 0, 21, 22, 0, 0, 0, 0, 0, 23, 24 }; static const yytype_int16 yycheck[] = { 13, 13, 21, 22, 78, 18, 19, 41, 41, 111, - 2, 41, 78, 41, 336, 2, 41, 2, 41, 2, - 2, 497, 41, 78, 78, 78, 78, 594, 348, 446, - 78, 338, 339, 340, 78, 289, 1, 3, 387, 3, - 3, 3, 348, 358, 3, 6, 1, 81, 81, 348, - 399, 81, 8, 81, 3, 11, 81, 19, 81, 78, - 79, 6, 81, 28, 29, 3, 3, 80, 89, 82, - 83, 84, 85, 28, 29, 8, 9, 90, 398, 605, - 497, 94, 605, 3, 97, 400, 633, 100, 8, 9, - 10, 75, 398, 13, 14, 15, 16, 81, 86, 398, - 86, 0, 34, 23, 49, 91, 360, 427, 53, 73, - 74, 75, 76, 77, 661, 79, 80, 81, 81, 81, - 84, 85, 81, 88, 73, 74, 75, 76, 77, 86, + 2, 41, 78, 41, 337, 2, 41, 2, 41, 2, + 2, 78, 41, 78, 78, 78, 78, 498, 595, 349, + 78, 447, 339, 340, 341, 290, 1, 606, 388, 3, + 3, 3, 8, 359, 3, 11, 634, 81, 81, 349, + 400, 81, 0, 81, 3, 349, 81, 19, 81, 78, + 79, 49, 81, 28, 29, 53, 3, 80, 3, 82, + 83, 84, 85, 3, 662, 8, 9, 90, 606, 399, + 75, 94, 498, 3, 97, 401, 81, 100, 8, 9, + 10, 75, 6, 13, 14, 15, 16, 81, 89, 399, + 97, 98, 34, 23, 22, 399, 361, 676, 428, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 81, 81, + 84, 85, 81, 88, 73, 74, 75, 76, 77, 78, 79, 80, 81, 97, 98, 84, 85, 69, 102, 103, - 86, 73, 244, 81, 81, 219, 495, 49, 22, 675, - 75, 53, 675, 219, 103, 86, 81, 89, 86, 91, - 91, 81, 638, 91, 219, 219, 219, 219, 91, 30, - 31, 219, 426, 3, 90, 219, 92, 87, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 86, 23, 24, 25, 26, 91, 211, 60, - 219, 684, 82, 83, 65, 86, 773, 68, 69, 99, - 100, 101, 3, 696, 86, 30, 31, 86, 785, 97, - 98, 638, 35, 36, 37, 3, 3, 87, 795, 86, - 713, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 726, 86, 60, 722, 24, 25, 26, - 65, 81, 324, 325, 326, 1, 86, 3, 28, 29, - 48, 91, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 87, 23, 24, 25, - 26, 383, 295, 296, 604, 592, 388, 763, 86, 3, - 87, 304, 14, 15, 8, 9, 10, 11, 12, 13, - 14, 15, 16, 17, 81, 722, 241, 242, 243, 89, - 329, 25, 26, 81, 3, 15, 16, 336, 89, 8, + 86, 73, 86, 245, 81, 219, 496, 91, 676, 91, + 86, 81, 6, 219, 103, 91, 87, 89, 86, 91, + 86, 81, 219, 91, 219, 219, 219, 219, 639, 1, + 3, 219, 427, 82, 83, 8, 9, 10, 11, 12, + 13, 14, 15, 16, 17, 18, 19, 20, 21, 685, + 23, 24, 25, 26, 86, 49, 28, 29, 211, 53, + 219, 697, 86, 3, 99, 100, 101, 774, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 714, 786, + 28, 29, 86, 639, 86, 25, 26, 91, 3, 796, + 90, 727, 92, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 30, 31, 86, 81, 24, + 25, 26, 723, 86, 1, 3, 3, 3, 91, 30, + 31, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, 20, 21, 60, 23, 24, 25, 26, + 65, 81, 384, 296, 297, 605, 593, 389, 87, 60, + 14, 15, 305, 764, 65, 15, 16, 68, 69, 35, + 36, 37, 86, 325, 326, 327, 81, 723, 242, 243, + 244, 330, 321, 322, 86, 3, 323, 324, 337, 48, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 81, 23, 24, 25, 26, 551, + 552, 360, 87, 398, 398, 398, 398, 86, 764, 87, + 81, 91, 89, 86, 89, 89, 86, 89, 3, 87, + 86, 86, 8, 397, 398, 86, 89, 397, 86, 397, + 383, 390, 397, 447, 397, 367, 87, 86, 397, 398, + 367, 447, 367, 87, 367, 367, 405, 86, 407, 408, + 86, 86, 86, 81, 87, 414, 94, 47, 95, 90, + 1, 103, 87, 4, 5, 6, 7, 426, 87, 96, + 87, 87, 87, 91, 3, 104, 90, 90, 58, 20, + 21, 92, 23, 92, 498, 92, 27, 88, 447, 93, + 92, 3, 498, 105, 88, 105, 88, 3, 87, 40, + 41, 42, 43, 30, 31, 92, 88, 88, 49, 50, + 86, 90, 53, 776, 777, 56, 90, 476, 477, 478, + 90, 90, 63, 64, 51, 52, 88, 88, 8, 70, + 71, 72, 88, 60, 61, 488, 489, 88, 65, 498, + 803, 68, 69, 31, 86, 88, 86, 88, 501, 86, + 592, 86, 3, 86, 88, 86, 509, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 86, + 86, 86, 86, 86, 25, 26, 86, 551, 552, 3, + 104, 551, 552, 551, 552, 86, 551, 552, 551, 552, + 86, 86, 551, 552, 86, 86, 86, 86, 4, 86, + 6, 86, 86, 66, 3, 88, 88, 88, 35, 562, + 88, 564, 565, 566, 20, 21, 92, 23, 24, 86, + 86, 27, 86, 88, 103, 639, 86, 86, 35, 87, + 81, 106, 88, 639, 103, 38, 104, 55, 92, 89, + 59, 3, 595, 49, 3, 92, 103, 53, 607, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 320, 321, 550, 551, 81, 25, 26, 89, 86, - 359, 86, 397, 397, 397, 397, 763, 322, 323, 87, - 86, 86, 86, 86, 91, 87, 86, 3, 87, 86, - 86, 86, 396, 397, 87, 86, 396, 81, 396, 382, - 389, 396, 446, 396, 366, 94, 89, 396, 397, 366, - 446, 366, 90, 366, 366, 404, 95, 406, 407, 96, - 30, 31, 81, 8, 413, 89, 47, 103, 91, 87, - 87, 87, 87, 87, 3, 104, 425, 90, 105, 90, - 92, 51, 52, 92, 92, 58, 88, 93, 92, 3, - 60, 61, 88, 497, 88, 65, 3, 446, 68, 69, - 105, 497, 87, 92, 88, 88, 86, 8, 90, 31, - 88, 90, 1, 90, 88, 4, 5, 6, 7, 90, - 88, 88, 86, 775, 776, 86, 475, 476, 477, 86, - 86, 20, 21, 88, 23, 88, 86, 86, 27, 86, - 86, 3, 86, 86, 487, 488, 86, 86, 497, 86, - 802, 40, 41, 42, 43, 86, 104, 500, 86, 591, - 49, 50, 86, 86, 53, 508, 86, 56, 86, 86, - 86, 86, 66, 92, 63, 64, 88, 88, 88, 88, - 86, 70, 71, 72, 86, 88, 550, 551, 86, 3, - 550, 551, 550, 551, 86, 550, 551, 550, 551, 88, - 86, 550, 551, 103, 87, 35, 88, 106, 103, 35, - 38, 104, 55, 92, 89, 59, 104, 104, 561, 3, - 563, 564, 565, 104, 92, 103, 103, 62, 104, 90, - 86, 91, 39, 88, 638, 92, 103, 86, 92, 91, - 104, 104, 638, 75, 103, 92, 104, 366, 75, 307, - 675, 594, 16, 3, 104, 15, 219, 606, 8, 9, + 19, 67, 104, 104, 104, 103, 25, 26, 62, 90, + 104, 86, 88, 39, 606, 34, 104, 91, 103, 606, + 639, 606, 92, 606, 606, 86, 91, 640, 640, 75, + 92, 104, 103, 75, 92, 654, 4, 676, 6, 16, + 104, 15, 308, 745, 104, 367, 402, 592, 219, 723, + 318, 562, 20, 21, 673, 23, 24, 723, 422, 27, + 319, 342, 81, 320, 748, 686, 672, 750, 775, 594, + 795, 390, 307, 686, 686, 73, 433, 780, 605, 384, + -1, 49, 399, -1, 676, 53, -1, 414, -1, 676, + 764, 676, -1, 676, 676, -1, -1, -1, 764, 67, + -1, -1, -1, -1, 723, -1, -1, -1, -1, -1, + -1, -1, 731, -1, -1, 749, 749, 730, 730, 749, + -1, 749, -1, -1, 749, -1, 749, -1, -1, -1, + 749, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 764, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 776, 777, -1, + -1, 774, -1, -1, -1, -1, 779, -1, -1, -1, + -1, -1, -1, 786, -1, -1, -1, -1, -1, 1, + -1, 3, 4, 796, 803, 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, -1, + -1, 63, 64, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, + -1, 1, -1, 3, 4, -1, 88, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 401, 23, 24, 25, 26, 317, 319, 561, - 591, 421, 685, 605, 318, 389, 747, 341, 605, 638, - 605, 749, 605, 605, 671, 593, 639, 639, 774, 794, - 413, 73, 432, 306, 653, 4, 779, 6, 398, 383, - -1, -1, 744, -1, 604, -1, -1, -1, 722, -1, - -1, 20, 21, 672, 23, 24, 722, -1, 27, -1, - -1, 81, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 685, 685, -1, -1, -1, -1, -1, -1, - 49, -1, -1, 675, 53, -1, -1, -1, 675, 763, - 675, -1, 675, 675, -1, -1, -1, 763, 67, -1, - -1, -1, -1, 722, -1, -1, -1, -1, -1, -1, - -1, 730, -1, -1, 748, 748, 729, 729, 748, -1, - 748, -1, -1, 748, -1, 748, -1, 3, -1, 748, - -1, -1, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 763, -1, -1, -1, -1, 25, - 26, -1, -1, -1, -1, -1, 775, 776, 34, -1, - 773, -1, -1, -1, -1, 778, -1, -1, -1, -1, - -1, -1, 785, -1, -1, -1, -1, -1, 1, -1, - 3, 4, 795, 802, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, -1, - 23, -1, 25, 26, 27, 81, -1, 30, 31, 32, - 33, 34, -1, -1, -1, -1, -1, 40, -1, -1, - -1, 44, 45, 46, -1, -1, -1, -1, -1, -1, + 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, -1, -1, 63, 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 81, -1, - 1, -1, 3, 4, -1, 88, 7, 8, 9, 10, + -1, 81, -1, 1, -1, 3, 4, -1, 88, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, -1, 23, -1, 25, 26, 27, + -1, -1, 30, 31, 32, 33, 34, -1, -1, -1, + -1, -1, 40, -1, -1, -1, 44, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 54, -1, -1, -1, + -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 81, -1, 1, -1, 3, 4, -1, + 88, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, 20, 21, -1, 23, -1, 25, + 26, 27, -1, -1, 30, 31, 32, 33, 34, -1, + 1, -1, 3, 4, 40, -1, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, -1, 23, -1, 25, 26, 27, -1, -1, 30, + 21, -1, 23, -1, 25, 26, 27, 63, 64, 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, + -1, -1, -1, -1, -1, 81, -1, -1, -1, -1, + -1, -1, 88, -1, -1, -1, -1, -1, -1, -1, -1, -1, 63, 64, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, -1, 1, -1, 3, 4, -1, 88, 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, 40, -1, -1, -1, -1, -1, -1, -1, -1, + 0, 1, -1, -1, 4, 5, 6, 7, -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, 3, 4, -1, 88, - 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, 88, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 63, 64, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 81, - -1, 1, -1, 3, 4, -1, 88, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 4, 23, 6, 25, 26, 27, -1, -1, - 30, 31, 32, 33, 34, -1, -1, -1, 20, 21, - 40, 23, 24, -1, -1, 27, -1, -1, -1, 0, - 1, -1, -1, 4, 5, 6, 7, -1, -1, -1, - -1, -1, -1, 63, 64, -1, -1, 49, -1, 20, - 21, 53, 23, -1, -1, -1, 27, -1, -1, -1, - -1, 81, -1, -1, -1, 67, -1, -1, 88, 40, - 41, 42, 43, -1, -1, -1, -1, -1, 49, 50, - -1, -1, 53, 1, -1, 56, 4, 5, 6, 7, - -1, -1, 63, 64, -1, -1, -1, -1, -1, 70, - 71, -1, 20, 21, -1, 23, -1, -1, 1, 27, - -1, 4, 5, 6, 7, -1, -1, -1, -1, -1, - -1, -1, 40, 41, 42, 43, -1, 20, 21, -1, - 23, 49, 50, -1, 27, 53, -1, -1, 56, -1, - -1, -1, -1, -1, -1, 63, 64, 40, 41, 42, - 43, -1, 70, 71, 72, -1, 49, 50, -1, -1, - 53, -1, -1, 56, -1, -1, -1, -1, -1, -1, - 63, 64, -1, -1, -1, -1, -1, 70, 71 + 20, 21, -1, 23, -1, -1, -1, 27, -1, -1, + -1, -1, 81, -1, -1, -1, -1, -1, -1, 88, + 40, 41, 42, 43, -1, -1, -1, -1, -1, 49, + 50, -1, -1, 53, 1, -1, 56, 4, 5, 6, + 7, -1, -1, 63, 64, -1, -1, -1, -1, -1, + 70, 71, -1, 20, 21, -1, 23, -1, -1, 1, + 27, -1, 4, 5, 6, 7, -1, -1, -1, -1, + -1, -1, -1, 40, 41, 42, 43, -1, 20, 21, + -1, 23, 49, 50, -1, 27, 53, -1, -1, 56, + -1, -1, -1, -1, -1, -1, 63, 64, 40, 41, + 42, 43, -1, 70, 71, 72, -1, 49, 50, -1, + -1, 53, -1, -1, 56, -1, -1, -1, -1, -1, + -1, 63, 64, -1, -1, -1, -1, -1, 70, 71 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -1397,65 +1399,65 @@ static const yytype_uint16 yystos[] = 198, 198, 198, 157, 198, 157, 166, 198, 198, 389, 198, 196, 75, 81, 75, 3, 3, 87, 86, 4, 6, 20, 21, 23, 24, 27, 49, 53, 67, 453, - 454, 457, 73, 74, 75, 76, 77, 79, 80, 84, - 85, 97, 98, 102, 103, 195, 206, 207, 208, 209, - 210, 211, 212, 213, 214, 215, 216, 473, 475, 86, - 48, 173, 87, 86, 87, 8, 11, 8, 9, 89, - 300, 170, 90, 92, 89, 89, 86, 86, 87, 264, - 86, 86, 86, 86, 87, 86, 87, 422, 86, 447, - 440, 449, 86, 86, 481, 202, 221, 289, 331, 87, - 91, 391, 414, 198, 197, 463, 479, 131, 205, 89, - 3, 136, 455, 215, 215, 215, 207, 94, 95, 96, - 82, 83, 97, 98, 99, 100, 101, 90, 474, 158, - 152, 163, 8, 207, 217, 89, 47, 174, 297, 304, - 308, 251, 103, 386, 423, 174, 87, 87, 483, 198, - 198, 228, 231, 235, 236, 311, 87, 87, 167, 392, - 390, 91, 419, 198, 87, 391, 109, 111, 3, 90, - 92, 104, 209, 210, 211, 212, 212, 213, 213, 214, - 214, 214, 148, 92, 192, 195, 182, 177, 92, 301, - 192, 217, 217, 217, 253, 255, 256, 265, 393, 425, - 441, 450, 30, 31, 60, 65, 68, 69, 318, 319, - 324, 402, 404, 405, 472, 482, 484, 203, 312, 229, - 290, 332, 182, 195, 174, 420, 415, 464, 110, 132, - 90, 137, 456, 198, 475, 193, 1, 32, 33, 153, - 183, 200, 218, 318, 329, 334, 339, 380, 381, 44, - 45, 46, 164, 178, 179, 183, 341, 207, 223, 298, - 305, 309, 252, 254, 1, 222, 257, 8, 195, 237, - 242, 243, 244, 270, 287, 51, 52, 61, 318, 387, - 394, 402, 404, 407, 408, 409, 472, 44, 54, 183, - 424, 426, 429, 432, 182, 177, 320, 325, 19, 195, - 403, 58, 406, 195, 195, 487, 485, 486, 403, 488, - 88, 93, 105, 313, 315, 92, 3, 292, 295, 254, - 168, 195, 174, 318, 402, 404, 466, 468, 88, 3, - 87, 457, 92, 191, 88, 187, 184, 189, 188, 190, - 34, 195, 224, 303, 307, 340, 363, 185, 186, 342, - 181, 180, 88, 86, 90, 90, 90, 90, 88, 255, - 260, 258, 266, 195, 195, 195, 400, 88, 395, 396, - 397, 398, 399, 401, 198, 198, 88, 427, 428, 442, - 451, 31, 363, 198, 3, 3, 86, 86, 86, 198, - 86, 204, 316, 314, 230, 291, 293, 333, 88, 416, - 471, 469, 470, 465, 467, 138, 194, 86, 86, 86, - 86, 86, 86, 335, 86, 86, 3, 257, 257, 86, - 228, 104, 198, 198, 198, 86, 86, 86, 86, 86, - 86, 86, 430, 433, 86, 86, 88, 88, 321, 326, - 206, 217, 315, 231, 88, 92, 88, 66, 86, 86, - 86, 88, 468, 72, 112, 127, 140, 142, 143, 195, - 3, 343, 259, 267, 103, 345, 345, 363, 232, 235, - 317, 294, 417, 195, 139, 141, 86, 336, 345, 86, - 87, 346, 347, 431, 434, 322, 327, 233, 106, 295, - 195, 144, 88, 142, 103, 354, 344, 268, 104, 35, - 348, 351, 38, 365, 365, 232, 55, 368, 92, 418, - 89, 355, 356, 337, 365, 1, 28, 29, 271, 273, - 277, 279, 352, 104, 349, 366, 323, 369, 328, 234, - 59, 421, 3, 458, 460, 104, 35, 36, 37, 357, - 360, 364, 365, 276, 281, 280, 269, 272, 274, 278, - 363, 92, 103, 365, 103, 62, 371, 235, 195, 90, - 459, 104, 358, 361, 338, 86, 207, 91, 88, 273, - 222, 283, 279, 353, 350, 367, 370, 372, 145, 92, - 92, 363, 39, 374, 282, 284, 275, 231, 351, 192, - 192, 103, 198, 460, 359, 362, 375, 91, 231, 86, - 104, 104, 373, 360, 231, 103, 192, 376, 104, 75, - 377, 378, 104, 92, 379, 75 + 454, 457, 73, 74, 75, 76, 77, 78, 79, 80, + 84, 85, 97, 98, 102, 103, 195, 206, 207, 208, + 209, 210, 211, 212, 213, 214, 215, 216, 473, 475, + 86, 48, 173, 87, 86, 87, 8, 11, 8, 9, + 89, 300, 170, 90, 92, 89, 89, 86, 86, 87, + 264, 86, 86, 86, 86, 87, 86, 87, 422, 86, + 447, 440, 449, 86, 86, 481, 202, 221, 289, 331, + 87, 91, 391, 414, 198, 197, 463, 479, 131, 205, + 89, 3, 136, 455, 215, 215, 215, 207, 94, 95, + 96, 82, 83, 97, 98, 99, 100, 101, 90, 474, + 158, 152, 163, 8, 207, 217, 89, 47, 174, 297, + 304, 308, 251, 103, 386, 423, 174, 87, 87, 483, + 198, 198, 228, 231, 235, 236, 311, 87, 87, 167, + 392, 390, 91, 419, 198, 87, 391, 109, 111, 3, + 90, 92, 104, 209, 210, 211, 212, 212, 213, 213, + 214, 214, 214, 148, 92, 192, 195, 182, 177, 92, + 301, 192, 217, 217, 217, 253, 255, 256, 265, 393, + 425, 441, 450, 30, 31, 60, 65, 68, 69, 318, + 319, 324, 402, 404, 405, 472, 482, 484, 203, 312, + 229, 290, 332, 182, 195, 174, 420, 415, 464, 110, + 132, 90, 137, 456, 198, 475, 193, 1, 32, 33, + 153, 183, 200, 218, 318, 329, 334, 339, 380, 381, + 44, 45, 46, 164, 178, 179, 183, 341, 207, 223, + 298, 305, 309, 252, 254, 1, 222, 257, 8, 195, + 237, 242, 243, 244, 270, 287, 51, 52, 61, 318, + 387, 394, 402, 404, 407, 408, 409, 472, 44, 54, + 183, 424, 426, 429, 432, 182, 177, 320, 325, 19, + 195, 403, 58, 406, 195, 195, 487, 485, 486, 403, + 488, 88, 93, 105, 313, 315, 92, 3, 292, 295, + 254, 168, 195, 174, 318, 402, 404, 466, 468, 88, + 3, 87, 457, 92, 191, 88, 187, 184, 189, 188, + 190, 34, 195, 224, 303, 307, 340, 363, 185, 186, + 342, 181, 180, 88, 86, 90, 90, 90, 90, 88, + 255, 260, 258, 266, 195, 195, 195, 400, 88, 395, + 396, 397, 398, 399, 401, 198, 198, 88, 427, 428, + 442, 451, 31, 363, 198, 3, 3, 86, 86, 86, + 198, 86, 204, 316, 314, 230, 291, 293, 333, 88, + 416, 471, 469, 470, 465, 467, 138, 194, 86, 86, + 86, 86, 86, 86, 335, 86, 86, 3, 257, 257, + 86, 228, 104, 198, 198, 198, 86, 86, 86, 86, + 86, 86, 86, 430, 433, 86, 86, 88, 88, 321, + 326, 206, 217, 315, 231, 88, 92, 88, 66, 86, + 86, 86, 88, 468, 72, 112, 127, 140, 142, 143, + 195, 3, 343, 259, 267, 103, 345, 345, 363, 232, + 235, 317, 294, 417, 195, 139, 141, 86, 336, 345, + 86, 87, 346, 347, 431, 434, 322, 327, 233, 106, + 295, 195, 144, 88, 142, 103, 354, 344, 268, 104, + 35, 348, 351, 38, 365, 365, 232, 55, 368, 92, + 418, 89, 355, 356, 337, 365, 1, 28, 29, 271, + 273, 277, 279, 352, 104, 349, 366, 323, 369, 328, + 234, 59, 421, 3, 458, 460, 104, 35, 36, 37, + 357, 360, 364, 365, 276, 281, 280, 269, 272, 274, + 278, 363, 92, 103, 365, 103, 62, 371, 235, 195, + 90, 459, 104, 358, 361, 338, 86, 207, 91, 88, + 273, 222, 283, 279, 353, 350, 367, 370, 372, 145, + 92, 92, 363, 39, 374, 282, 284, 275, 231, 351, + 192, 192, 103, 198, 460, 359, 362, 375, 91, 231, + 86, 104, 104, 373, 360, 231, 103, 192, 376, 104, + 75, 377, 378, 104, 92, 379, 75 }; /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ @@ -1479,45 +1481,45 @@ static const yytype_uint16 yyr1[] = 205, 205, 205, 205, 206, 207, 208, 208, 209, 209, 210, 210, 211, 211, 211, 212, 212, 212, 213, 213, 213, 213, 214, 214, 214, 214, 215, 215, 215, 216, - 216, 216, 216, 216, 216, 216, 216, 216, 217, 219, - 218, 218, 218, 218, 218, 218, 221, 220, 222, 222, - 223, 223, 223, 224, 224, 224, 224, 224, 224, 224, - 224, 225, 225, 225, 225, 226, 226, 226, 227, 227, - 228, 230, 229, 229, 231, 231, 232, 234, 233, 233, - 235, 236, 237, 237, 238, 238, 238, 239, 239, 239, - 240, 240, 240, 241, 242, 242, 243, 244, 245, 246, - 248, 247, 250, 251, 252, 249, 253, 254, 254, 256, - 255, 258, 259, 257, 260, 257, 262, 261, 264, 265, - 266, 267, 268, 269, 263, 270, 270, 270, 270, 270, - 270, 271, 272, 272, 274, 275, 273, 276, 273, 277, - 278, 278, 280, 279, 281, 282, 279, 284, 283, 285, - 286, 288, 289, 290, 291, 287, 292, 294, 293, 293, - 295, 297, 298, 296, 296, 300, 301, 299, 302, 304, - 305, 303, 303, 306, 308, 309, 307, 307, 310, 312, - 311, 313, 314, 314, 316, 317, 315, 318, 318, 320, - 321, 322, 323, 319, 325, 326, 327, 328, 324, 330, - 331, 332, 333, 329, 335, 336, 337, 338, 334, 339, - 339, 339, 340, 340, 342, 343, 344, 341, 346, 345, - 347, 345, 348, 350, 349, 349, 352, 353, 351, 355, - 354, 356, 354, 357, 359, 358, 358, 361, 362, 360, - 363, 363, 363, 363, 364, 364, 364, 366, 367, 365, - 365, 369, 370, 368, 368, 372, 373, 371, 371, 375, - 376, 374, 374, 377, 379, 378, 378, 380, 381, 382, - 382, 383, 385, 386, 387, 384, 389, 390, 388, 392, - 391, 391, 393, 393, 395, 394, 396, 394, 397, 394, - 398, 394, 399, 394, 400, 394, 401, 394, 402, 403, - 403, 404, 405, 406, 406, 407, 408, 409, 411, 410, - 413, 414, 415, 416, 417, 418, 412, 420, 419, 419, - 421, 421, 423, 424, 422, 425, 425, 426, 427, 426, - 428, 426, 430, 431, 429, 433, 434, 432, 435, 435, - 435, 436, 436, 437, 438, 440, 441, 442, 439, 443, - 444, 445, 447, 446, 449, 450, 451, 448, 452, 452, - 453, 453, 453, 453, 453, 453, 453, 453, 453, 453, - 454, 456, 455, 455, 457, 457, 458, 459, 459, 460, - 462, 463, 464, 465, 461, 466, 467, 467, 469, 468, - 470, 468, 471, 468, 472, 472, 473, 474, 474, 475, - 476, 478, 479, 477, 481, 482, 480, 483, 483, 485, - 484, 486, 484, 487, 484, 488, 484 + 216, 216, 216, 216, 216, 216, 216, 216, 216, 217, + 219, 218, 218, 218, 218, 218, 218, 221, 220, 222, + 222, 223, 223, 223, 224, 224, 224, 224, 224, 224, + 224, 224, 225, 225, 225, 225, 226, 226, 226, 227, + 227, 228, 230, 229, 229, 231, 231, 232, 234, 233, + 233, 235, 236, 237, 237, 238, 238, 238, 239, 239, + 239, 240, 240, 240, 241, 242, 242, 243, 244, 245, + 246, 248, 247, 250, 251, 252, 249, 253, 254, 254, + 256, 255, 258, 259, 257, 260, 257, 262, 261, 264, + 265, 266, 267, 268, 269, 263, 270, 270, 270, 270, + 270, 270, 271, 272, 272, 274, 275, 273, 276, 273, + 277, 278, 278, 280, 279, 281, 282, 279, 284, 283, + 285, 286, 288, 289, 290, 291, 287, 292, 294, 293, + 293, 295, 297, 298, 296, 296, 300, 301, 299, 302, + 304, 305, 303, 303, 306, 308, 309, 307, 307, 310, + 312, 311, 313, 314, 314, 316, 317, 315, 318, 318, + 320, 321, 322, 323, 319, 325, 326, 327, 328, 324, + 330, 331, 332, 333, 329, 335, 336, 337, 338, 334, + 339, 339, 339, 340, 340, 342, 343, 344, 341, 346, + 345, 347, 345, 348, 350, 349, 349, 352, 353, 351, + 355, 354, 356, 354, 357, 359, 358, 358, 361, 362, + 360, 363, 363, 363, 363, 364, 364, 364, 366, 367, + 365, 365, 369, 370, 368, 368, 372, 373, 371, 371, + 375, 376, 374, 374, 377, 379, 378, 378, 380, 381, + 382, 382, 383, 385, 386, 387, 384, 389, 390, 388, + 392, 391, 391, 393, 393, 395, 394, 396, 394, 397, + 394, 398, 394, 399, 394, 400, 394, 401, 394, 402, + 403, 403, 404, 405, 406, 406, 407, 408, 409, 411, + 410, 413, 414, 415, 416, 417, 418, 412, 420, 419, + 419, 421, 421, 423, 424, 422, 425, 425, 426, 427, + 426, 428, 426, 430, 431, 429, 433, 434, 432, 435, + 435, 435, 436, 436, 437, 438, 440, 441, 442, 439, + 443, 444, 445, 447, 446, 449, 450, 451, 448, 452, + 452, 453, 453, 453, 453, 453, 453, 453, 453, 453, + 453, 454, 456, 455, 455, 457, 457, 458, 459, 459, + 460, 462, 463, 464, 465, 461, 466, 467, 467, 469, + 468, 470, 468, 471, 468, 472, 472, 473, 474, 474, + 475, 476, 478, 479, 477, 481, 482, 480, 483, 483, + 485, 484, 486, 484, 487, 484, 488, 484 }; /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ @@ -1541,45 +1543,45 @@ static const yytype_uint8 yyr2[] = 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 3, 1, 3, 3, 1, 3, 3, 1, 3, 3, 3, 1, 2, 2, 2, 1, 1, 3, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, - 3, 1, 1, 1, 2, 1, 0, 3, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 3, 1, 1, 1, 2, 1, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 2, 0, 4, 0, 1, 1, 2, 0, 4, 0, - 1, 1, 1, 1, 1, 2, 1, 2, 3, 2, - 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, - 0, 3, 0, 0, 0, 7, 2, 2, 0, 0, - 2, 0, 0, 5, 0, 3, 0, 3, 0, 0, - 0, 0, 0, 0, 14, 1, 1, 1, 1, 1, - 1, 2, 2, 0, 0, 0, 5, 0, 3, 2, - 2, 0, 0, 3, 0, 0, 5, 0, 3, 1, - 1, 0, 0, 0, 0, 9, 2, 0, 4, 0, - 1, 0, 0, 6, 2, 0, 0, 5, 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, 10, 1, - 1, 0, 1, 1, 0, 0, 0, 7, 0, 3, - 0, 4, 2, 0, 4, 0, 0, 0, 5, 0, + 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, 2, 0, 0, 5, 0, 3, 0, 3, 0, + 0, 0, 0, 0, 0, 14, 1, 1, 1, 1, + 1, 1, 2, 2, 0, 0, 0, 5, 0, 3, + 2, 2, 0, 0, 3, 0, 0, 5, 0, 3, + 1, 1, 0, 0, 0, 0, 9, 2, 0, 4, + 0, 1, 0, 0, 6, 2, 0, 0, 5, 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, 10, + 1, 1, 0, 1, 1, 0, 0, 0, 7, 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, 0, 4, 0, 2, 5, 2, 3, 0, 1, - 0, 0, 0, 0, 9, 2, 2, 0, 0, 3, - 0, 3, 0, 3, 3, 3, 2, 3, 0, 1, - 2, 0, 0, 5, 0, 0, 5, 2, 0, 0, - 3, 0, 3, 0, 3, 0, 3 + 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, 0, 4, 0, 2, 5, 2, 3, 0, + 1, 0, 0, 0, 0, 9, 2, 2, 0, 0, + 3, 0, 3, 0, 3, 3, 3, 2, 3, 0, + 1, 2, 0, 0, 5, 0, 0, 5, 2, 0, + 0, 3, 0, 3, 0, 3, 0, 3 }; @@ -2256,298 +2258,298 @@ yyreduce: switch (yyn) { case 5: -#line 368 "fe/idl.ypp" /* yacc.c:1646 */ +#line 370 "fe/idl.ypp" /* yacc.c:1646 */ { } -#line 2263 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2265 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 6: -#line 371 "fe/idl.ypp" /* yacc.c:1646 */ +#line 373 "fe/idl.ypp" /* yacc.c:1646 */ { } -#line 2270 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2272 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 7: -#line 374 "fe/idl.ypp" /* yacc.c:1646 */ +#line 376 "fe/idl.ypp" /* yacc.c:1646 */ { } -#line 2277 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2279 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 9: -#line 384 "fe/idl.ypp" /* yacc.c:1646 */ +#line 386 "fe/idl.ypp" /* yacc.c:1646 */ { // fixed_definition : type_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 2286 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2288 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 10: -#line 389 "fe/idl.ypp" /* yacc.c:1646 */ +#line 391 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2295 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2297 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 11: -#line 394 "fe/idl.ypp" /* yacc.c:1646 */ +#line 396 "fe/idl.ypp" /* yacc.c:1646 */ { // | typeid_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 2304 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2306 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 12: -#line 399 "fe/idl.ypp" /* yacc.c:1646 */ +#line 401 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2313 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2315 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 13: -#line 404 "fe/idl.ypp" /* yacc.c:1646 */ +#line 406 "fe/idl.ypp" /* yacc.c:1646 */ { // | typeprefix_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 2322 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2324 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 14: -#line 409 "fe/idl.ypp" /* yacc.c:1646 */ +#line 411 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2331 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2333 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 15: -#line 414 "fe/idl.ypp" /* yacc.c:1646 */ +#line 416 "fe/idl.ypp" /* yacc.c:1646 */ { // | const_dcl idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 2340 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2342 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 16: -#line 419 "fe/idl.ypp" /* yacc.c:1646 */ +#line 421 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2349 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2351 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 17: -#line 424 "fe/idl.ypp" /* yacc.c:1646 */ +#line 426 "fe/idl.ypp" /* yacc.c:1646 */ { // | exception idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 2358 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2360 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 18: -#line 429 "fe/idl.ypp" /* yacc.c:1646 */ +#line 431 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2367 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2369 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 19: -#line 434 "fe/idl.ypp" /* yacc.c:1646 */ +#line 436 "fe/idl.ypp" /* yacc.c:1646 */ { // | interface_def idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceDeclSeen); } -#line 2376 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2378 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 20: -#line 439 "fe/idl.ypp" /* yacc.c:1646 */ +#line 441 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2385 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2387 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 21: -#line 444 "fe/idl.ypp" /* yacc.c:1646 */ +#line 446 "fe/idl.ypp" /* yacc.c:1646 */ { // | module idl_global->set_parse_state (IDL_GlobalData::PS_ModuleDeclSeen); } -#line 2394 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2396 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 22: -#line 449 "fe/idl.ypp" /* yacc.c:1646 */ +#line 451 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2403 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2405 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 23: -#line 454 "fe/idl.ypp" /* yacc.c:1646 */ +#line 456 "fe/idl.ypp" /* yacc.c:1646 */ { // | value_def idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeDeclSeen); } -#line 2412 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2414 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 24: -#line 459 "fe/idl.ypp" /* yacc.c:1646 */ +#line 461 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2421 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2423 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 25: -#line 464 "fe/idl.ypp" /* yacc.c:1646 */ +#line 466 "fe/idl.ypp" /* yacc.c:1646 */ { // | component idl_global->set_parse_state (IDL_GlobalData::PS_ComponentDeclSeen); } -#line 2430 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2432 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 26: -#line 469 "fe/idl.ypp" /* yacc.c:1646 */ +#line 471 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2439 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2441 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 27: -#line 474 "fe/idl.ypp" /* yacc.c:1646 */ +#line 476 "fe/idl.ypp" /* yacc.c:1646 */ { // | home_decl idl_global->set_parse_state (IDL_GlobalData::PS_HomeDeclSeen); } -#line 2448 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2450 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 28: -#line 479 "fe/idl.ypp" /* yacc.c:1646 */ +#line 481 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2457 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2459 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 29: -#line 484 "fe/idl.ypp" /* yacc.c:1646 */ +#line 486 "fe/idl.ypp" /* yacc.c:1646 */ { // | event idl_global->set_parse_state (IDL_GlobalData::PS_EventDeclSeen); } -#line 2466 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2468 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 30: -#line 489 "fe/idl.ypp" /* yacc.c:1646 */ +#line 491 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2475 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2477 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 31: -#line 494 "fe/idl.ypp" /* yacc.c:1646 */ +#line 496 "fe/idl.ypp" /* yacc.c:1646 */ { // | porttype_decl idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeDeclSeen); } -#line 2484 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2486 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 32: -#line 499 "fe/idl.ypp" /* yacc.c:1646 */ +#line 501 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2493 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2495 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 33: -#line 504 "fe/idl.ypp" /* yacc.c:1646 */ +#line 506 "fe/idl.ypp" /* yacc.c:1646 */ { // | connector_decl idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorDeclSeen); } -#line 2502 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2504 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 34: -#line 509 "fe/idl.ypp" /* yacc.c:1646 */ +#line 511 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 2511 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2513 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 35: -#line 514 "fe/idl.ypp" /* yacc.c:1646 */ +#line 516 "fe/idl.ypp" /* yacc.c:1646 */ { // | error idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 2520 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2522 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 36: -#line 519 "fe/idl.ypp" /* yacc.c:1646 */ +#line 521 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 2530 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2532 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 37: -#line 528 "fe/idl.ypp" /* yacc.c:1646 */ +#line 530 "fe/idl.ypp" /* yacc.c:1646 */ { // module_header : IDL_MODULE idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSeen); } -#line 2539 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2541 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 38: -#line 533 "fe/idl.ypp" /* yacc.c:1646 */ +#line 535 "fe/idl.ypp" /* yacc.c:1646 */ { (yyval.idlist) = (yyvsp[0].idlist); } -#line 2547 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2549 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 39: -#line 540 "fe/idl.ypp" /* yacc.c:1646 */ +#line 542 "fe/idl.ypp" /* yacc.c:1646 */ { // module : module_header idl_global->set_parse_state (IDL_GlobalData::PS_ModuleIDSeen); @@ -2586,29 +2588,29 @@ yyreduce: */ idl_global->scopes ().push (m); } -#line 2590 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2592 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 40: -#line 579 "fe/idl.ypp" /* yacc.c:1646 */ +#line 581 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_ModuleSqSeen); } -#line 2599 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2601 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 41: -#line 584 "fe/idl.ypp" /* yacc.c:1646 */ +#line 586 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_definition idl_global->set_parse_state (IDL_GlobalData::PS_ModuleBodySeen); } -#line 2608 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2610 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 42: -#line 589 "fe/idl.ypp" /* yacc.c:1646 */ +#line 591 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_ModuleQsSeen); @@ -2618,19 +2620,19 @@ yyreduce: idl_global->scopes ().pop (); } -#line 2622 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2624 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 43: -#line 602 "fe/idl.ypp" /* yacc.c:1646 */ +#line 604 "fe/idl.ypp" /* yacc.c:1646 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleIDSeen); } -#line 2630 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2632 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 44: -#line 609 "fe/idl.ypp" /* yacc.c:1646 */ +#line 611 "fe/idl.ypp" /* yacc.c:1646 */ { // template_module : template_module_header // The module_header rule is common to template module, fixed @@ -2645,11 +2647,11 @@ yyreduce: IDL_GlobalData::PS_ModuleIDSeen); } } -#line 2649 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2651 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 45: -#line 624 "fe/idl.ypp" /* yacc.c:1646 */ +#line 626 "fe/idl.ypp" /* yacc.c:1646 */ { if (FE_Utils::duplicate_param_id ((yyvsp[0].plval))) { @@ -2659,11 +2661,11 @@ yyreduce: return 1; } } -#line 2663 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2665 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 46: -#line 634 "fe/idl.ypp" /* yacc.c:1646 */ +#line 636 "fe/idl.ypp" /* yacc.c:1646 */ { // '>' idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleParamsSeen); @@ -2694,27 +2696,27 @@ yyreduce: // of the template module. idl_global->current_params ((yyvsp[-2].plval)); } -#line 2698 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2700 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 47: -#line 665 "fe/idl.ypp" /* yacc.c:1646 */ +#line 667 "fe/idl.ypp" /* yacc.c:1646 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleSqSeen); } -#line 2706 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2708 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 48: -#line 669 "fe/idl.ypp" /* yacc.c:1646 */ +#line 671 "fe/idl.ypp" /* yacc.c:1646 */ { idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleBodySeen); } -#line 2714 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2716 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 49: -#line 673 "fe/idl.ypp" /* yacc.c:1646 */ +#line 675 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_TmplModuleQsSeen); @@ -2732,31 +2734,31 @@ yyreduce: // that we are no longer in a template module scope. idl_global->current_params (0); } -#line 2736 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2738 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 55: -#line 708 "fe/idl.ypp" /* yacc.c:1646 */ +#line 710 "fe/idl.ypp" /* yacc.c:1646 */ { // template_module_ref : IDL_ALIAS scoped_name idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefSeen); } -#line 2746 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2748 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 56: -#line 714 "fe/idl.ypp" /* yacc.c:1646 */ +#line 716 "fe/idl.ypp" /* yacc.c:1646 */ { // '<' at_least_one_formal_parameter_name '>' idl_global->set_parse_state ( IDL_GlobalData::PS_ModuleRefParamsSeen); } -#line 2756 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2758 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 57: -#line 720 "fe/idl.ypp" /* yacc.c:1646 */ +#line 722 "fe/idl.ypp" /* yacc.c:1646 */ { // id idl_global->set_parse_state ( @@ -2835,31 +2837,31 @@ yyreduce: idl_global->in_tmpl_mod_no_alias (itmna_flag); idl_global->in_tmpl_mod_alias (false); } -#line 2839 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2841 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 58: -#line 802 "fe/idl.ypp" /* yacc.c:1646 */ +#line 804 "fe/idl.ypp" /* yacc.c:1646 */ { // template_module_inst : template_module_header idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleSeen); } -#line 2849 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2851 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 59: -#line 808 "fe/idl.ypp" /* yacc.c:1646 */ +#line 810 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_actual_parameter '>' idl_global->set_parse_state ( IDL_GlobalData::PS_InstModuleArgsSeen); } -#line 2859 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2861 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 60: -#line 814 "fe/idl.ypp" /* yacc.c:1646 */ +#line 816 "fe/idl.ypp" /* yacc.c:1646 */ { // id idl_global->set_parse_state ( @@ -2922,11 +2924,11 @@ yyreduce: idl_global->set_err_count (idl_global->err_count () + 1); } } -#line 2926 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2928 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 63: -#line 885 "fe/idl.ypp" /* yacc.c:1646 */ +#line 887 "fe/idl.ypp" /* yacc.c:1646 */ { // interface : interface_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -2965,29 +2967,29 @@ yyreduce: */ idl_global->scopes ().push (i); } -#line 2969 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2971 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 64: -#line 924 "fe/idl.ypp" /* yacc.c:1646 */ +#line 926 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSqSeen); } -#line 2978 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2980 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 65: -#line 929 "fe/idl.ypp" /* yacc.c:1646 */ +#line 931 "fe/idl.ypp" /* yacc.c:1646 */ { // exports idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceBodySeen); } -#line 2987 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 2989 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 66: -#line 934 "fe/idl.ypp" /* yacc.c:1646 */ +#line 936 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceQsSeen); @@ -2997,30 +2999,30 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3001 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3003 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 67: -#line 947 "fe/idl.ypp" /* yacc.c:1646 */ +#line 949 "fe/idl.ypp" /* yacc.c:1646 */ { // interface_decl : IDL_INTERFACE idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceSeen); } -#line 3010 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3012 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 68: -#line 952 "fe/idl.ypp" /* yacc.c:1646 */ +#line 954 "fe/idl.ypp" /* yacc.c:1646 */ { // id idl_global->set_parse_state (IDL_GlobalData::PS_InterfaceIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3020 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3022 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 69: -#line 961 "fe/idl.ypp" /* yacc.c:1646 */ +#line 963 "fe/idl.ypp" /* yacc.c:1646 */ { // interface_header : interface_decl inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3057,11 +3059,11 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3061 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3063 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 70: -#line 999 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1001 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_LOCAL interface_decl inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3091,11 +3093,11 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3095 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3097 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 71: -#line 1030 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1032 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_ABSTRACT interface_decl inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); @@ -3125,39 +3127,39 @@ yyreduce: (yyvsp[0].nlval) = 0; } } -#line 3129 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3131 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 72: -#line 1063 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1065 "fe/idl.ypp" /* yacc.c:1646 */ { // inheritance_spec : ':' opt_truncatable idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 3138 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3140 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 73: -#line 1068 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1070 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_scoped_name (yyvsp[0].nlval)->truncatable ((yyvsp[-2].bval)); (yyval.nlval) = (yyvsp[0].nlval); } -#line 3148 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3150 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 74: -#line 1074 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1076 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.nlval) = 0; } -#line 3157 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3159 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 79: -#line 1089 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1091 "fe/idl.ypp" /* yacc.c:1646 */ { // valuetype : IDL_CUSTOM value_concrete_decl ACE_DEBUG ((LM_DEBUG, @@ -3168,11 +3170,11 @@ yyreduce: ACE_TEXT ("Sorry, I (TAO_IDL) can't handle") ACE_TEXT (" custom yet\n"))); } -#line 3172 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3174 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 81: -#line 1104 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1106 "fe/idl.ypp" /* yacc.c:1646 */ { // value_concrete_decl : value_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3216,29 +3218,29 @@ yyreduce: */ idl_global->scopes ().push (v); } -#line 3220 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3222 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 82: -#line 1148 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1150 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3229 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3231 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 83: -#line 1153 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1155 "fe/idl.ypp" /* yacc.c:1646 */ { // value_elements idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3238 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3240 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 84: -#line 1158 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1160 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen); @@ -3258,11 +3260,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3262 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3264 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 85: -#line 1182 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1184 "fe/idl.ypp" /* yacc.c:1646 */ { // value_abs_decl : IDL_ABSTRACT value_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3306,29 +3308,29 @@ yyreduce: */ idl_global->scopes ().push (v); } -#line 3310 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3312 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 86: -#line 1226 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1228 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSqSeen); } -#line 3319 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3321 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 87: -#line 1231 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1233 "fe/idl.ypp" /* yacc.c:1646 */ { // exports idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeBodySeen); } -#line 3328 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3330 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 88: -#line 1236 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1238 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeQsSeen); @@ -3338,20 +3340,20 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 3342 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3344 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 89: -#line 1250 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1252 "fe/idl.ypp" /* yacc.c:1646 */ { // value_header : value_decl inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 3351 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3353 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 90: -#line 1255 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1257 "fe/idl.ypp" /* yacc.c:1646 */ { // supports_spec idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -3383,66 +3385,66 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 3387 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3389 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 91: -#line 1290 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1292 "fe/idl.ypp" /* yacc.c:1646 */ { // value_decl : IDL_VALUETYPE idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeSeen); } -#line 3396 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3398 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 92: -#line 1295 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1297 "fe/idl.ypp" /* yacc.c:1646 */ { // id idl_global->set_parse_state (IDL_GlobalData::PS_ValueTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 3406 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3408 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 93: -#line 1304 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1306 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_truncatable : IDL_TRUNCATABLE (yyval.bval) = true; } -#line 3415 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3417 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 94: -#line 1309 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1311 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.bval) = false; } -#line 3424 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3426 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 95: -#line 1318 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1320 "fe/idl.ypp" /* yacc.c:1646 */ { // supports_spec : IDL_SUPPORTS at_least_one_scoped_name (yyval.nlval) = (yyvsp[0].nlval); } -#line 3433 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3435 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 96: -#line 1323 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1325 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.nlval) = 0; } -#line 3442 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3444 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 97: -#line 1332 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1334 "fe/idl.ypp" /* yacc.c:1646 */ { // value_forward_decl : IDL_ABSTRACT value_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3466,11 +3468,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3470 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3472 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 98: -#line 1357 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1359 "fe/idl.ypp" /* yacc.c:1646 */ { // | value_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3494,11 +3496,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3498 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3500 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 99: -#line 1384 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1386 "fe/idl.ypp" /* yacc.c:1646 */ { // value_box_decl : value_decl type_spec idl_global->set_parse_state (IDL_GlobalData::PS_ValueBoxDeclSeen); @@ -3560,192 +3562,192 @@ yyreduce: delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 3564 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3566 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 105: -#line 1461 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1463 "fe/idl.ypp" /* yacc.c:1646 */ { // state_member : IDL_PUBLIC /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_PUBLIC; } -#line 3574 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3576 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 106: -#line 1467 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1469 "fe/idl.ypp" /* yacc.c:1646 */ { // member_i } -#line 3582 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3584 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 107: -#line 1471 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1473 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_PRIVATE /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_PRIVATE; } -#line 3592 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3594 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 108: -#line 1477 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1479 "fe/idl.ypp" /* yacc.c:1646 */ { // member_i } -#line 3600 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3602 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 111: -#line 1489 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1491 "fe/idl.ypp" /* yacc.c:1646 */ { // export : type_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypeDeclSeen); } -#line 3609 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3611 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 112: -#line 1494 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1496 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3618 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3620 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 113: -#line 1499 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1501 "fe/idl.ypp" /* yacc.c:1646 */ { // | typeid_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypeIdDeclSeen); } -#line 3627 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3629 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 114: -#line 1504 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1506 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3636 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3638 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 115: -#line 1509 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1511 "fe/idl.ypp" /* yacc.c:1646 */ { // | typeprefix_dcl idl_global->set_parse_state (IDL_GlobalData::PS_TypePrefixDeclSeen); } -#line 3645 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3647 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 116: -#line 1514 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1516 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3654 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3656 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 117: -#line 1519 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1521 "fe/idl.ypp" /* yacc.c:1646 */ { // | const_dcl idl_global->set_parse_state (IDL_GlobalData::PS_ConstDeclSeen); } -#line 3663 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3665 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 118: -#line 1524 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1526 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state(IDL_GlobalData::PS_NoState); } -#line 3672 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3674 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 119: -#line 1529 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1531 "fe/idl.ypp" /* yacc.c:1646 */ { // | exception idl_global->set_parse_state (IDL_GlobalData::PS_ExceptDeclSeen); } -#line 3681 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3683 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 120: -#line 1534 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1536 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3690 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3692 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 121: -#line 1539 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1541 "fe/idl.ypp" /* yacc.c:1646 */ { // | attribute idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 3699 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3701 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 122: -#line 1544 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1546 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3708 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3710 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 123: -#line 1549 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1551 "fe/idl.ypp" /* yacc.c:1646 */ { // | operation idl_global->set_parse_state (IDL_GlobalData::PS_OpDeclSeen); } -#line 3717 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3719 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 124: -#line 1554 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1556 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 3726 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3728 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 125: -#line 1559 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1561 "fe/idl.ypp" /* yacc.c:1646 */ { // | error idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 3735 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3737 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 126: -#line 1564 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1566 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 3745 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3747 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 127: -#line 1573 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1575 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_scoped_name : scoped_name scoped_names ACE_NEW_RETURN ((yyval.nlval), @@ -3753,20 +3755,20 @@ yyreduce: (yyvsp[0].nlval)), 1); } -#line 3757 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3759 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 128: -#line 1585 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1587 "fe/idl.ypp" /* yacc.c:1646 */ { // scoped_names : scoped_names ',' idl_global->set_parse_state (IDL_GlobalData::PS_SNListCommaSeen); } -#line 3766 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3768 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 129: -#line 1590 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1592 "fe/idl.ypp" /* yacc.c:1646 */ { // scoped_name idl_global->set_parse_state (IDL_GlobalData::PS_ScopedNameSeen); @@ -3787,20 +3789,20 @@ yyreduce: (yyval.nlval) = (yyvsp[-3].nlval); } } -#line 3791 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3793 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 130: -#line 1611 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1613 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.nlval) = 0; } -#line 3800 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3802 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 131: -#line 1619 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1621 "fe/idl.ypp" /* yacc.c:1646 */ { // scoped_name : id idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -3810,20 +3812,20 @@ yyreduce: 0), 1); } -#line 3814 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3816 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 132: -#line 1629 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1631 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_SCOPE_DELIMITOR idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); } -#line 3823 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3825 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 133: -#line 1634 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1636 "fe/idl.ypp" /* yacc.c:1646 */ { // id idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -3844,11 +3846,11 @@ yyreduce: sn), 1); } -#line 3848 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3850 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 134: -#line 1656 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1658 "fe/idl.ypp" /* yacc.c:1646 */ { // | scoped_name IDL_SCOPE_DELIMITOR idl_global->set_parse_state (IDL_GlobalData::PS_ScopeDelimSeen); @@ -3859,11 +3861,11 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3863 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3865 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 135: -#line 1667 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1669 "fe/idl.ypp" /* yacc.c:1646 */ { // id idl_global->set_parse_state (IDL_GlobalData::PS_SN_IDSeen); @@ -3876,11 +3878,11 @@ yyreduce: (yyvsp[-3].idlist)->nconc (sn); (yyval.idlist) = (yyvsp[-3].idlist); } -#line 3880 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3882 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 136: -#line 1682 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1684 "fe/idl.ypp" /* yacc.c:1646 */ { // id: IDENTIFIER ACE_NEW_RETURN ((yyval.idval), @@ -3889,11 +3891,11 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 3893 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3895 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 137: -#line 1694 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1696 "fe/idl.ypp" /* yacc.c:1646 */ { // interface_forward : interface_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3938,11 +3940,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3942 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3944 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 138: -#line 1740 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1742 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_LOCAL interface_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -3969,11 +3971,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 3973 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 3975 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 139: -#line 1768 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1770 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_ABSTRACT interface_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -4000,47 +4002,47 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 4004 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4006 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 140: -#line 1798 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1800 "fe/idl.ypp" /* yacc.c:1646 */ { // const_dcl : IDL_CONST idl_global->set_parse_state (IDL_GlobalData::PS_ConstSeen); } -#line 4013 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4015 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 141: -#line 1803 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1805 "fe/idl.ypp" /* yacc.c:1646 */ { // const_type idl_global->set_parse_state (IDL_GlobalData::PS_ConstTypeSeen); } -#line 4022 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4024 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 142: -#line 1808 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1810 "fe/idl.ypp" /* yacc.c:1646 */ { // id idl_global->set_parse_state (IDL_GlobalData::PS_ConstIDSeen); } -#line 4031 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4033 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 143: -#line 1813 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1815 "fe/idl.ypp" /* yacc.c:1646 */ { // '=' idl_global->set_parse_state (IDL_GlobalData::PS_ConstAssignSeen); } -#line 4040 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4042 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 144: -#line 1818 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1820 "fe/idl.ypp" /* yacc.c:1646 */ { // expression UTL_ScopedName n ((yyvsp[-4].idval), @@ -4104,11 +4106,11 @@ yyreduce: result = 0; } } -#line 4108 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4110 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 151: -#line 1891 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1893 "fe/idl.ypp" /* yacc.c:1646 */ { // const_type // : integer_type @@ -4120,20 +4122,20 @@ yyreduce: // | string_type_spec (yyval.etval) = AST_Expression::EV_string; } -#line 4124 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4126 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 152: -#line 1903 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1905 "fe/idl.ypp" /* yacc.c:1646 */ { // | wstring_type_spec (yyval.etval) = AST_Expression::EV_wstring; } -#line 4133 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4135 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 153: -#line 1908 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1910 "fe/idl.ypp" /* yacc.c:1646 */ { // | scoped_name UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -4200,11 +4202,11 @@ yyreduce: sn = 0; (yyvsp[0].idlist) = 0; } -#line 4204 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4206 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 157: -#line 1982 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1984 "fe/idl.ypp" /* yacc.c:1646 */ { // or_expr : xor_expr // | or_expr '|' xor_expr @@ -4215,11 +4217,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4219 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4221 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 159: -#line 1997 "fe/idl.ypp" /* yacc.c:1646 */ +#line 1999 "fe/idl.ypp" /* yacc.c:1646 */ { // xor_expr : and_expr // | xor_expr '^' and_expr @@ -4230,11 +4232,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4234 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4236 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 161: -#line 2012 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2014 "fe/idl.ypp" /* yacc.c:1646 */ { // and_expr : shift_expr | and_expr '&' shift_expr (yyval.exval) = @@ -4244,11 +4246,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4248 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4250 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 163: -#line 2026 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2028 "fe/idl.ypp" /* yacc.c:1646 */ { // shift_expr : add_expr | shift_expr IDL_LEFT_SHIFT add_expr (yyval.exval) = @@ -4258,11 +4260,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4262 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4264 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 164: -#line 2036 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2038 "fe/idl.ypp" /* yacc.c:1646 */ { // | shift_expr IDL_RIGHT_SHIFT add_expr (yyval.exval) = @@ -4272,11 +4274,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4276 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4278 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 166: -#line 2050 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2052 "fe/idl.ypp" /* yacc.c:1646 */ { // add_expr : mult_expr | add_expr '+' mult_expr (yyval.exval) = @@ -4286,11 +4288,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4290 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4292 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 167: -#line 2060 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2062 "fe/idl.ypp" /* yacc.c:1646 */ { // | add_expr '-' mult_expr (yyval.exval) = @@ -4300,11 +4302,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4304 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4306 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 169: -#line 2074 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2076 "fe/idl.ypp" /* yacc.c:1646 */ { // mult_expr : unary_expr | mult_expr '*' unary_expr (yyval.exval) = @@ -4314,11 +4316,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4318 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4320 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 170: -#line 2084 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2086 "fe/idl.ypp" /* yacc.c:1646 */ { // | mult_expr '/' unary_expr (yyval.exval) = @@ -4328,11 +4330,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4332 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4334 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 171: -#line 2094 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2096 "fe/idl.ypp" /* yacc.c:1646 */ { // | mult_expr '%' unary_expr (yyval.exval) = @@ -4342,11 +4344,11 @@ yyreduce: (yyvsp[0].exval) ); } -#line 4346 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4348 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 173: -#line 2108 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2110 "fe/idl.ypp" /* yacc.c:1646 */ { // unary_expr : primary_expr | '+' primary_expr (yyval.exval) = @@ -4356,11 +4358,11 @@ yyreduce: 0 ); } -#line 4360 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4362 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 174: -#line 2118 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2120 "fe/idl.ypp" /* yacc.c:1646 */ { // | '-' primary_expr (yyval.exval) = @@ -4370,11 +4372,11 @@ yyreduce: 0 ); } -#line 4374 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4376 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 175: -#line 2128 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2130 "fe/idl.ypp" /* yacc.c:1646 */ { // | '~' primary_expr (yyval.exval) = @@ -4384,11 +4386,11 @@ yyreduce: 0 ); } -#line 4388 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4390 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 176: -#line 2141 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2143 "fe/idl.ypp" /* yacc.c:1646 */ { // primary_expr : scoped_name /* @@ -4439,40 +4441,40 @@ yyreduce: delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 4443 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4445 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 178: -#line 2193 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2195 "fe/idl.ypp" /* yacc.c:1646 */ { // | literal // | '(' const_expr ')' (yyval.exval) = (yyvsp[-1].exval); } -#line 4453 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4455 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 179: -#line 2202 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2204 "fe/idl.ypp" /* yacc.c:1646 */ { // literal : IDL_INTEGER_LITERAL (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].ival)); } -#line 4462 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4464 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 180: -#line 2207 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2209 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_UINTEGER_LITERAL (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].uival)); } -#line 4472 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4474 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 181: -#line 2213 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2215 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_STRING_LITERAL (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].sval)); @@ -4480,66 +4482,74 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 4484 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4486 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 182: -#line 2221 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2223 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_WSTRING_LITERAL (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].wsval)); } -#line 4493 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4495 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 183: -#line 2226 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2228 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_CHARACTER_LITERAL (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].cval)); } -#line 4502 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4504 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 184: -#line 2231 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2233 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_WCHAR_LITERAL ACE_OutputCDR::from_wchar wc ((yyvsp[0].wcval)); (yyval.exval) = idl_global->gen ()->create_expr (wc); } -#line 4512 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4514 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; case 185: -#line 2237 "fe/idl.ypp" /* yacc.c:1646 */ +#line 2239 "fe/idl.ypp" /* yacc.c:1646 */ + { + (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].fixval)); + } +#line 4522 "fe/idl.tab.cpp" /* yacc.c:1646 */ + break; + + case 186: +#line 2243 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_FLOATING_PT_LITERAL (yyval.exval) = idl_global->gen ()->create_expr ((yyvsp[0].dval)); } -#line 4521 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4531 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 186: -#line 2242 "fe/idl.ypp" /* yacc.c:1646 */ + case 187: +#line 2248 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_TRUETOK (yyval.exval) = idl_global->gen ()->create_expr (true); } -#line 4530 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4540 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 187: -#line 2247 "fe/idl.ypp" /* yacc.c:1646 */ + case 188: +#line 2253 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_FALSETOK (yyval.exval) = idl_global->gen ()->create_expr (false); } -#line 4539 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4549 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 188: -#line 2255 "fe/idl.ypp" /* yacc.c:1646 */ + case 189: +#line 2261 "fe/idl.ypp" /* yacc.c:1646 */ { // positive_int_expr : const_expr int good_expression = 1; @@ -4607,57 +4617,57 @@ yyreduce: idl_global->err ()->syntax_error (idl_global->parse_state ()); } } -#line 4611 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4621 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 189: -#line 2326 "fe/idl.ypp" /* yacc.c:1646 */ + case 190: +#line 2332 "fe/idl.ypp" /* yacc.c:1646 */ { // type_dcl : IDL_TYPEDEF idl_global->set_parse_state (IDL_GlobalData::PS_TypedefSeen); idl_global->in_typedef (true); } -#line 4621 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4631 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 190: -#line 2332 "fe/idl.ypp" /* yacc.c:1646 */ + case 191: +#line 2338 "fe/idl.ypp" /* yacc.c:1646 */ { // type_declarator (yyval.dcval) = 0; } -#line 4630 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4640 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 191: -#line 2337 "fe/idl.ypp" /* yacc.c:1646 */ + case 192: +#line 2343 "fe/idl.ypp" /* yacc.c:1646 */ { // | struct_type (yyval.dcval) = 0; } -#line 4639 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4649 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 192: -#line 2342 "fe/idl.ypp" /* yacc.c:1646 */ + case 193: +#line 2348 "fe/idl.ypp" /* yacc.c:1646 */ { // | union_type (yyval.dcval) = 0; } -#line 4648 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4658 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 193: -#line 2347 "fe/idl.ypp" /* yacc.c:1646 */ + case 194: +#line 2353 "fe/idl.ypp" /* yacc.c:1646 */ { // | enum_type (yyval.dcval) = 0; } -#line 4657 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4667 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 194: -#line 2352 "fe/idl.ypp" /* yacc.c:1646 */ + case 195: +#line 2358 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_NATIVE simple_declarator UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -4684,29 +4694,29 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 4688 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4698 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 195: -#line 2379 "fe/idl.ypp" /* yacc.c:1646 */ + case 196: +#line 2385 "fe/idl.ypp" /* yacc.c:1646 */ { // | constructed_forward_type_spec (yyval.dcval) = 0; } -#line 4697 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4707 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 196: -#line 2387 "fe/idl.ypp" /* yacc.c:1646 */ + case 197: +#line 2393 "fe/idl.ypp" /* yacc.c:1646 */ { // type_declarator : type_spec idl_global->set_parse_state (IDL_GlobalData::PS_TypeSpecSeen); } -#line 4706 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4716 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 197: -#line 2392 "fe/idl.ypp" /* yacc.c:1646 */ + case 198: +#line 2398 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_declarator UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -4770,11 +4780,11 @@ yyreduce: (yyvsp[0].dlval) = 0; } } -#line 4774 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4784 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 200: -#line 2464 "fe/idl.ypp" /* yacc.c:1646 */ + case 201: +#line 2470 "fe/idl.ypp" /* yacc.c:1646 */ { // simple_type_spec : base_type_spec (yyval.dcval) = @@ -4782,11 +4792,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 4786 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4796 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 202: -#line 2473 "fe/idl.ypp" /* yacc.c:1646 */ + case 203: +#line 2479 "fe/idl.ypp" /* yacc.c:1646 */ { // | template_type_spec // | scoped_name @@ -4811,11 +4821,11 @@ yyreduce: (yyval.dcval) = d; } -#line 4815 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4825 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 220: -#line 2530 "fe/idl.ypp" /* yacc.c:1646 */ + case 221: +#line 2536 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_declarator : declarator declarators ACE_NEW_RETURN ((yyval.dlval), @@ -4823,20 +4833,20 @@ yyreduce: (yyvsp[0].dlval)), 1); } -#line 4827 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4837 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 221: -#line 2542 "fe/idl.ypp" /* yacc.c:1646 */ + case 222: +#line 2548 "fe/idl.ypp" /* yacc.c:1646 */ { // declarators : declarators ',' idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 4836 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4846 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 222: -#line 2547 "fe/idl.ypp" /* yacc.c:1646 */ + case 223: +#line 2553 "fe/idl.ypp" /* yacc.c:1646 */ { // declarator idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -4857,20 +4867,20 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 4861 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4871 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 223: -#line 2568 "fe/idl.ypp" /* yacc.c:1646 */ + case 224: +#line 2574 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.dlval) = 0; } -#line 4870 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4880 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 226: -#line 2581 "fe/idl.ypp" /* yacc.c:1646 */ + case 227: +#line 2587 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_simple_declarator : simple_declarator simple_declarators ACE_NEW_RETURN ((yyval.dlval), @@ -4878,20 +4888,20 @@ yyreduce: (yyvsp[0].dlval)), 1); } -#line 4882 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4892 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 227: -#line 2593 "fe/idl.ypp" /* yacc.c:1646 */ + case 228: +#line 2599 "fe/idl.ypp" /* yacc.c:1646 */ { // simple_declarators : simple_declarators ',' idl_global->set_parse_state (IDL_GlobalData::PS_DeclsCommaSeen); } -#line 4891 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4901 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 228: -#line 2598 "fe/idl.ypp" /* yacc.c:1646 */ + case 229: +#line 2604 "fe/idl.ypp" /* yacc.c:1646 */ { // simple_declarator idl_global->set_parse_state (IDL_GlobalData::PS_DeclsDeclSeen); @@ -4912,20 +4922,20 @@ yyreduce: (yyval.dlval) = (yyvsp[-3].dlval); } } -#line 4916 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4926 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 229: -#line 2619 "fe/idl.ypp" /* yacc.c:1646 */ + case 230: +#line 2625 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.dlval) = 0; } -#line 4925 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4935 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 230: -#line 2627 "fe/idl.ypp" /* yacc.c:1646 */ + case 231: +#line 2633 "fe/idl.ypp" /* yacc.c:1646 */ { // simple_declarator : id UTL_ScopedName *sn = 0; @@ -4939,11 +4949,11 @@ yyreduce: 0), 1); } -#line 4943 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4953 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 231: -#line 2644 "fe/idl.ypp" /* yacc.c:1646 */ + case 232: +#line 2650 "fe/idl.ypp" /* yacc.c:1646 */ { // complex_declarator : array_declarator UTL_ScopedName *sn = 0; @@ -4959,174 +4969,174 @@ yyreduce: (yyvsp[0].dcval)), 1); } -#line 4963 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4973 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 234: -#line 2668 "fe/idl.ypp" /* yacc.c:1646 */ + case 235: +#line 2674 "fe/idl.ypp" /* yacc.c:1646 */ { // signed_int : IDL_LONG (yyval.etval) = AST_Expression::EV_long; } -#line 4972 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4982 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 235: -#line 2673 "fe/idl.ypp" /* yacc.c:1646 */ + case 236: +#line 2679 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_LONG IDL_LONG (yyval.etval) = AST_Expression::EV_longlong; } -#line 4981 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 4991 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 236: -#line 2678 "fe/idl.ypp" /* yacc.c:1646 */ + case 237: +#line 2684 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_SHORT (yyval.etval) = AST_Expression::EV_short; } -#line 4990 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5000 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 237: -#line 2686 "fe/idl.ypp" /* yacc.c:1646 */ + case 238: +#line 2692 "fe/idl.ypp" /* yacc.c:1646 */ { // unsigned_int : IDL_UNSIGNED IDL_LONG (yyval.etval) = AST_Expression::EV_ulong; } -#line 4999 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5009 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 238: -#line 2691 "fe/idl.ypp" /* yacc.c:1646 */ + case 239: +#line 2697 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_UNSIGNED IDL_LONG IDL_LONG (yyval.etval) = AST_Expression::EV_ulonglong; } -#line 5008 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5018 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 239: -#line 2696 "fe/idl.ypp" /* yacc.c:1646 */ + case 240: +#line 2702 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_UNSIGNED IDL_SHORT (yyval.etval) = AST_Expression::EV_ushort; } -#line 5017 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5027 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 240: -#line 2704 "fe/idl.ypp" /* yacc.c:1646 */ + case 241: +#line 2710 "fe/idl.ypp" /* yacc.c:1646 */ { // floating_pt_type : IDL_DOUBLE (yyval.etval) = AST_Expression::EV_double; } -#line 5026 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5036 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 241: -#line 2709 "fe/idl.ypp" /* yacc.c:1646 */ + case 242: +#line 2715 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_FLOAT (yyval.etval) = AST_Expression::EV_float; } -#line 5035 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5045 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 242: -#line 2714 "fe/idl.ypp" /* yacc.c:1646 */ + case 243: +#line 2720 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_LONG IDL_DOUBLE (yyval.etval) = AST_Expression::EV_longdouble; } -#line 5044 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5054 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 243: -#line 2722 "fe/idl.ypp" /* yacc.c:1646 */ + case 244: +#line 2728 "fe/idl.ypp" /* yacc.c:1646 */ { // fixed_type : IDL_FIXED (yyval.etval) = AST_Expression::EV_fixed; } -#line 5053 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5063 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 244: -#line 2730 "fe/idl.ypp" /* yacc.c:1646 */ + case 245: +#line 2736 "fe/idl.ypp" /* yacc.c:1646 */ { // char_type : IDL_CHAR (yyval.etval) = AST_Expression::EV_char; } -#line 5062 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5072 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 245: -#line 2735 "fe/idl.ypp" /* yacc.c:1646 */ + case 246: +#line 2741 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_WCHAR (yyval.etval) = AST_Expression::EV_wchar; } -#line 5071 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5081 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 246: -#line 2743 "fe/idl.ypp" /* yacc.c:1646 */ + case 247: +#line 2749 "fe/idl.ypp" /* yacc.c:1646 */ { // octet_type : IDL_OCTET (yyval.etval) = AST_Expression::EV_octet; } -#line 5080 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5090 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 247: -#line 2751 "fe/idl.ypp" /* yacc.c:1646 */ + case 248: +#line 2757 "fe/idl.ypp" /* yacc.c:1646 */ { // boolean_type : IDL_BOOLEAN (yyval.etval) = AST_Expression::EV_bool; } -#line 5089 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5099 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 248: -#line 2759 "fe/idl.ypp" /* yacc.c:1646 */ + case 249: +#line 2765 "fe/idl.ypp" /* yacc.c:1646 */ { // any_type : IDL_ANY (yyval.etval) = AST_Expression::EV_any; } -#line 5098 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5108 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 249: -#line 2767 "fe/idl.ypp" /* yacc.c:1646 */ + case 250: +#line 2773 "fe/idl.ypp" /* yacc.c:1646 */ { // object_type : IDL_OBJECT (yyval.etval) = AST_Expression::EV_object; } -#line 5107 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5117 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 250: -#line 2775 "fe/idl.ypp" /* yacc.c:1646 */ + case 251: +#line 2781 "fe/idl.ypp" /* yacc.c:1646 */ { // struct_decl : IDL_STRUCT idl_global->set_parse_state (IDL_GlobalData::PS_StructSeen); } -#line 5116 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5126 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 251: -#line 2780 "fe/idl.ypp" /* yacc.c:1646 */ + case 252: +#line 2786 "fe/idl.ypp" /* yacc.c:1646 */ { // id idl_global->set_parse_state (IDL_GlobalData::PS_StructIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5126 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5136 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 252: -#line 2790 "fe/idl.ypp" /* yacc.c:1646 */ + case 253: +#line 2796 "fe/idl.ypp" /* yacc.c:1646 */ { // struct_type : struct_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5160,29 +5170,29 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5164 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5174 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 253: -#line 2824 "fe/idl.ypp" /* yacc.c:1646 */ + case 254: +#line 2830 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_StructSqSeen); } -#line 5173 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5183 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 254: -#line 2829 "fe/idl.ypp" /* yacc.c:1646 */ + case 255: +#line 2835 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_member idl_global->set_parse_state (IDL_GlobalData::PS_StructBodySeen); } -#line 5182 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5192 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 255: -#line 2834 "fe/idl.ypp" /* yacc.c:1646 */ + case 256: +#line 2840 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_StructQsSeen); @@ -5195,39 +5205,39 @@ yyreduce: ); idl_global->scopes ().pop (); } -#line 5199 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5209 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 259: -#line 2856 "fe/idl.ypp" /* yacc.c:1646 */ + case 260: +#line 2862 "fe/idl.ypp" /* yacc.c:1646 */ { // member : /* is $0 to member_i */ (yyval.vival) = AST_Field::vis_NA; } -#line 5209 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5219 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 261: -#line 2866 "fe/idl.ypp" /* yacc.c:1646 */ + case 262: +#line 2872 "fe/idl.ypp" /* yacc.c:1646 */ { // member_i : type_spec idl_global->set_parse_state (IDL_GlobalData::PS_MemberTypeSeen); } -#line 5218 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5228 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 262: -#line 2871 "fe/idl.ypp" /* yacc.c:1646 */ + case 263: +#line 2877 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_declarator idl_global->set_parse_state (IDL_GlobalData::PS_MemberDeclsSeen); } -#line 5227 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5237 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 263: -#line 2876 "fe/idl.ypp" /* yacc.c:1646 */ + case 264: +#line 2882 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5285,58 +5295,58 @@ yyreduce: delete (yyvsp[-2].dlval); (yyvsp[-2].dlval) = 0; } -#line 5289 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5299 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 264: -#line 2934 "fe/idl.ypp" /* yacc.c:1646 */ + case 265: +#line 2940 "fe/idl.ypp" /* yacc.c:1646 */ { // | error idl_global->err()->syntax_error (idl_global->parse_state ()); } -#line 5298 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5308 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 265: -#line 2939 "fe/idl.ypp" /* yacc.c:1646 */ + case 266: +#line 2945 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 5308 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5318 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 266: -#line 2948 "fe/idl.ypp" /* yacc.c:1646 */ + case 267: +#line 2954 "fe/idl.ypp" /* yacc.c:1646 */ { // union_decl : IDL_UNION idl_global->set_parse_state (IDL_GlobalData::PS_UnionSeen); } -#line 5317 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5327 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 267: -#line 2953 "fe/idl.ypp" /* yacc.c:1646 */ + case 268: +#line 2959 "fe/idl.ypp" /* yacc.c:1646 */ { // id idl_global->set_parse_state (IDL_GlobalData::PS_UnionIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 5327 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5337 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 268: -#line 2962 "fe/idl.ypp" /* yacc.c:1646 */ + case 269: +#line 2968 "fe/idl.ypp" /* yacc.c:1646 */ { // union_type : union_decl IDL_SWITCH idl_global->set_parse_state (IDL_GlobalData::PS_SwitchSeen); } -#line 5336 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5346 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 269: -#line 2967 "fe/idl.ypp" /* yacc.c:1646 */ + case 270: +#line 2973 "fe/idl.ypp" /* yacc.c:1646 */ { // '(' UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5372,20 +5382,20 @@ yyreduce: * Don't delete $1 yet; we'll need it a bit later. */ } -#line 5376 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5386 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 270: -#line 3003 "fe/idl.ypp" /* yacc.c:1646 */ + case 271: +#line 3009 "fe/idl.ypp" /* yacc.c:1646 */ { // switch_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_SwitchTypeSeen); } -#line 5385 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5395 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 271: -#line 3008 "fe/idl.ypp" /* yacc.c:1646 */ + case 272: +#line 3014 "fe/idl.ypp" /* yacc.c:1646 */ { // ')' /* @@ -5447,29 +5457,29 @@ yyreduce: delete (yyvsp[-7].idval); (yyvsp[-7].idval) = 0; } -#line 5451 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5461 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 272: -#line 3070 "fe/idl.ypp" /* yacc.c:1646 */ + case 273: +#line 3076 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_UnionSqSeen); } -#line 5460 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5470 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 273: -#line 3075 "fe/idl.ypp" /* yacc.c:1646 */ + case 274: +#line 3081 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_case_branch idl_global->set_parse_state (IDL_GlobalData::PS_UnionBodySeen); } -#line 5469 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5479 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 274: -#line 3080 "fe/idl.ypp" /* yacc.c:1646 */ + case 275: +#line 3086 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_UnionQsSeen); @@ -5486,11 +5496,11 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 5490 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5500 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 275: -#line 3100 "fe/idl.ypp" /* yacc.c:1646 */ + case 276: +#line 3106 "fe/idl.ypp" /* yacc.c:1646 */ { // switch_type_spec : integer_type (yyval.dcval) = @@ -5498,11 +5508,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5502 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5512 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 276: -#line 3108 "fe/idl.ypp" /* yacc.c:1646 */ + case 277: +#line 3114 "fe/idl.ypp" /* yacc.c:1646 */ { // | char_type /* wchars are not allowed. */ @@ -5516,11 +5526,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5520 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5530 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 277: -#line 3122 "fe/idl.ypp" /* yacc.c:1646 */ + case 278: +#line 3128 "fe/idl.ypp" /* yacc.c:1646 */ { // | octet_type /* octets are not allowed. */ @@ -5530,11 +5540,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5534 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5544 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 278: -#line 3132 "fe/idl.ypp" /* yacc.c:1646 */ + case 279: +#line 3138 "fe/idl.ypp" /* yacc.c:1646 */ { // | boolean_type (yyval.dcval) = @@ -5542,11 +5552,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 5546 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5556 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 280: -#line 3141 "fe/idl.ypp" /* yacc.c:1646 */ + case 281: +#line 3147 "fe/idl.ypp" /* yacc.c:1646 */ { // | enum_type // | scoped_name @@ -5652,29 +5662,29 @@ yyreduce: delete (yyvsp[0].idlist); (yyvsp[0].idlist) = 0; } -#line 5656 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5666 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 284: -#line 3257 "fe/idl.ypp" /* yacc.c:1646 */ + case 285: +#line 3263 "fe/idl.ypp" /* yacc.c:1646 */ { // case_branch : at_least_one_case_label idl_global->set_parse_state (IDL_GlobalData::PS_UnionLabelSeen); } -#line 5665 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5675 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 285: -#line 3262 "fe/idl.ypp" /* yacc.c:1646 */ + case 286: +#line 3268 "fe/idl.ypp" /* yacc.c:1646 */ { // element_spec idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemSeen); } -#line 5674 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5684 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 286: -#line 3267 "fe/idl.ypp" /* yacc.c:1646 */ + case 287: +#line 3273 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5705,30 +5715,30 @@ yyreduce: f = 0; } } -#line 5709 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5719 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 287: -#line 3298 "fe/idl.ypp" /* yacc.c:1646 */ + case 288: +#line 3304 "fe/idl.ypp" /* yacc.c:1646 */ { // | error idl_global->err()->syntax_error (idl_global->parse_state()); } -#line 5718 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5728 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 288: -#line 3303 "fe/idl.ypp" /* yacc.c:1646 */ + case 289: +#line 3309 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); yyerrok; } -#line 5728 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5738 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 289: -#line 3312 "fe/idl.ypp" /* yacc.c:1646 */ + case 290: +#line 3318 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_case_label : case_label case_labels ACE_NEW_RETURN ((yyval.llval), @@ -5736,11 +5746,11 @@ yyreduce: (yyvsp[0].llval)), 1); } -#line 5740 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5750 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 290: -#line 3323 "fe/idl.ypp" /* yacc.c:1646 */ + case 291: +#line 3329 "fe/idl.ypp" /* yacc.c:1646 */ { // case_labels : case_labels case_label UTL_LabelList *ll = 0; @@ -5759,29 +5769,29 @@ yyreduce: (yyval.llval) = (yyvsp[-1].llval); } } -#line 5763 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5773 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 291: -#line 3342 "fe/idl.ypp" /* yacc.c:1646 */ + case 292: +#line 3348 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.llval) = 0; } -#line 5772 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5782 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 292: -#line 3350 "fe/idl.ypp" /* yacc.c:1646 */ + case 293: +#line 3356 "fe/idl.ypp" /* yacc.c:1646 */ { // case_label : IDL_DEFAULT idl_global->set_parse_state (IDL_GlobalData::PS_DefaultSeen); } -#line 5781 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5791 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 293: -#line 3355 "fe/idl.ypp" /* yacc.c:1646 */ + case 294: +#line 3361 "fe/idl.ypp" /* yacc.c:1646 */ { // ':' idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -5791,28 +5801,28 @@ yyreduce: 0 ); } -#line 5795 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5805 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 294: -#line 3365 "fe/idl.ypp" /* yacc.c:1646 */ + case 295: +#line 3371 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_CASE idl_global->set_parse_state (IDL_GlobalData::PS_CaseSeen); } -#line 5804 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5814 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 295: -#line 3370 "fe/idl.ypp" /* yacc.c:1646 */ + case 296: +#line 3376 "fe/idl.ypp" /* yacc.c:1646 */ { idl_global->set_parse_state (IDL_GlobalData::PS_LabelExprSeen); } -#line 5812 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5822 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 296: -#line 3374 "fe/idl.ypp" /* yacc.c:1646 */ + case 297: +#line 3380 "fe/idl.ypp" /* yacc.c:1646 */ { // const_expr idl_global->set_parse_state (IDL_GlobalData::PS_LabelColonSeen); @@ -5822,20 +5832,20 @@ yyreduce: (yyvsp[-2].exval) ); } -#line 5826 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5836 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 297: -#line 3387 "fe/idl.ypp" /* yacc.c:1646 */ + case 298: +#line 3393 "fe/idl.ypp" /* yacc.c:1646 */ { // element_spec : type_spec idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemTypeSeen); } -#line 5835 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5845 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 298: -#line 3392 "fe/idl.ypp" /* yacc.c:1646 */ + case 299: +#line 3398 "fe/idl.ypp" /* yacc.c:1646 */ { // declarator idl_global->set_parse_state (IDL_GlobalData::PS_UnionElemDeclSeen); @@ -5880,11 +5890,11 @@ yyreduce: (yyvsp[0].deval) = 0; } } -#line 5884 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5894 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 299: -#line 3440 "fe/idl.ypp" /* yacc.c:1646 */ + case 300: +#line 3446 "fe/idl.ypp" /* yacc.c:1646 */ { // struct_forward_type : struct_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5905,11 +5915,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5909 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5919 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 300: -#line 3464 "fe/idl.ypp" /* yacc.c:1646 */ + case 301: +#line 3470 "fe/idl.ypp" /* yacc.c:1646 */ { // union_forward_type : union_decl UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5930,20 +5940,20 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5934 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5944 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 301: -#line 3488 "fe/idl.ypp" /* yacc.c:1646 */ + case 302: +#line 3494 "fe/idl.ypp" /* yacc.c:1646 */ { // enum_type : IDL_ENUM idl_global->set_parse_state (IDL_GlobalData::PS_EnumSeen); } -#line 5943 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5953 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 302: -#line 3493 "fe/idl.ypp" /* yacc.c:1646 */ + case 303: +#line 3499 "fe/idl.ypp" /* yacc.c:1646 */ { // id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -5976,29 +5986,29 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 5980 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5990 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 303: -#line 3526 "fe/idl.ypp" /* yacc.c:1646 */ + case 304: +#line 3532 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_EnumSqSeen); } -#line 5989 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 5999 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 304: -#line 3531 "fe/idl.ypp" /* yacc.c:1646 */ + case 305: +#line 3537 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_enumerator idl_global->set_parse_state (IDL_GlobalData::PS_EnumBodySeen); } -#line 5998 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6008 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 305: -#line 3536 "fe/idl.ypp" /* yacc.c:1646 */ + case 306: +#line 3542 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_EnumQsSeen); @@ -6018,20 +6028,20 @@ yyreduce: idl_global->scopes ().pop (); } } -#line 6022 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6032 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 307: -#line 3562 "fe/idl.ypp" /* yacc.c:1646 */ + case 308: +#line 3568 "fe/idl.ypp" /* yacc.c:1646 */ { // enumerators : enumerators ',' idl_global->set_parse_state (IDL_GlobalData::PS_EnumCommaSeen); } -#line 6031 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6041 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 310: -#line 3572 "fe/idl.ypp" /* yacc.c:1646 */ + case 311: +#line 3578 "fe/idl.ypp" /* yacc.c:1646 */ { // enumerator : IDENTIFIER UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -6063,29 +6073,29 @@ yyreduce: (void) s->fe_add_enum_val (e); } } -#line 6067 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6077 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 311: -#line 3608 "fe/idl.ypp" /* yacc.c:1646 */ + case 312: +#line 3614 "fe/idl.ypp" /* yacc.c:1646 */ { // sequence_type_spec : seq_head ',' idl_global->set_parse_state (IDL_GlobalData::PS_SequenceCommaSeen); } -#line 6076 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6086 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 312: -#line 3613 "fe/idl.ypp" /* yacc.c:1646 */ + case 313: +#line 3619 "fe/idl.ypp" /* yacc.c:1646 */ { // positive_int_expr idl_global->set_parse_state (IDL_GlobalData::PS_SequenceExprSeen); } -#line 6085 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6095 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 313: -#line 3618 "fe/idl.ypp" /* yacc.c:1646 */ + case 314: +#line 3624 "fe/idl.ypp" /* yacc.c:1646 */ { // '>' idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -6162,11 +6172,11 @@ yyreduce: delete ev; ev = 0; } -#line 6166 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6176 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 314: -#line 3696 "fe/idl.ypp" /* yacc.c:1646 */ + case 315: +#line 3702 "fe/idl.ypp" /* yacc.c:1646 */ { // | seq_head '>' idl_global->set_parse_state (IDL_GlobalData::PS_SequenceQsSeen); @@ -6222,11 +6232,11 @@ yyreduce: } } } -#line 6226 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6236 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 315: -#line 3755 "fe/idl.ypp" /* yacc.c:1646 */ + case 316: +#line 3761 "fe/idl.ypp" /* yacc.c:1646 */ { // seq_head : IDL_SEQUENCE idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSeen); @@ -6236,56 +6246,56 @@ yyreduce: */ idl_global->scopes ().push (0); } -#line 6240 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6250 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 316: -#line 3765 "fe/idl.ypp" /* yacc.c:1646 */ + case 317: +#line 3771 "fe/idl.ypp" /* yacc.c:1646 */ { // '<' idl_global->set_parse_state (IDL_GlobalData::PS_SequenceSqSeen); } -#line 6249 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6259 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 317: -#line 3770 "fe/idl.ypp" /* yacc.c:1646 */ + case 318: +#line 3776 "fe/idl.ypp" /* yacc.c:1646 */ { // simple_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_SequenceTypeSeen); (yyval.dcval) = (yyvsp[0].dcval); } -#line 6259 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6269 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 318: -#line 3779 "fe/idl.ypp" /* yacc.c:1646 */ + case 319: +#line 3785 "fe/idl.ypp" /* yacc.c:1646 */ { - //TODO + (yyval.dcval) = idl_global->gen ()->create_fixed ((yyvsp[-3].exval), (yyvsp[-1].exval)); } -#line 6267 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6277 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 319: -#line 3787 "fe/idl.ypp" /* yacc.c:1646 */ + case 320: +#line 3793 "fe/idl.ypp" /* yacc.c:1646 */ { // string_type_spec : string_head '<' idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6276 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6286 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 320: -#line 3792 "fe/idl.ypp" /* yacc.c:1646 */ + case 321: +#line 3798 "fe/idl.ypp" /* yacc.c:1646 */ { // positive_int_expr idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6285 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6295 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 321: -#line 3797 "fe/idl.ypp" /* yacc.c:1646 */ + case 322: +#line 3803 "fe/idl.ypp" /* yacc.c:1646 */ { // '>' idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -6328,11 +6338,11 @@ yyreduce: delete ev; ev = 0; } -#line 6332 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6342 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 322: -#line 3840 "fe/idl.ypp" /* yacc.c:1646 */ + case 323: +#line 3846 "fe/idl.ypp" /* yacc.c:1646 */ { // | string_head idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -6355,38 +6365,38 @@ yyreduce: ) ); } -#line 6359 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6369 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 323: -#line 3866 "fe/idl.ypp" /* yacc.c:1646 */ + case 324: +#line 3872 "fe/idl.ypp" /* yacc.c:1646 */ { // string_head : IDL_STRING idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6368 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6378 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 324: -#line 3875 "fe/idl.ypp" /* yacc.c:1646 */ + case 325: +#line 3881 "fe/idl.ypp" /* yacc.c:1646 */ { // wstring_type_spec : wstring_head '<' idl_global->set_parse_state (IDL_GlobalData::PS_StringSqSeen); } -#line 6377 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6387 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 325: -#line 3880 "fe/idl.ypp" /* yacc.c:1646 */ + case 326: +#line 3886 "fe/idl.ypp" /* yacc.c:1646 */ { // positive_int_expr idl_global->set_parse_state (IDL_GlobalData::PS_StringExprSeen); } -#line 6386 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6396 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 326: -#line 3885 "fe/idl.ypp" /* yacc.c:1646 */ + case 327: +#line 3891 "fe/idl.ypp" /* yacc.c:1646 */ { // '>' idl_global->set_parse_state (IDL_GlobalData::PS_StringQsSeen); @@ -6418,11 +6428,11 @@ yyreduce: } } } -#line 6422 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6432 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 327: -#line 3917 "fe/idl.ypp" /* yacc.c:1646 */ + case 328: +#line 3923 "fe/idl.ypp" /* yacc.c:1646 */ { // | wstring_head idl_global->set_parse_state (IDL_GlobalData::PS_StringCompleted); @@ -6444,29 +6454,29 @@ yyreduce: AST_String::narrow_from_decl ((yyval.dcval)) ); } -#line 6448 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6458 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 328: -#line 3942 "fe/idl.ypp" /* yacc.c:1646 */ + case 329: +#line 3948 "fe/idl.ypp" /* yacc.c:1646 */ { // wstring_head : IDL_WSTRING idl_global->set_parse_state (IDL_GlobalData::PS_StringSeen); } -#line 6457 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6467 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 329: -#line 3950 "fe/idl.ypp" /* yacc.c:1646 */ + case 330: +#line 3956 "fe/idl.ypp" /* yacc.c:1646 */ { // array_declarator : id idl_global->set_parse_state (IDL_GlobalData::PS_ArrayIDSeen); } -#line 6466 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6476 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 330: -#line 3955 "fe/idl.ypp" /* yacc.c:1646 */ + case 331: +#line 3961 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_array_dim idl_global->set_parse_state (IDL_GlobalData::PS_ArrayCompleted); @@ -6500,11 +6510,11 @@ yyreduce: } } } -#line 6504 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6514 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 331: -#line 3992 "fe/idl.ypp" /* yacc.c:1646 */ + case 332: +#line 3998 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_array_dim : array_dim array_dims ACE_NEW_RETURN ((yyval.elval), @@ -6512,11 +6522,11 @@ yyreduce: (yyvsp[0].elval)), 1); } -#line 6516 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6526 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 332: -#line 4003 "fe/idl.ypp" /* yacc.c:1646 */ + case 333: +#line 4009 "fe/idl.ypp" /* yacc.c:1646 */ { // array_dims : array_dims array_dim UTL_ExprList *el = 0; @@ -6535,38 +6545,38 @@ yyreduce: (yyval.elval) = (yyvsp[-1].elval); } } -#line 6539 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6549 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 333: -#line 4022 "fe/idl.ypp" /* yacc.c:1646 */ + case 334: +#line 4028 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.elval) = 0; } -#line 6548 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6558 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 334: -#line 4030 "fe/idl.ypp" /* yacc.c:1646 */ + case 335: +#line 4036 "fe/idl.ypp" /* yacc.c:1646 */ { // array_dim : '[' idl_global->set_parse_state (IDL_GlobalData::PS_DimSqSeen); } -#line 6557 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6567 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 335: -#line 4035 "fe/idl.ypp" /* yacc.c:1646 */ + case 336: +#line 4041 "fe/idl.ypp" /* yacc.c:1646 */ { // positive_int_expr idl_global->set_parse_state (IDL_GlobalData::PS_DimExprSeen); } -#line 6566 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6576 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 336: -#line 4040 "fe/idl.ypp" /* yacc.c:1646 */ + case 337: +#line 4046 "fe/idl.ypp" /* yacc.c:1646 */ { // ']' idl_global->set_parse_state (IDL_GlobalData::PS_DimQsSeen); @@ -6621,47 +6631,47 @@ yyreduce: delete ev; ev = 0; } -#line 6625 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6635 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 339: -#line 4103 "fe/idl.ypp" /* yacc.c:1646 */ + case 340: +#line 4109 "fe/idl.ypp" /* yacc.c:1646 */ { // attribute_readonly : IDL_READONLY idl_global->set_parse_state (IDL_GlobalData::PS_AttrROSeen); } -#line 6634 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6644 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 340: -#line 4108 "fe/idl.ypp" /* yacc.c:1646 */ + case 341: +#line 4114 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_ATTRIBUTE idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 6643 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6653 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 341: -#line 4113 "fe/idl.ypp" /* yacc.c:1646 */ + case 342: +#line 4119 "fe/idl.ypp" /* yacc.c:1646 */ { // param_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 6652 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6662 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 342: -#line 4118 "fe/idl.ypp" /* yacc.c:1646 */ + case 343: +#line 4124 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_simple_declarator idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 6661 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6671 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 343: -#line 4123 "fe/idl.ypp" /* yacc.c:1646 */ + case 344: +#line 4129 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_raises UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -6722,47 +6732,47 @@ yyreduce: delete (yyvsp[-2].dlval); (yyvsp[-2].dlval) = 0; } -#line 6726 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6736 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 344: -#line 4187 "fe/idl.ypp" /* yacc.c:1646 */ + case 345: +#line 4193 "fe/idl.ypp" /* yacc.c:1646 */ { // attribute_readwrite : IDL_ATTRIBUTE idl_global->set_parse_state (IDL_GlobalData::PS_AttrSeen); } -#line 6735 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6745 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 345: -#line 4192 "fe/idl.ypp" /* yacc.c:1646 */ + case 346: +#line 4198 "fe/idl.ypp" /* yacc.c:1646 */ { // param_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_AttrTypeSeen); } -#line 6744 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6754 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 346: -#line 4197 "fe/idl.ypp" /* yacc.c:1646 */ + case 347: +#line 4203 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_simple_declarator idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclsSeen); } -#line 6753 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6763 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 347: -#line 4202 "fe/idl.ypp" /* yacc.c:1646 */ + case 348: +#line 4208 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_getraises idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseCompleted); } -#line 6762 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6772 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 348: -#line 4207 "fe/idl.ypp" /* yacc.c:1646 */ + case 349: +#line 4213 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_setraises UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -6832,20 +6842,20 @@ yyreduce: delete (yyvsp[-4].dlval); (yyvsp[-4].dlval) = 0; } -#line 6836 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6846 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 349: -#line 4280 "fe/idl.ypp" /* yacc.c:1646 */ + case 350: +#line 4286 "fe/idl.ypp" /* yacc.c:1646 */ { // exception : IDL_EXCEPTION idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSeen); } -#line 6845 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6855 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 350: -#line 4285 "fe/idl.ypp" /* yacc.c:1646 */ + case 351: +#line 4291 "fe/idl.ypp" /* yacc.c:1646 */ { // id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -6875,29 +6885,29 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 6879 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6889 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 351: -#line 4315 "fe/idl.ypp" /* yacc.c:1646 */ + case 352: +#line 4321 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_ExceptSqSeen); } -#line 6888 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6898 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 352: -#line 4320 "fe/idl.ypp" /* yacc.c:1646 */ + case 353: +#line 4326 "fe/idl.ypp" /* yacc.c:1646 */ { // members idl_global->set_parse_state (IDL_GlobalData::PS_ExceptBodySeen); } -#line 6897 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6907 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 353: -#line 4325 "fe/idl.ypp" /* yacc.c:1646 */ + case 354: +#line 4331 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_ExceptQsSeen); @@ -6906,20 +6916,20 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 6910 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6920 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 354: -#line 4338 "fe/idl.ypp" /* yacc.c:1646 */ + case 355: +#line 4344 "fe/idl.ypp" /* yacc.c:1646 */ { // operation : opt_op_attribute op_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 6919 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6929 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 355: -#line 4343 "fe/idl.ypp" /* yacc.c:1646 */ + case 356: +#line 4349 "fe/idl.ypp" /* yacc.c:1646 */ { // IDENTIFIER UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -6984,29 +6994,29 @@ yyreduce: */ idl_global->scopes ().push (o); } -#line 6988 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 6998 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 356: -#line 4408 "fe/idl.ypp" /* yacc.c:1646 */ + case 357: +#line 4414 "fe/idl.ypp" /* yacc.c:1646 */ { // parameter_list idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 6997 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7007 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 357: -#line 4413 "fe/idl.ypp" /* yacc.c:1646 */ + case 358: +#line 4419 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_raises idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); } -#line 7006 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7016 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 358: -#line 4418 "fe/idl.ypp" /* yacc.c:1646 */ + case 359: +#line 4424 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_context UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7036,40 +7046,40 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 7040 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7050 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 359: -#line 4451 "fe/idl.ypp" /* yacc.c:1646 */ + case 360: +#line 4457 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_op_attribute : IDL_ONEWAY idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_oneway; } -#line 7050 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7060 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 360: -#line 4457 "fe/idl.ypp" /* yacc.c:1646 */ + case 361: +#line 4463 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_IDEMPOTENT idl_global->set_parse_state (IDL_GlobalData::PS_OpAttrSeen); (yyval.ofval) = AST_Operation::OP_idempotent; } -#line 7060 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7070 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 361: -#line 4463 "fe/idl.ypp" /* yacc.c:1646 */ + case 362: +#line 4469 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.ofval) = AST_Operation::OP_noflags; } -#line 7069 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7079 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 363: -#line 4472 "fe/idl.ypp" /* yacc.c:1646 */ + case 364: +#line 4478 "fe/idl.ypp" /* yacc.c:1646 */ { // op_type_spec : param_type_spec | IDL_VOID (yyval.dcval) = @@ -7077,21 +7087,21 @@ yyreduce: AST_Expression::EV_void ); } -#line 7081 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7091 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 364: -#line 4483 "fe/idl.ypp" /* yacc.c:1646 */ + case 365: +#line 4489 "fe/idl.ypp" /* yacc.c:1646 */ { // init_decl : IDL_FACTORY //@@ PS_FactorySeen? idl_global->set_parse_state (IDL_GlobalData::PS_OpTypeSeen); } -#line 7091 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7101 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 365: -#line 4489 "fe/idl.ypp" /* yacc.c:1646 */ + case 366: +#line 4495 "fe/idl.ypp" /* yacc.c:1646 */ { // IDENTIFIER UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7133,20 +7143,20 @@ yyreduce: */ idl_global->scopes ().push (factory); } -#line 7137 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7147 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 366: -#line 4531 "fe/idl.ypp" /* yacc.c:1646 */ + case 367: +#line 4537 "fe/idl.ypp" /* yacc.c:1646 */ { // init_parameter_list idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 7146 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7156 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 367: -#line 4536 "fe/idl.ypp" /* yacc.c:1646 */ + case 368: +#line 4542 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_raises idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted); @@ -7160,74 +7170,74 @@ yyreduce: idl_global->scopes ().pop (); } -#line 7164 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7174 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 368: -#line 4553 "fe/idl.ypp" /* yacc.c:1646 */ + case 369: +#line 4559 "fe/idl.ypp" /* yacc.c:1646 */ { // init_parameter_list : '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7173 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7183 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 369: -#line 4558 "fe/idl.ypp" /* yacc.c:1646 */ + case 370: +#line 4564 "fe/idl.ypp" /* yacc.c:1646 */ { // ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7182 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7192 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 370: -#line 4563 "fe/idl.ypp" /* yacc.c:1646 */ + case 371: +#line 4569 "fe/idl.ypp" /* yacc.c:1646 */ { // | '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7191 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7201 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 371: -#line 4569 "fe/idl.ypp" /* yacc.c:1646 */ + case 372: +#line 4575 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_in_parameter ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7200 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7210 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 373: -#line 4580 "fe/idl.ypp" /* yacc.c:1646 */ + case 374: +#line 4586 "fe/idl.ypp" /* yacc.c:1646 */ { // in_parameters : in_parameters ',' idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7209 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7219 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 376: -#line 4590 "fe/idl.ypp" /* yacc.c:1646 */ + case 377: +#line 4596 "fe/idl.ypp" /* yacc.c:1646 */ { // in_parameter : IDL_IN idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7218 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7228 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 377: -#line 4595 "fe/idl.ypp" /* yacc.c:1646 */ + case 378: +#line 4601 "fe/idl.ypp" /* yacc.c:1646 */ { // param_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7227 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7237 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 378: -#line 4600 "fe/idl.ypp" /* yacc.c:1646 */ + case 379: +#line 4606 "fe/idl.ypp" /* yacc.c:1646 */ { // declarator UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7260,74 +7270,74 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7264 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7274 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 379: -#line 4636 "fe/idl.ypp" /* yacc.c:1646 */ + case 380: +#line 4642 "fe/idl.ypp" /* yacc.c:1646 */ { // parameter_list : '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7273 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7283 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 380: -#line 4641 "fe/idl.ypp" /* yacc.c:1646 */ + case 381: +#line 4647 "fe/idl.ypp" /* yacc.c:1646 */ { // ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7282 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7292 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 381: -#line 4646 "fe/idl.ypp" /* yacc.c:1646 */ + case 382: +#line 4652 "fe/idl.ypp" /* yacc.c:1646 */ { // | '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpSqSeen); } -#line 7291 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7301 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 382: -#line 4652 "fe/idl.ypp" /* yacc.c:1646 */ + case 383: +#line 4658 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_parameter ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpQsSeen); } -#line 7300 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7310 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 384: -#line 4663 "fe/idl.ypp" /* yacc.c:1646 */ + case 385: +#line 4669 "fe/idl.ypp" /* yacc.c:1646 */ { // parameters : parameters ',' idl_global->set_parse_state (IDL_GlobalData::PS_OpParCommaSeen); } -#line 7309 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7319 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 387: -#line 4673 "fe/idl.ypp" /* yacc.c:1646 */ + case 388: +#line 4679 "fe/idl.ypp" /* yacc.c:1646 */ { // parameter : direction idl_global->set_parse_state (IDL_GlobalData::PS_OpParDirSeen); } -#line 7318 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7328 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 388: -#line 4678 "fe/idl.ypp" /* yacc.c:1646 */ + case 389: +#line 4684 "fe/idl.ypp" /* yacc.c:1646 */ { // param_type_spec idl_global->set_parse_state (IDL_GlobalData::PS_OpParTypeSeen); } -#line 7327 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7337 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 389: -#line 4683 "fe/idl.ypp" /* yacc.c:1646 */ + case 390: +#line 4689 "fe/idl.ypp" /* yacc.c:1646 */ { // declarator UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7367,11 +7377,11 @@ yyreduce: delete (yyvsp[0].deval); (yyvsp[0].deval) = 0; } -#line 7371 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7381 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 390: -#line 4726 "fe/idl.ypp" /* yacc.c:1646 */ + case 391: +#line 4732 "fe/idl.ypp" /* yacc.c:1646 */ { // param_type_spec : base_type_spec (yyval.dcval) = @@ -7379,11 +7389,11 @@ yyreduce: (yyvsp[0].etval) ); } -#line 7383 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7393 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 393: -#line 4736 "fe/idl.ypp" /* yacc.c:1646 */ + case 394: +#line 4742 "fe/idl.ypp" /* yacc.c:1646 */ { // | string_type_spec // | wstring_type_spec @@ -7490,186 +7500,186 @@ yyreduce: (yyval.dcval) = d; } -#line 7494 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7504 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 394: -#line 4846 "fe/idl.ypp" /* yacc.c:1646 */ + case 395: +#line 4852 "fe/idl.ypp" /* yacc.c:1646 */ { // direction : IDL_IN (yyval.dival) = AST_Argument::dir_IN; } -#line 7503 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7513 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 395: -#line 4851 "fe/idl.ypp" /* yacc.c:1646 */ + case 396: +#line 4857 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_OUT (yyval.dival) = AST_Argument::dir_OUT; } -#line 7512 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7522 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 396: -#line 4856 "fe/idl.ypp" /* yacc.c:1646 */ + case 397: +#line 4862 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_INOUT (yyval.dival) = AST_Argument::dir_INOUT; } -#line 7521 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7531 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 397: -#line 4864 "fe/idl.ypp" /* yacc.c:1646 */ + case 398: +#line 4870 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_raises : IDL_RAISES idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSeen); } -#line 7530 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7540 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 398: -#line 4869 "fe/idl.ypp" /* yacc.c:1646 */ + case 399: +#line 4875 "fe/idl.ypp" /* yacc.c:1646 */ { // '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseSqSeen); } -#line 7539 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7549 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 399: -#line 4875 "fe/idl.ypp" /* yacc.c:1646 */ + case 400: +#line 4881 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_scoped_name ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7549 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7559 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 400: -#line 4881 "fe/idl.ypp" /* yacc.c:1646 */ + case 401: +#line 4887 "fe/idl.ypp" /* yacc.c:1646 */ { (yyval.nlval) = 0; /* | EMPTY */ } -#line 7558 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7568 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 401: -#line 4889 "fe/idl.ypp" /* yacc.c:1646 */ + case 402: +#line 4895 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_getraises : IDL_GETRAISES idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSeen); } -#line 7567 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7577 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 402: -#line 4894 "fe/idl.ypp" /* yacc.c:1646 */ + case 403: +#line 4900 "fe/idl.ypp" /* yacc.c:1646 */ { // '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseSqSeen); } -#line 7576 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7586 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 403: -#line 4900 "fe/idl.ypp" /* yacc.c:1646 */ + case 404: +#line 4906 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_scoped_name ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpGetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7586 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7596 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 404: -#line 4906 "fe/idl.ypp" /* yacc.c:1646 */ + case 405: +#line 4912 "fe/idl.ypp" /* yacc.c:1646 */ { (yyval.nlval) = 0; /* | EMPTY */ } -#line 7595 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7605 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 405: -#line 4914 "fe/idl.ypp" /* yacc.c:1646 */ + case 406: +#line 4920 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_setraises : IDL_SETRAISES idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSeen); } -#line 7604 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7614 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 406: -#line 4919 "fe/idl.ypp" /* yacc.c:1646 */ + case 407: +#line 4925 "fe/idl.ypp" /* yacc.c:1646 */ { // '(' idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseSqSeen); } -#line 7613 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7623 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 407: -#line 4925 "fe/idl.ypp" /* yacc.c:1646 */ + case 408: +#line 4931 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_scoped_name ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpSetRaiseQsSeen); (yyval.nlval) = (yyvsp[-1].nlval); } -#line 7623 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7633 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 408: -#line 4931 "fe/idl.ypp" /* yacc.c:1646 */ + case 409: +#line 4937 "fe/idl.ypp" /* yacc.c:1646 */ { (yyval.nlval) = 0; /* | EMPTY */ } -#line 7632 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7642 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 409: -#line 4939 "fe/idl.ypp" /* yacc.c:1646 */ + case 410: +#line 4945 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_context : IDL_CONTEXT idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSeen); } -#line 7641 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7651 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 410: -#line 4944 "fe/idl.ypp" /* yacc.c:1646 */ + case 411: +#line 4950 "fe/idl.ypp" /* yacc.c:1646 */ { idl_global->set_parse_state (IDL_GlobalData::PS_OpContextSqSeen); // '(' } -#line 7650 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7660 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 411: -#line 4950 "fe/idl.ypp" /* yacc.c:1646 */ + case 412: +#line 4956 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_string_literal ')' idl_global->set_parse_state (IDL_GlobalData::PS_OpContextQsSeen); (yyval.slval) = (yyvsp[-1].slval); } -#line 7660 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7670 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 412: -#line 4956 "fe/idl.ypp" /* yacc.c:1646 */ + case 413: +#line 4962 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.slval) = 0; } -#line 7669 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7679 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 413: -#line 4964 "fe/idl.ypp" /* yacc.c:1646 */ + case 414: +#line 4970 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_string_literal : IDL_STRING_LITERAL string_literals ACE_NEW_RETURN ((yyval.slval), @@ -7677,20 +7687,20 @@ yyreduce: (yyvsp[0].slval)), 1); } -#line 7681 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7691 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 414: -#line 4976 "fe/idl.ypp" /* yacc.c:1646 */ + case 415: +#line 4982 "fe/idl.ypp" /* yacc.c:1646 */ { // string_literals : string_literals ',' idl_global->set_parse_state (IDL_GlobalData::PS_OpContextCommaSeen); } -#line 7690 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7700 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 415: -#line 4981 "fe/idl.ypp" /* yacc.c:1646 */ + case 416: +#line 4987 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_STRING_LITERAL UTL_StrList *sl = 0; @@ -7709,20 +7719,20 @@ yyreduce: (yyval.slval) = (yyvsp[-3].slval); } } -#line 7713 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7723 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 416: -#line 5000 "fe/idl.ypp" /* yacc.c:1646 */ + case 417: +#line 5006 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.slval) = 0; } -#line 7722 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7732 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 417: -#line 5008 "fe/idl.ypp" /* yacc.c:1646 */ + case 418: +#line 5014 "fe/idl.ypp" /* yacc.c:1646 */ { // typeid_dcl : IDL_TYPEID scoped_name IDL_STRING_LITERAL UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7748,11 +7758,11 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 7752 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7762 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 418: -#line 5037 "fe/idl.ypp" /* yacc.c:1646 */ + case 419: +#line 5043 "fe/idl.ypp" /* yacc.c:1646 */ { // typeprefix_dcl : IDL_TYPEPREFIX scoped_name IDL_STRING_LITERAL UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7787,11 +7797,11 @@ yyreduce: delete (yyvsp[0].sval); (yyvsp[0].sval) = 0; } -#line 7791 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7801 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 421: -#line 5081 "fe/idl.ypp" /* yacc.c:1646 */ + case 422: +#line 5087 "fe/idl.ypp" /* yacc.c:1646 */ { // component_forward_decl : IDL_COMPONENT id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7816,11 +7826,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 7820 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7830 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 422: -#line 5109 "fe/idl.ypp" /* yacc.c:1646 */ + case 423: +#line 5115 "fe/idl.ypp" /* yacc.c:1646 */ { // component_decl : component_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -7860,29 +7870,29 @@ yyreduce: */ idl_global->scopes ().push (c); } -#line 7864 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7874 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 423: -#line 5149 "fe/idl.ypp" /* yacc.c:1646 */ + case 424: +#line 5155 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_ComponentSqSeen); } -#line 7873 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7883 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 424: -#line 5154 "fe/idl.ypp" /* yacc.c:1646 */ + case 425: +#line 5160 "fe/idl.ypp" /* yacc.c:1646 */ { // component_exports idl_global->set_parse_state (IDL_GlobalData::PS_ComponentBodySeen); } -#line 7882 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7892 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 425: -#line 5159 "fe/idl.ypp" /* yacc.c:1646 */ + case 426: +#line 5165 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_ComponentQsSeen); @@ -7892,29 +7902,29 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 7896 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7906 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 426: -#line 5173 "fe/idl.ypp" /* yacc.c:1646 */ + case 427: +#line 5179 "fe/idl.ypp" /* yacc.c:1646 */ { // component_header: IDL_COMPONENT id idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen); } -#line 7905 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7915 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 427: -#line 5178 "fe/idl.ypp" /* yacc.c:1646 */ + case 428: +#line 5184 "fe/idl.ypp" /* yacc.c:1646 */ { // component_inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 7914 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7924 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 428: -#line 5183 "fe/idl.ypp" /* yacc.c:1646 */ + case 429: +#line 5189 "fe/idl.ypp" /* yacc.c:1646 */ { // supports_spec idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -7949,164 +7959,164 @@ yyreduce: (yyvsp[-2].idlist) = 0; } } -#line 7953 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7963 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 429: -#line 5221 "fe/idl.ypp" /* yacc.c:1646 */ + case 430: +#line 5227 "fe/idl.ypp" /* yacc.c:1646 */ { // component_inheritance_spec : ':' idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 7962 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7972 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 430: -#line 5226 "fe/idl.ypp" /* yacc.c:1646 */ + case 431: +#line 5232 "fe/idl.ypp" /* yacc.c:1646 */ { // scoped_name (yyval.idlist) = (yyvsp[0].idlist); } -#line 7971 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7981 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 431: -#line 5231 "fe/idl.ypp" /* yacc.c:1646 */ + case 432: +#line 5237 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.idlist) = 0; } -#line 7980 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7990 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 434: -#line 5244 "fe/idl.ypp" /* yacc.c:1646 */ + case 435: +#line 5250 "fe/idl.ypp" /* yacc.c:1646 */ { // component_export : provides_decl idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 7989 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 7999 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 435: -#line 5249 "fe/idl.ypp" /* yacc.c:1646 */ + case 436: +#line 5255 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 7998 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8008 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 436: -#line 5254 "fe/idl.ypp" /* yacc.c:1646 */ + case 437: +#line 5260 "fe/idl.ypp" /* yacc.c:1646 */ { // | uses_decl idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 8007 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8017 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 437: -#line 5259 "fe/idl.ypp" /* yacc.c:1646 */ + case 438: +#line 5265 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8016 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8026 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 438: -#line 5264 "fe/idl.ypp" /* yacc.c:1646 */ + case 439: +#line 5270 "fe/idl.ypp" /* yacc.c:1646 */ { // | emits_decl idl_global->set_parse_state (IDL_GlobalData::PS_EmitsDeclSeen); } -#line 8025 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8035 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 439: -#line 5269 "fe/idl.ypp" /* yacc.c:1646 */ + case 440: +#line 5275 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8034 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8044 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 440: -#line 5274 "fe/idl.ypp" /* yacc.c:1646 */ + case 441: +#line 5280 "fe/idl.ypp" /* yacc.c:1646 */ { // | publishes_decl idl_global->set_parse_state (IDL_GlobalData::PS_PublishesDeclSeen); } -#line 8043 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8053 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 441: -#line 5279 "fe/idl.ypp" /* yacc.c:1646 */ + case 442: +#line 5285 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8052 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8062 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 442: -#line 5284 "fe/idl.ypp" /* yacc.c:1646 */ + case 443: +#line 5290 "fe/idl.ypp" /* yacc.c:1646 */ { // | consumes_decl idl_global->set_parse_state (IDL_GlobalData::PS_ConsumesDeclSeen); } -#line 8061 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8071 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 443: -#line 5289 "fe/idl.ypp" /* yacc.c:1646 */ + case 444: +#line 5295 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8070 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8080 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 444: -#line 5294 "fe/idl.ypp" /* yacc.c:1646 */ + case 445: +#line 5300 "fe/idl.ypp" /* yacc.c:1646 */ { // | attribute idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 8079 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8089 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 445: -#line 5299 "fe/idl.ypp" /* yacc.c:1646 */ + case 446: +#line 5305 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8088 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8098 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 446: -#line 5304 "fe/idl.ypp" /* yacc.c:1646 */ + case 447: +#line 5310 "fe/idl.ypp" /* yacc.c:1646 */ { // | extended_port_decl idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 8097 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8107 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 447: -#line 5309 "fe/idl.ypp" /* yacc.c:1646 */ + case 448: +#line 5315 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8106 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8116 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 448: -#line 5316 "fe/idl.ypp" /* yacc.c:1646 */ + case 449: +#line 5322 "fe/idl.ypp" /* yacc.c:1646 */ { // provides_decl : IDL_PROVIDES interface_type id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8194,22 +8204,22 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8198 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8208 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 449: -#line 5407 "fe/idl.ypp" /* yacc.c:1646 */ + case 450: +#line 5413 "fe/idl.ypp" /* yacc.c:1646 */ { // interface_type : scoped_name // Lookups and checking are done where the 'interface_type' // token is used, in 'provides_decl' and 'uses_decl'. (yyval.idlist) = (yyvsp[0].idlist); } -#line 8209 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8219 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 450: -#line 5414 "fe/idl.ypp" /* yacc.c:1646 */ + case 451: +#line 5420 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_OBJECT Identifier *corba_id = 0; @@ -8233,11 +8243,11 @@ yyreduce: conc_name), 1); } -#line 8237 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8247 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 451: -#line 5440 "fe/idl.ypp" /* yacc.c:1646 */ + case 452: +#line 5446 "fe/idl.ypp" /* yacc.c:1646 */ { // uses_decl : uses_opt_multiple interface_type id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8341,40 +8351,40 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8345 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8355 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 452: -#line 5547 "fe/idl.ypp" /* yacc.c:1646 */ + case 453: +#line 5553 "fe/idl.ypp" /* yacc.c:1646 */ { // uses_opt_multiple : IDL_USES opt_multiple // 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 8356 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8366 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 453: -#line 5557 "fe/idl.ypp" /* yacc.c:1646 */ + case 454: +#line 5563 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_multiple : IDL_MULTIPLE (yyval.bval) = true; } -#line 8365 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8375 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 454: -#line 5562 "fe/idl.ypp" /* yacc.c:1646 */ + case 455: +#line 5568 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.bval) = false; } -#line 8374 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8384 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 455: -#line 5569 "fe/idl.ypp" /* yacc.c:1646 */ + case 456: +#line 5575 "fe/idl.ypp" /* yacc.c:1646 */ { // emits_decl : IDL_EMITS scoped_name id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8445,11 +8455,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8449 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8459 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 456: -#line 5642 "fe/idl.ypp" /* yacc.c:1646 */ + case 457: +#line 5648 "fe/idl.ypp" /* yacc.c:1646 */ { // publishes_decl : IDL_PUBLISHES scoped_name id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8520,11 +8530,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8524 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8534 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 457: -#line 5715 "fe/idl.ypp" /* yacc.c:1646 */ + case 458: +#line 5721 "fe/idl.ypp" /* yacc.c:1646 */ { // consumes_decl : IDL_CONSUMES scoped_name id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8595,11 +8605,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 8599 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8609 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 458: -#line 5789 "fe/idl.ypp" /* yacc.c:1646 */ + case 459: +#line 5795 "fe/idl.ypp" /* yacc.c:1646 */ { // home_decl : home_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8637,11 +8647,11 @@ yyreduce: */ idl_global->scopes ().push (h); } -#line 8641 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8651 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 459: -#line 5827 "fe/idl.ypp" /* yacc.c:1646 */ + case 460: +#line 5833 "fe/idl.ypp" /* yacc.c:1646 */ { // home_body /* @@ -8649,65 +8659,65 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 8653 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8663 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 460: -#line 5838 "fe/idl.ypp" /* yacc.c:1646 */ + case 461: +#line 5844 "fe/idl.ypp" /* yacc.c:1646 */ { // home_header : IDL_HOME idl_global->set_parse_state (IDL_GlobalData::PS_HomeSeen); } -#line 8662 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8672 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 461: -#line 5843 "fe/idl.ypp" /* yacc.c:1646 */ + case 462: +#line 5849 "fe/idl.ypp" /* yacc.c:1646 */ { // id idl_global->set_parse_state (IDL_GlobalData::PS_HomeIDSeen); } -#line 8671 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8681 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 462: -#line 5848 "fe/idl.ypp" /* yacc.c:1646 */ + case 463: +#line 5854 "fe/idl.ypp" /* yacc.c:1646 */ { // home_inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 8680 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8690 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 463: -#line 5853 "fe/idl.ypp" /* yacc.c:1646 */ + case 464: +#line 5859 "fe/idl.ypp" /* yacc.c:1646 */ { // supports_spec idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); } -#line 8689 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8699 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 464: -#line 5858 "fe/idl.ypp" /* yacc.c:1646 */ + case 465: +#line 5864 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_MANAGES idl_global->set_parse_state (IDL_GlobalData::PS_ManagesSeen); } -#line 8698 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8708 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 465: -#line 5863 "fe/idl.ypp" /* yacc.c:1646 */ + case 466: +#line 5869 "fe/idl.ypp" /* yacc.c:1646 */ { // scoped_name idl_global->set_parse_state (IDL_GlobalData::PS_ManagesIDSeen); } -#line 8707 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8717 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 466: -#line 5868 "fe/idl.ypp" /* yacc.c:1646 */ + case 467: +#line 5874 "fe/idl.ypp" /* yacc.c:1646 */ { // primary_key_spec idl_global->set_parse_state (IDL_GlobalData::PS_PrimaryKeySpecSeen); @@ -8754,119 +8764,119 @@ yyreduce: (yyvsp[-6].nlval) = 0; } } -#line 8758 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8768 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 467: -#line 5918 "fe/idl.ypp" /* yacc.c:1646 */ + case 468: +#line 5924 "fe/idl.ypp" /* yacc.c:1646 */ { // home_inheritance_spec ':' idl_global->set_parse_state (IDL_GlobalData::PS_InheritColonSeen); } -#line 8767 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8777 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 468: -#line 5923 "fe/idl.ypp" /* yacc.c:1646 */ + case 469: +#line 5929 "fe/idl.ypp" /* yacc.c:1646 */ { // scoped_name (yyval.idlist) = (yyvsp[0].idlist); } -#line 8776 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8786 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 469: -#line 5928 "fe/idl.ypp" /* yacc.c:1646 */ + case 470: +#line 5934 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.idlist) = 0; } -#line 8785 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8795 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 470: -#line 5937 "fe/idl.ypp" /* yacc.c:1646 */ + case 471: +#line 5943 "fe/idl.ypp" /* yacc.c:1646 */ { // primary_key_spec : IDL_PRIMARYKEY scoped_name (yyval.idlist) = (yyvsp[0].idlist); } -#line 8794 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8804 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 471: -#line 5942 "fe/idl.ypp" /* yacc.c:1646 */ + case 472: +#line 5948 "fe/idl.ypp" /* yacc.c:1646 */ { /* | EMPTY */ (yyval.idlist) = 0; } -#line 8803 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8813 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 472: -#line 5950 "fe/idl.ypp" /* yacc.c:1646 */ + case 473: +#line 5956 "fe/idl.ypp" /* yacc.c:1646 */ { // home_body : '{' idl_global->set_parse_state (IDL_GlobalData::PS_HomeSqSeen); } -#line 8812 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8822 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 473: -#line 5955 "fe/idl.ypp" /* yacc.c:1646 */ + case 474: +#line 5961 "fe/idl.ypp" /* yacc.c:1646 */ { // home_exports idl_global->set_parse_state (IDL_GlobalData::PS_HomeBodySeen); } -#line 8821 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8831 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 474: -#line 5960 "fe/idl.ypp" /* yacc.c:1646 */ + case 475: +#line 5966 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_HomeQsSeen); } -#line 8830 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8840 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 478: -#line 5974 "fe/idl.ypp" /* yacc.c:1646 */ + case 479: +#line 5980 "fe/idl.ypp" /* yacc.c:1646 */ { // home_export : factory_decl idl_global->set_parse_state (IDL_GlobalData::PS_FactoryDeclSeen); } -#line 8839 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8849 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 479: -#line 5979 "fe/idl.ypp" /* yacc.c:1646 */ + case 480: +#line 5985 "fe/idl.ypp" /* yacc.c:1646 */ { // | ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8848 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8858 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 480: -#line 5984 "fe/idl.ypp" /* yacc.c:1646 */ + case 481: +#line 5990 "fe/idl.ypp" /* yacc.c:1646 */ { // | finder_decl idl_global->set_parse_state (IDL_GlobalData::PS_FinderDeclSeen); } -#line 8857 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8867 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 481: -#line 5989 "fe/idl.ypp" /* yacc.c:1646 */ + case 482: +#line 5995 "fe/idl.ypp" /* yacc.c:1646 */ { // | ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 8866 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8876 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 482: -#line 5998 "fe/idl.ypp" /* yacc.c:1646 */ + case 483: +#line 6004 "fe/idl.ypp" /* yacc.c:1646 */ { // factory_decl : IDL_FACTORY id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8890,20 +8900,20 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 8894 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8904 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 483: -#line 6022 "fe/idl.ypp" /* yacc.c:1646 */ + case 484: +#line 6028 "fe/idl.ypp" /* yacc.c:1646 */ { // init_parameter_list idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 8903 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8913 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 484: -#line 6027 "fe/idl.ypp" /* yacc.c:1646 */ + case 485: +#line 6033 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_raises UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8922,11 +8932,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 8926 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8936 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 485: -#line 6050 "fe/idl.ypp" /* yacc.c:1646 */ + case 486: +#line 6056 "fe/idl.ypp" /* yacc.c:1646 */ { // finder_decl : IDL_FINDER id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8954,20 +8964,20 @@ yyreduce: */ idl_global->scopes ().push (f); } -#line 8958 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8968 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 486: -#line 6078 "fe/idl.ypp" /* yacc.c:1646 */ + case 487: +#line 6084 "fe/idl.ypp" /* yacc.c:1646 */ { // init_parameter_list idl_global->set_parse_state (IDL_GlobalData::PS_OpParsCompleted); } -#line 8967 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 8977 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 487: -#line 6083 "fe/idl.ypp" /* yacc.c:1646 */ + case 488: +#line 6089 "fe/idl.ypp" /* yacc.c:1646 */ { // opt_raises UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -8986,11 +8996,11 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 8990 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9000 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 493: -#line 6117 "fe/idl.ypp" /* yacc.c:1646 */ + case 494: +#line 6123 "fe/idl.ypp" /* yacc.c:1646 */ { // event_concrete_forward_decl : IDL_EVENTTYPE id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9014,11 +9024,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 9018 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9028 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 494: -#line 6146 "fe/idl.ypp" /* yacc.c:1646 */ + case 495: +#line 6152 "fe/idl.ypp" /* yacc.c:1646 */ { // event_abs_forward_decl : IDL_ABSTRACT IDL_EVENTTYPE id UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9042,11 +9052,11 @@ yyreduce: delete (yyvsp[0].idval); (yyvsp[0].idval) = 0; } -#line 9046 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9056 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 495: -#line 6174 "fe/idl.ypp" /* yacc.c:1646 */ + case 496: +#line 6180 "fe/idl.ypp" /* yacc.c:1646 */ { // event_abs_decl : event_abs_header event_rest_of_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9091,29 +9101,29 @@ yyreduce: delete (yyvsp[-1].idval); (yyvsp[-1].idval) = 0; } -#line 9095 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9105 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 496: -#line 6219 "fe/idl.ypp" /* yacc.c:1646 */ + case 497: +#line 6225 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9104 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9114 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 497: -#line 6224 "fe/idl.ypp" /* yacc.c:1646 */ + case 498: +#line 6230 "fe/idl.ypp" /* yacc.c:1646 */ { // exports idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9113 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9123 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 498: -#line 6229 "fe/idl.ypp" /* yacc.c:1646 */ + case 499: +#line 6235 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9123,20 +9133,20 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9127 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9137 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 499: -#line 6244 "fe/idl.ypp" /* yacc.c:1646 */ + case 500: +#line 6250 "fe/idl.ypp" /* yacc.c:1646 */ { // event_abs_header : IDL_ABSTRACT IDL_EVENTTYPE id (yyval.idval) = (yyvsp[0].idval); } -#line 9136 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9146 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 500: -#line 6254 "fe/idl.ypp" /* yacc.c:1646 */ + case 501: +#line 6260 "fe/idl.ypp" /* yacc.c:1646 */ { // event_custom_header : IDL_CUSTOM IDL_EVENTTYPE id idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); @@ -9150,31 +9160,31 @@ yyreduce: ACE_TEXT (" custom yet\n"))); (yyval.idval) = 0; } -#line 9154 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9164 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 501: -#line 6272 "fe/idl.ypp" /* yacc.c:1646 */ + case 502: +#line 6278 "fe/idl.ypp" /* yacc.c:1646 */ { // event_plain_header : IDL_EVENTTYPE id idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeIDSeen); (yyval.idval) = (yyvsp[0].idval); } -#line 9165 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9175 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 502: -#line 6282 "fe/idl.ypp" /* yacc.c:1646 */ + case 503: +#line 6288 "fe/idl.ypp" /* yacc.c:1646 */ { // event_rest_of_header : inheritance_spec idl_global->set_parse_state (IDL_GlobalData::PS_InheritSpecSeen); } -#line 9174 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9184 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 503: -#line 6287 "fe/idl.ypp" /* yacc.c:1646 */ + case 504: +#line 6293 "fe/idl.ypp" /* yacc.c:1646 */ { // supports_spec idl_global->set_parse_state (IDL_GlobalData::PS_SupportSpecSeen); @@ -9204,11 +9214,11 @@ yyreduce: (yyvsp[-2].nlval) = 0; } } -#line 9208 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9218 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 504: -#line 6321 "fe/idl.ypp" /* yacc.c:1646 */ + case 505: +#line 6327 "fe/idl.ypp" /* yacc.c:1646 */ { // event_decl : event_header event_rest_of_header UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -9258,29 +9268,29 @@ yyreduce: */ idl_global->scopes ().push (e); } -#line 9262 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9272 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 505: -#line 6371 "fe/idl.ypp" /* yacc.c:1646 */ + case 506: +#line 6377 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeSqSeen); } -#line 9271 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9281 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 506: -#line 6376 "fe/idl.ypp" /* yacc.c:1646 */ + case 507: +#line 6382 "fe/idl.ypp" /* yacc.c:1646 */ { // value_elements idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeBodySeen); } -#line 9280 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9290 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 507: -#line 6381 "fe/idl.ypp" /* yacc.c:1646 */ + case 508: +#line 6387 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_EventTypeQsSeen); @@ -9290,120 +9300,120 @@ yyreduce: */ idl_global->scopes ().pop (); } -#line 9294 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9304 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 508: -#line 6394 "fe/idl.ypp" /* yacc.c:1646 */ + case 509: +#line 6400 "fe/idl.ypp" /* yacc.c:1646 */ { // event_header : event_custom_header (yyval.idval) = (yyvsp[0].idval); } -#line 9303 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9313 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 509: -#line 6399 "fe/idl.ypp" /* yacc.c:1646 */ + case 510: +#line 6405 "fe/idl.ypp" /* yacc.c:1646 */ { // event_header : event_plain_header (yyval.idval) = (yyvsp[0].idval); } -#line 9312 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9322 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 510: -#line 6407 "fe/idl.ypp" /* yacc.c:1646 */ + case 511: +#line 6413 "fe/idl.ypp" /* yacc.c:1646 */ { // formal_parameter_type : IDL_TYPENAME (yyval.ntval) = AST_Decl::NT_type; } -#line 9321 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9331 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 511: -#line 6412 "fe/idl.ypp" /* yacc.c:1646 */ + case 512: +#line 6418 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_STRUCT (yyval.ntval) = AST_Decl::NT_struct; } -#line 9330 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9340 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 512: -#line 6417 "fe/idl.ypp" /* yacc.c:1646 */ + case 513: +#line 6423 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_UNION (yyval.ntval) = AST_Decl::NT_union; } -#line 9339 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9349 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 513: -#line 6422 "fe/idl.ypp" /* yacc.c:1646 */ + case 514: +#line 6428 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_EVENTTYPE (yyval.ntval) = AST_Decl::NT_eventtype; } -#line 9348 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9358 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 514: -#line 6427 "fe/idl.ypp" /* yacc.c:1646 */ + case 515: +#line 6433 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_SEQUENCE (yyval.ntval) = AST_Decl::NT_sequence; } -#line 9357 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9367 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 515: -#line 6432 "fe/idl.ypp" /* yacc.c:1646 */ + case 516: +#line 6438 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_INTERFACE (yyval.ntval) = AST_Decl::NT_interface; } -#line 9366 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9376 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 516: -#line 6437 "fe/idl.ypp" /* yacc.c:1646 */ + case 517: +#line 6443 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_VALUETYPE (yyval.ntval) = AST_Decl::NT_valuetype; } -#line 9375 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9385 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 517: -#line 6442 "fe/idl.ypp" /* yacc.c:1646 */ + case 518: +#line 6448 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_ENUM (yyval.ntval) = AST_Decl::NT_enum; } -#line 9384 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9394 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 518: -#line 6447 "fe/idl.ypp" /* yacc.c:1646 */ + case 519: +#line 6453 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_EXCEPTION (yyval.ntval) = AST_Decl::NT_except; } -#line 9393 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9403 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 519: -#line 6452 "fe/idl.ypp" /* yacc.c:1646 */ + case 520: +#line 6458 "fe/idl.ypp" /* yacc.c:1646 */ { // IDL_CONST const_type (yyval.ntval) = AST_Decl::NT_const; t_param_const_type = (yyvsp[0].etval); } -#line 9403 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9413 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 520: -#line 6461 "fe/idl.ypp" /* yacc.c:1646 */ + case 521: +#line 6467 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_formal_parameter : formal_parameter formal_parameters if ((yyvsp[0].plval) == 0) @@ -9434,20 +9444,20 @@ yyreduce: (yyval.plval) = (yyvsp[0].plval); } -#line 9438 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9448 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 521: -#line 6495 "fe/idl.ypp" /* yacc.c:1646 */ + case 522: +#line 6501 "fe/idl.ypp" /* yacc.c:1646 */ { // formal_parameters : formal_parameters ',' // Maybe add a new parse state to set here. } -#line 9447 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9457 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 522: -#line 6500 "fe/idl.ypp" /* yacc.c:1646 */ + case 523: +#line 6506 "fe/idl.ypp" /* yacc.c:1646 */ { // formal_parameter if ((yyvsp[-3].plval) == 0) @@ -9463,20 +9473,20 @@ yyreduce: delete (yyvsp[0].pival); (yyvsp[0].pival) = 0; } -#line 9467 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9477 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 523: -#line 6516 "fe/idl.ypp" /* yacc.c:1646 */ + case 524: +#line 6522 "fe/idl.ypp" /* yacc.c:1646 */ { // /* EMPTY */ (yyval.plval) = 0; } -#line 9476 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9486 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 524: -#line 6524 "fe/idl.ypp" /* yacc.c:1646 */ + case 525: +#line 6530 "fe/idl.ypp" /* yacc.c:1646 */ { // formal_parameter : formal_parameter_type IDENTIFIER @@ -9502,11 +9512,11 @@ yyreduce: tao_enum_constant_decl = 0; } } -#line 9506 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9516 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 525: -#line 6550 "fe/idl.ypp" /* yacc.c:1646 */ + case 526: +#line 6556 "fe/idl.ypp" /* yacc.c:1646 */ { ACE_NEW_RETURN ((yyval.pival), FE_Utils::T_Param_Info, @@ -9521,11 +9531,11 @@ yyreduce: ACE::strdelete ((yyvsp[0].strval)); (yyvsp[0].strval) = 0; } -#line 9525 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9535 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 526: -#line 6568 "fe/idl.ypp" /* yacc.c:1646 */ + case 527: +#line 6574 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_formal_parameter_name : formal_parameter_name formal_parameter_names ACE_NEW_RETURN ((yyval.slval), @@ -9533,11 +9543,11 @@ yyreduce: (yyvsp[0].slval)), 1); } -#line 9537 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9547 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 527: -#line 6579 "fe/idl.ypp" /* yacc.c:1646 */ + case 528: +#line 6585 "fe/idl.ypp" /* yacc.c:1646 */ { // formal_parameter_names : formal_parameter_names ',' formal_parameter_name UTL_StrList *sl = 0; @@ -9556,40 +9566,40 @@ yyreduce: (yyval.slval) = (yyvsp[-2].slval); } } -#line 9560 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9570 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 528: -#line 6598 "fe/idl.ypp" /* yacc.c:1646 */ + case 529: +#line 6604 "fe/idl.ypp" /* yacc.c:1646 */ { // /* EMPTY */ (yyval.slval) = 0; } -#line 9569 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9579 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 529: -#line 6606 "fe/idl.ypp" /* yacc.c:1646 */ + case 530: +#line 6612 "fe/idl.ypp" /* yacc.c:1646 */ { // formal_parameter_name : IDENTIFIER ACE_NEW_RETURN ((yyval.sval), UTL_String ((yyvsp[0].strval), true), 1); } -#line 9580 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9590 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 530: -#line 6616 "fe/idl.ypp" /* yacc.c:1646 */ + case 531: +#line 6622 "fe/idl.ypp" /* yacc.c:1646 */ { // porttype_decl : IDL_PORTTYPE idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSeen); } -#line 9589 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9599 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 531: -#line 6621 "fe/idl.ypp" /* yacc.c:1646 */ + case 532: +#line 6627 "fe/idl.ypp" /* yacc.c:1646 */ { // IDENTIFIER idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeIDSeen); @@ -9608,29 +9618,29 @@ yyreduce: // Push it on the scopes stack. idl_global->scopes ().push (p); } -#line 9612 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9622 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 532: -#line 6640 "fe/idl.ypp" /* yacc.c:1646 */ + case 533: +#line 6646 "fe/idl.ypp" /* yacc.c:1646 */ { // '{' idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeSqSeen); } -#line 9621 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9631 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 533: -#line 6645 "fe/idl.ypp" /* yacc.c:1646 */ + case 534: +#line 6651 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_port_export idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeBodySeen); } -#line 9630 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9640 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 534: -#line 6650 "fe/idl.ypp" /* yacc.c:1646 */ + case 535: +#line 6656 "fe/idl.ypp" /* yacc.c:1646 */ { // '}' idl_global->set_parse_state (IDL_GlobalData::PS_PorttypeQsSeen); @@ -9638,84 +9648,84 @@ yyreduce: // Done with this port type - pop it off the scopes stack. idl_global->scopes ().pop (); } -#line 9642 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9652 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 535: -#line 6661 "fe/idl.ypp" /* yacc.c:1646 */ + case 536: +#line 6667 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_port_export : port_export port_exports } -#line 9650 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9660 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 536: -#line 6668 "fe/idl.ypp" /* yacc.c:1646 */ + case 537: +#line 6674 "fe/idl.ypp" /* yacc.c:1646 */ { // port_exports : port_exports port_export } -#line 9658 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9668 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 537: -#line 6672 "fe/idl.ypp" /* yacc.c:1646 */ + case 538: +#line 6678 "fe/idl.ypp" /* yacc.c:1646 */ { // | /* EMPTY */ } -#line 9666 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9676 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 538: -#line 6679 "fe/idl.ypp" /* yacc.c:1646 */ + case 539: +#line 6685 "fe/idl.ypp" /* yacc.c:1646 */ { // port_export : provides_decl } -#line 9674 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9684 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 539: -#line 6683 "fe/idl.ypp" /* yacc.c:1646 */ + case 540: +#line 6689 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' } -#line 9682 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9692 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 540: -#line 6687 "fe/idl.ypp" /* yacc.c:1646 */ + case 541: +#line 6693 "fe/idl.ypp" /* yacc.c:1646 */ { // | uses_decl } -#line 9690 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9700 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 541: -#line 6691 "fe/idl.ypp" /* yacc.c:1646 */ + case 542: +#line 6697 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' } -#line 9698 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9708 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 542: -#line 6695 "fe/idl.ypp" /* yacc.c:1646 */ + case 543: +#line 6701 "fe/idl.ypp" /* yacc.c:1646 */ { // | attribute idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 9707 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9717 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 543: -#line 6700 "fe/idl.ypp" /* yacc.c:1646 */ + case 544: +#line 6706 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' } -#line 9715 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9725 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 544: -#line 6707 "fe/idl.ypp" /* yacc.c:1646 */ + case 545: +#line 6713 "fe/idl.ypp" /* yacc.c:1646 */ { // extended_port_decl : IDL_PORT scoped_name IDENTIFIER idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); @@ -9785,11 +9795,11 @@ yyreduce: delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; } -#line 9789 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9799 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 545: -#line 6777 "fe/idl.ypp" /* yacc.c:1646 */ + case 546: +#line 6783 "fe/idl.ypp" /* yacc.c:1646 */ { // | IDL_MIRRORPORT scoped_name IDENTIFIER idl_global->set_parse_state (IDL_GlobalData::PS_MirrorPortDeclSeen); @@ -9837,11 +9847,11 @@ yyreduce: delete (yyvsp[-1].idlist); (yyvsp[-1].idlist) = 0; } -#line 9841 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9851 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 546: -#line 6828 "fe/idl.ypp" /* yacc.c:1646 */ + case 547: +#line 6834 "fe/idl.ypp" /* yacc.c:1646 */ { // at_least_one_actual_parameter : actual_parameter actual_parameters if ((yyvsp[0].alval) == 0) @@ -9854,11 +9864,11 @@ yyreduce: (yyvsp[0].alval)->enqueue_head ((yyvsp[-1].dcval)); (yyval.alval) = (yyvsp[0].alval); } -#line 9858 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9868 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 547: -#line 6844 "fe/idl.ypp" /* yacc.c:1646 */ + case 548: +#line 6850 "fe/idl.ypp" /* yacc.c:1646 */ { // actual_parameters : actual_parameters ',' actual_parameter if ((yyvsp[-2].alval) == 0) @@ -9871,20 +9881,20 @@ yyreduce: (yyvsp[-2].alval)->enqueue_tail ((yyvsp[0].dcval)); (yyval.alval) = (yyvsp[-2].alval); } -#line 9875 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9885 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 548: -#line 6857 "fe/idl.ypp" /* yacc.c:1646 */ + case 549: +#line 6863 "fe/idl.ypp" /* yacc.c:1646 */ { // | /* EMPTY */ (yyval.alval) = 0; } -#line 9884 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9894 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 549: -#line 6865 "fe/idl.ypp" /* yacc.c:1646 */ + case 550: +#line 6871 "fe/idl.ypp" /* yacc.c:1646 */ { // actual_parameter : expression // To avoid grammar conflicts with this LALR(1) parser, @@ -9941,29 +9951,29 @@ yyreduce: 0); } } -#line 9945 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9955 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 551: -#line 6929 "fe/idl.ypp" /* yacc.c:1646 */ + case 552: +#line 6935 "fe/idl.ypp" /* yacc.c:1646 */ { // connector_header : IDL_CONNECTOR idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSeen); } -#line 9954 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9964 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 552: -#line 6934 "fe/idl.ypp" /* yacc.c:1646 */ + case 553: +#line 6940 "fe/idl.ypp" /* yacc.c:1646 */ { // IDENTIFIER idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorIDSeen); } -#line 9963 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 9973 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 553: -#line 6939 "fe/idl.ypp" /* yacc.c:1646 */ + case 554: +#line 6945 "fe/idl.ypp" /* yacc.c:1646 */ { // component_inheritance_spec UTL_Scope *s = idl_global->scopes ().top_non_null (); @@ -10016,29 +10026,29 @@ yyreduce: idl_global->scopes ().push (c); } } -#line 10020 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10030 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 554: -#line 6995 "fe/idl.ypp" /* yacc.c:1646 */ + case 555: +#line 7001 "fe/idl.ypp" /* yacc.c:1646 */ { // connector_body " '{' idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen); } -#line 10029 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10039 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 555: -#line 7000 "fe/idl.ypp" /* yacc.c:1646 */ + case 556: +#line 7006 "fe/idl.ypp" /* yacc.c:1646 */ { // connector_exports idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen); } -#line 10038 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10048 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 556: -#line 7005 "fe/idl.ypp" /* yacc.c:1646 */ + case 557: +#line 7011 "fe/idl.ypp" /* yacc.c:1646 */ { // '} idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorQsSeen); @@ -10046,83 +10056,83 @@ yyreduce: // Done with this connector - pop it off the scope stack. idl_global->scopes ().pop (); } -#line 10050 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10060 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 559: -#line 7021 "fe/idl.ypp" /* yacc.c:1646 */ + case 560: +#line 7027 "fe/idl.ypp" /* yacc.c:1646 */ { // connector_export : provides_decl idl_global->set_parse_state (IDL_GlobalData::PS_ProvidesDeclSeen); } -#line 10059 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10069 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 560: -#line 7026 "fe/idl.ypp" /* yacc.c:1646 */ + case 561: +#line 7032 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10068 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10078 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 561: -#line 7031 "fe/idl.ypp" /* yacc.c:1646 */ + case 562: +#line 7037 "fe/idl.ypp" /* yacc.c:1646 */ { // | uses_decl idl_global->set_parse_state (IDL_GlobalData::PS_UsesDeclSeen); } -#line 10077 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10087 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 562: -#line 7036 "fe/idl.ypp" /* yacc.c:1646 */ + case 563: +#line 7042 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10086 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10096 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 563: -#line 7041 "fe/idl.ypp" /* yacc.c:1646 */ + case 564: +#line 7047 "fe/idl.ypp" /* yacc.c:1646 */ { // | attribute idl_global->set_parse_state (IDL_GlobalData::PS_AttrDeclSeen); } -#line 10095 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10105 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 564: -#line 7046 "fe/idl.ypp" /* yacc.c:1646 */ + case 565: +#line 7052 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10104 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10114 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 565: -#line 7051 "fe/idl.ypp" /* yacc.c:1646 */ + case 566: +#line 7057 "fe/idl.ypp" /* yacc.c:1646 */ { // | extended_port_decl idl_global->set_parse_state (IDL_GlobalData::PS_ExtendedPortDeclSeen); } -#line 10113 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10123 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; - case 566: -#line 7056 "fe/idl.ypp" /* yacc.c:1646 */ + case 567: +#line 7062 "fe/idl.ypp" /* yacc.c:1646 */ { // ';' idl_global->set_parse_state (IDL_GlobalData::PS_NoState); } -#line 10122 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10132 "fe/idl.tab.cpp" /* yacc.c:1646 */ break; -#line 10126 "fe/idl.tab.cpp" /* yacc.c:1646 */ +#line 10136 "fe/idl.tab.cpp" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -10350,7 +10360,7 @@ yyreturn: #endif return yyresult; } -#line 7062 "fe/idl.ypp" /* yacc.c:1906 */ +#line 7068 "fe/idl.ypp" /* yacc.c:1906 */ /* programs */ diff --git a/TAO/TAO_IDL/fe/idl.tab.hpp b/TAO/TAO_IDL/fe/idl.tab.hpp index 669bac57fc6..6a6cf292f4a 100644 --- a/TAO/TAO_IDL/fe/idl.tab.hpp +++ b/TAO/TAO_IDL/fe/idl.tab.hpp @@ -136,7 +136,7 @@ extern int tao_yydebug; typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 153 "fe/idl.ypp" /* yacc.c:1909 */ +#line 154 "fe/idl.ypp" /* yacc.c:1909 */ AST_Decl *dcval; /* Decl value */ UTL_StrList *slval; /* String list */ @@ -163,6 +163,7 @@ union YYSTYPE ACE_CDR::Float fval; /* Float value */ ACE_CDR::Char cval; /* Char value */ ACE_CDR::WChar wcval; /* WChar value */ + ACE_CDR::Fixed fixval; /* Fixed point value */ UTL_String *sval; /* String value */ char *wsval; /* WString value */ char *strval; /* char * value */ @@ -173,7 +174,7 @@ union YYSTYPE FE_Utils::T_PARAMLIST_INFO *plval; /* List of template params */ FE_Utils::T_ARGLIST *alval; /* List of template args */ -#line 177 "fe/idl.tab.hpp" /* yacc.c:1909 */ +#line 178 "fe/idl.tab.hpp" /* yacc.c:1909 */ }; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 diff --git a/TAO/TAO_IDL/fe/idl.ypp b/TAO/TAO_IDL/fe/idl.ypp index 45c681842c0..beec9117e2d 100644 --- a/TAO/TAO_IDL/fe/idl.ypp +++ b/TAO/TAO_IDL/fe/idl.ypp @@ -87,6 +87,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_array.h" #include "ast_attribute.h" #include "ast_field.h" +#include "ast_fixed.h" #include "ast_expression.h" #include "ast_operation.h" #include "ast_generator.h" @@ -176,6 +177,7 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none; ACE_CDR::Float fval; /* Float value */ ACE_CDR::Char cval; /* Char value */ ACE_CDR::WChar wcval; /* WChar value */ + ACE_CDR::Fixed fixval; /* Fixed point value */ UTL_String *sval; /* String value */ char *wsval; /* WString value */ char *strval; /* char * value */ @@ -271,7 +273,7 @@ AST_Expression::ExprType t_param_const_type = AST_Expression::EV_none; %token <sval> IDL_STRING_LITERAL %token <cval> IDL_CHARACTER_LITERAL %token <dval> IDL_FLOATING_PT_LITERAL -%token <sval> IDL_FIXED_PT_LITERAL +%token <fixval> IDL_FIXED_PT_LITERAL %token IDL_TRUETOK %token IDL_FALSETOK @@ -2233,6 +2235,10 @@ literal ACE_OutputCDR::from_wchar wc ($1); $$ = idl_global->gen ()->create_expr (wc); } + | IDL_FIXED_PT_LITERAL + { + $$ = idl_global->gen ()->create_expr ($1); + } | IDL_FLOATING_PT_LITERAL { // | IDL_FLOATING_PT_LITERAL @@ -3777,7 +3783,7 @@ seq_head : fixed_type_spec : IDL_FIXED '<' positive_int_expr ',' const_expr '>' { - //TODO + $$ = idl_global->gen ()->create_fixed ($3, $5); } ; diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index fbc478818d3..909664306b8 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -1758,15 +1758,13 @@ case 77: YY_RULE_SETUP #line 245 "fe/idl.ll" { - ACE_NEW_RETURN (tao_yylval.sval, - UTL_String (ace_yytext, true), - IDL_FIXED_PT_LITERAL); + tao_yylval.fixval = ACE_CDR::Fixed::from_string (ace_yytext); return IDL_FIXED_PT_LITERAL; } YY_BREAK case 78: YY_RULE_SETUP -#line 252 "fe/idl.ll" +#line 250 "fe/idl.ll" { tao_yylval.ival = idl_atoi (ace_yytext, 10); return IDL_INTEGER_LITERAL; @@ -1774,7 +1772,7 @@ YY_RULE_SETUP YY_BREAK case 79: YY_RULE_SETUP -#line 256 "fe/idl.ll" +#line 254 "fe/idl.ll" { tao_yylval.uival = idl_atoui (ace_yytext, 10); return IDL_UINTEGER_LITERAL; @@ -1782,7 +1780,7 @@ YY_RULE_SETUP YY_BREAK case 80: YY_RULE_SETUP -#line 260 "fe/idl.ll" +#line 258 "fe/idl.ll" { tao_yylval.ival = idl_atoi (ace_yytext, 16); return IDL_INTEGER_LITERAL; @@ -1790,7 +1788,7 @@ YY_RULE_SETUP YY_BREAK case 81: YY_RULE_SETUP -#line 264 "fe/idl.ll" +#line 262 "fe/idl.ll" { tao_yylval.uival = idl_atoui (ace_yytext, 16); return IDL_UINTEGER_LITERAL; @@ -1798,7 +1796,7 @@ YY_RULE_SETUP YY_BREAK case 82: YY_RULE_SETUP -#line 268 "fe/idl.ll" +#line 266 "fe/idl.ll" { tao_yylval.ival = idl_atoi (ace_yytext, 8); return IDL_INTEGER_LITERAL; @@ -1806,7 +1804,7 @@ YY_RULE_SETUP YY_BREAK case 83: YY_RULE_SETUP -#line 272 "fe/idl.ll" +#line 270 "fe/idl.ll" { tao_yylval.uival = idl_atoui (ace_yytext, 8); return IDL_UINTEGER_LITERAL; @@ -1815,7 +1813,7 @@ YY_RULE_SETUP case 84: /* rule 84 can match eol */ YY_RULE_SETUP -#line 277 "fe/idl.ll" +#line 275 "fe/idl.ll" { /* Skip the quotes */ char * const tmp = ace_yytext; @@ -1840,7 +1838,7 @@ YY_RULE_SETUP case 85: /* rule 85 can match eol */ YY_RULE_SETUP -#line 297 "fe/idl.ll" +#line 295 "fe/idl.ll" { /* Skip the bookends */ char * const tmp = ACE_OS::strdup (ace_yytext); @@ -1862,7 +1860,7 @@ YY_RULE_SETUP YY_BREAK case 86: YY_RULE_SETUP -#line 315 "fe/idl.ll" +#line 313 "fe/idl.ll" { tao_yylval.cval = ace_yytext[1]; return IDL_CHARACTER_LITERAL; @@ -1870,7 +1868,7 @@ YY_RULE_SETUP YY_BREAK case 87: YY_RULE_SETUP -#line 319 "fe/idl.ll" +#line 317 "fe/idl.ll" { // octal character constant tao_yylval.cval = idl_escape_reader (ace_yytext + 1); @@ -1879,7 +1877,7 @@ YY_RULE_SETUP YY_BREAK case 88: YY_RULE_SETUP -#line 324 "fe/idl.ll" +#line 322 "fe/idl.ll" { // hexadecimal character constant tao_yylval.cval = idl_escape_reader (ace_yytext + 1); @@ -1888,7 +1886,7 @@ YY_RULE_SETUP YY_BREAK case 89: YY_RULE_SETUP -#line 329 "fe/idl.ll" +#line 327 "fe/idl.ll" { tao_yylval.cval = idl_escape_reader (ace_yytext + 1); return IDL_CHARACTER_LITERAL; @@ -1896,7 +1894,7 @@ YY_RULE_SETUP YY_BREAK case 90: YY_RULE_SETUP -#line 333 "fe/idl.ll" +#line 331 "fe/idl.ll" { // wide character constant tao_yylval.wcval = ace_yytext[2]; @@ -1905,7 +1903,7 @@ YY_RULE_SETUP YY_BREAK case 91: YY_RULE_SETUP -#line 338 "fe/idl.ll" +#line 336 "fe/idl.ll" { // hexadecimal wide character constant tao_yylval.wcval = idl_wchar_escape_reader (ace_yytext + 2); @@ -1914,11 +1912,11 @@ YY_RULE_SETUP YY_BREAK case 92: /* rule 92 can match eol */ -#line 344 "fe/idl.ll" +#line 342 "fe/idl.ll" case 93: /* rule 93 can match eol */ YY_RULE_SETUP -#line 344 "fe/idl.ll" +#line 342 "fe/idl.ll" {/* remember pragma */ idl_global->set_lineno (idl_global->lineno () + 1); idl_store_pragma (ace_yytext); @@ -1927,11 +1925,11 @@ YY_RULE_SETUP YY_BREAK case 94: /* rule 94 can match eol */ -#line 350 "fe/idl.ll" +#line 348 "fe/idl.ll" case 95: /* rule 95 can match eol */ YY_RULE_SETUP -#line 350 "fe/idl.ll" +#line 348 "fe/idl.ll" {/* ignore file */ idl_global->set_lineno(idl_global->lineno () + 1); break; @@ -1939,11 +1937,11 @@ YY_RULE_SETUP YY_BREAK case 96: /* rule 96 can match eol */ -#line 355 "fe/idl.ll" +#line 353 "fe/idl.ll" case 97: /* rule 97 can match eol */ YY_RULE_SETUP -#line 355 "fe/idl.ll" +#line 353 "fe/idl.ll" { idl_parse_line_and_file (ace_yytext); break; @@ -1951,11 +1949,11 @@ YY_RULE_SETUP YY_BREAK case 98: /* rule 98 can match eol */ -#line 360 "fe/idl.ll" +#line 358 "fe/idl.ll" case 99: /* rule 99 can match eol */ YY_RULE_SETUP -#line 360 "fe/idl.ll" +#line 358 "fe/idl.ll" { idl_parse_line_and_file (ace_yytext); break; @@ -1963,11 +1961,11 @@ YY_RULE_SETUP YY_BREAK case 100: /* rule 100 can match eol */ -#line 365 "fe/idl.ll" +#line 363 "fe/idl.ll" case 101: /* rule 101 can match eol */ YY_RULE_SETUP -#line 365 "fe/idl.ll" +#line 363 "fe/idl.ll" { idl_parse_line_and_file (ace_yytext); break; @@ -1975,11 +1973,11 @@ YY_RULE_SETUP YY_BREAK case 102: /* rule 102 can match eol */ -#line 370 "fe/idl.ll" +#line 368 "fe/idl.ll" case 103: /* rule 103 can match eol */ YY_RULE_SETUP -#line 370 "fe/idl.ll" +#line 368 "fe/idl.ll" { idl_parse_line_and_file (ace_yytext); break; @@ -1987,11 +1985,11 @@ YY_RULE_SETUP YY_BREAK case 104: /* rule 104 can match eol */ -#line 375 "fe/idl.ll" +#line 373 "fe/idl.ll" case 105: /* rule 105 can match eol */ YY_RULE_SETUP -#line 375 "fe/idl.ll" +#line 373 "fe/idl.ll" { /* ignore cpp ident */ idl_global->set_lineno (idl_global->lineno () + 1); @@ -2001,7 +1999,7 @@ YY_RULE_SETUP case 106: /* rule 106 can match eol */ YY_RULE_SETUP -#line 380 "fe/idl.ll" +#line 378 "fe/idl.ll" { /* ignore comments */ idl_global->set_lineno(idl_global->lineno () + 1); @@ -2010,7 +2008,7 @@ YY_RULE_SETUP YY_BREAK case 107: YY_RULE_SETUP -#line 385 "fe/idl.ll" +#line 383 "fe/idl.ll" { for (;;) { @@ -2032,28 +2030,28 @@ YY_RULE_SETUP YY_BREAK case 108: YY_RULE_SETUP -#line 403 "fe/idl.ll" +#line 401 "fe/idl.ll" ; YY_BREAK case 109: /* rule 109 can match eol */ YY_RULE_SETUP -#line 404 "fe/idl.ll" +#line 402 "fe/idl.ll" { idl_global->set_lineno (idl_global->lineno () + 1); } YY_BREAK case 110: YY_RULE_SETUP -#line 407 "fe/idl.ll" +#line 405 "fe/idl.ll" return ace_yytext[0]; YY_BREAK case 111: YY_RULE_SETUP -#line 409 "fe/idl.ll" +#line 407 "fe/idl.ll" ECHO; YY_BREAK -#line 2060 "<stdout>" +#line 2058 "<stdout>" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -3051,7 +3049,7 @@ void tao_yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 409 "fe/idl.ll" +#line 407 "fe/idl.ll" /* subroutines */ diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h index 3cf5133cd55..78ad4eaceb2 100644 --- a/TAO/TAO_IDL/include/ast_expression.h +++ b/TAO/TAO_IDL/include/ast_expression.h @@ -178,6 +178,7 @@ public: UTL_String *strval; // Contains String * expr value. char *wstrval; // Contains wide string expr value. ACE_CDR::ULong eval; // Contains enumeration value. + ACE_CDR::Fixed fixedval; // Contains IDL fixed value. } u; ExprType et; @@ -226,6 +227,8 @@ public: AST_Expression (UTL_ScopedName *n); + AST_Expression (const ACE_CDR::Fixed &f); + // Destructor. virtual ~AST_Expression (void); diff --git a/TAO/TAO_IDL/include/ast_fixed.h b/TAO/TAO_IDL/include/ast_fixed.h new file mode 100644 index 00000000000..2c7a8793375 --- /dev/null +++ b/TAO/TAO_IDL/include/ast_fixed.h @@ -0,0 +1,36 @@ +// This may look like C, but it's really -*- C++ -*- +#ifndef AST_FIXED_H +#define AST_FIXED_H + +#include "ast_concrete_type.h" + +#include "fe_utils.h" + +class AST_Expression; + +class TAO_IDL_FE_Export AST_Fixed : public virtual AST_ConcreteType +{ +public: + AST_Fixed (UTL_ScopedName *name, + AST_Expression *digits, + AST_Expression *scale); + + virtual ~AST_Fixed (); + + DEF_NARROW_FROM_DECL (AST_Fixed); + + virtual void dump (ACE_OSTREAM_TYPE &o); + + virtual void destroy (); + + virtual int ast_accept (ast_visitor *visitor); + + AST_Expression *digits (); + AST_Expression *scale (); + +private: + AST_Expression *pd_digits; + AST_Expression *pd_scale; +}; + +#endif // AST_FIXED_H diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h index 931f46e782a..9ebea1697ae 100644 --- a/TAO/TAO_IDL/include/ast_generator.h +++ b/TAO/TAO_IDL/include/ast_generator.h @@ -92,6 +92,7 @@ class AST_Template_Module_Inst; class AST_Template_Module_Ref; class AST_Param_Holder; class AST_Finder; +class AST_Fixed; // Defines base class for node generators. @@ -304,6 +305,8 @@ public: virtual AST_Expression *create_expr (ACE_CDR::Double d); + virtual AST_Expression *create_expr (const ACE_CDR::Fixed &f); + // Create a node representing an enumerator. virtual AST_EnumVal *create_enum_val (ACE_CDR::ULong v, UTL_ScopedName *n); @@ -328,6 +331,9 @@ public: // Create a node representing a wide string type. virtual AST_String *create_wstring (AST_Expression *v); + virtual AST_Fixed *create_fixed (AST_Expression *digits, + AST_Expression *scale); + // Create a node representing a type renaming (typedef). virtual AST_Typedef *create_typedef (AST_Type *bt, UTL_ScopedName *n, diff --git a/TAO/TAO_IDL/include/ast_visitor.h b/TAO/TAO_IDL/include/ast_visitor.h index 97b08146655..a38300e805a 100644 --- a/TAO/TAO_IDL/include/ast_visitor.h +++ b/TAO/TAO_IDL/include/ast_visitor.h @@ -67,6 +67,7 @@ class AST_Typedef; class AST_Root; class AST_Native; class AST_Param_Holder; +class AST_Fixed; /** * @class ast_visitor @@ -136,6 +137,7 @@ public: virtual int visit_root (AST_Root *node) = 0; virtual int visit_native (AST_Native *node) = 0; virtual int visit_valuebox (AST_ValueBox *node) = 0; + virtual int visit_fixed (AST_Fixed *node); protected: // For abstract class. diff --git a/TAO/TAO_IDL/regen.sh b/TAO/TAO_IDL/regen.sh index 4e3a478a493..94b877bf8c3 100755 --- a/TAO/TAO_IDL/regen.sh +++ b/TAO/TAO_IDL/regen.sh @@ -1,3 +1,6 @@ -mpc.pl -type gnuace -features tao_idl_fe_gen=1 tao_idl_fe.mpc && \ -touch fe/keywords.dat && \ -make -f GNUmakefile.TAO_IDL_GEN tao_idl_fe_gen=1 lex.yy y.tab +if [[ tao_idl_fe.mpc -nt GNUmakefile.TAO_IDL_GEN ]]; then + mpc.pl -type gnuace -features tao_idl_fe_gen=1 tao_idl_fe.mpc && \ + touch fe/keywords.dat +fi && \ +make -f GNUmakefile.TAO_IDL_GEN tao_idl_fe_gen=1 lex.yy y.tab all && \ +make diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc index 6ec512b8c02..4e2667b9e29 100644 --- a/TAO/TAO_IDL/tao_idl_fe.mpc +++ b/TAO/TAO_IDL/tao_idl_fe.mpc @@ -1,7 +1,10 @@ // -*- MPC -*- project(TAO_IDL_GEN) { requires += tao_idl_fe_gen + custom_only = 1 + verbatim(gnuace, local) { + all: fe/fe_lookup.cpp fe/idl.yy.cpp fe/idl.tab.cpp fe/idl.tab.hpp fe/fe_lookup.cpp: fe/keywords.dat " echo '#include \"fe_private.h\"' > $@" " echo '#include \"ace/OS_NS_string.h\"' >> $@" @@ -11,7 +14,7 @@ project(TAO_IDL_GEN) { " -e 's/\\*str == \\*s && !ACE_OS::strncmp/len == static_cast<unsigned int> (ACE_OS::strlen (s)) \\&\\& *str == *s \\&\\& !ACE_OS::strncmp/g' \\" " >> $@" - fe/lex.yy.cpp: fe/idl.ll + fe/idl.yy.cpp: fe/idl.ll " @echo 'WARNING: Potentially outdated $@'" " @echo ' either touch(1) the file or explicitly'" " @echo ' generate it using:'" @@ -37,7 +40,7 @@ project(TAO_IDL_GEN) { " @/bin/false" "endif" - fe/idl.tab.cpp: fe/idl.yy + fe/idl.tab.cpp fe/idl.tab.hpp: fe/idl.ypp " @echo 'WARNING: Potentially outdated $@'" " @echo ' either touch(1) the file or explicitly'" " @echo ' generate it using:'" @@ -59,6 +62,7 @@ project(TAO_IDL_FE) : acelib, conv_lib, tao_output { dynamicflags += TAO_IDL_FE_BUILD_DLL includes += $(TAO_ROOT) includes += include fe + after += TAO_IDL_GEN specific { // Override the template value for optimize. Building the frontend diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp index 32eac6c23b1..e007a442103 100644 --- a/TAO/TAO_IDL/util/utl_err.cpp +++ b/TAO/TAO_IDL/util/utl_err.cpp @@ -296,6 +296,8 @@ exprtype_to_string (AST_Expression::ExprType t) return "any"; case AST_Expression::EV_object: return "object"; + case AST_Expression::EV_fixed: + return "fixed"; } return 0; } |