diff options
Diffstat (limited to 'TAO/TAO_IDL')
| -rw-r--r-- | TAO/TAO_IDL/ast/ast_decl.cpp | 53 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 13 | ||||
| -rw-r--r-- | TAO/TAO_IDL/include/idl_global.h | 15 | ||||
| -rw-r--r-- | TAO/TAO_IDL/util/utl_global.cpp | 27 |
4 files changed, 46 insertions, 62 deletions
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp index d7c6a619cba..f877e5ef2c9 100644 --- a/TAO/TAO_IDL/ast/ast_decl.cpp +++ b/TAO/TAO_IDL/ast/ast_decl.cpp @@ -93,8 +93,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // FUZZ: disable check_for_streams_include #include "ace/streams.h" -ACE_RCSID (ast, - ast_decl, +ACE_RCSID (ast, + ast_decl, "$Id$") COMMON_Base::COMMON_Base (idl_bool local, @@ -296,7 +296,7 @@ AST_Decl::set_prefix_with_typeprefix_r (const char *value, AST_Decl *tmp = 0; UTL_Scope *s_tmp = 0; - for (UTL_ScopeActiveIterator i (s, UTL_Scope::IK_decls); + for (UTL_ScopeActiveIterator i (s, UTL_Scope::IK_decls); !i.is_done (); i.next ()) { @@ -355,8 +355,8 @@ AST_Decl::compute_full_name (void) long second = I_FALSE; char *name = 0; - for (UTL_IdListActiveIterator i (this->name ()); - !i.is_done (); + for (UTL_IdListActiveIterator i (this->name ()); + !i.is_done (); i.next ()) { if (!first) @@ -393,8 +393,8 @@ AST_Decl::compute_full_name (void) first = I_TRUE; second = I_FALSE; - for (UTL_IdListActiveIterator j (this->name ()); - !j.is_done (); + for (UTL_IdListActiveIterator j (this->name ()); + !j.is_done (); j.next ()) { if (!first) @@ -484,8 +484,8 @@ AST_Decl::compute_repoID (void) namelen += 4; } - for (UTL_IdListActiveIterator i (this->name ()); - !i.is_done (); + for (UTL_IdListActiveIterator i (this->name ()); + !i.is_done (); i.next ()) { if (!first) @@ -540,12 +540,12 @@ AST_Decl::compute_repoID (void) ACE_OS::strcat (this->repoID_, "/"); } - + first = I_TRUE; second = I_FALSE; - for (UTL_IdListActiveIterator j (this->name ()); - !j.is_done (); + for (UTL_IdListActiveIterator j (this->name ()); + !j.is_done (); j.next ()) { if (!first) @@ -869,7 +869,7 @@ AST_Decl::repoID (char *value) delete [] this->repoID_; this->repoID_ = 0; } - + this->repoID_ = value; } @@ -933,14 +933,14 @@ AST_Decl::version (char *value) { delete [] this->version_; this->version_ = value; - + // Repo id is now computed eagerly, so a version set must update // is as well. if (this->repoID_ != 0) { ACE_CString tmp (this->repoID_); int pos = tmp.rfind (':'); - + if (pos != ACE_CString::npos) { tmp = tmp.substr (0, pos + 1) + value; @@ -994,7 +994,7 @@ AST_Decl::set_id_with_typeid (char *value) { case AST_Decl::NT_field: { - AST_Interface *iface = + AST_Interface *iface = AST_Interface::narrow_from_scope (this->defined_in ()); if (iface == 0 || iface->node_type () == AST_Decl::NT_valuetype == 0) @@ -1343,13 +1343,6 @@ void AST_Decl::last_referenced_as (UTL_ScopedName *n) { this->last_referenced_as_ = n; - - if (idl_global->in_main_file () - && ACE_OS::strcmp (n->last_component ()->get_string (), - "ParameterMode") == 0) - { - idl_global->parametermode_seen_ = true; - } } UTL_Scope * @@ -1365,7 +1358,7 @@ AST_Decl::prefix_scope (UTL_Scope *s) } // Container types will override this. -int +int AST_Decl::contains_wstring (void) { if (this->contains_wstring_ == -1) @@ -1375,7 +1368,7 @@ AST_Decl::contains_wstring (void) case AST_Decl::NT_array: { AST_Array *a = AST_Array::narrow_from_decl (this); - this->contains_wstring_ = + this->contains_wstring_ = a->base_type ()->contains_wstring (); break; } @@ -1384,14 +1377,14 @@ AST_Decl::contains_wstring (void) case AST_Decl::NT_union: { AST_Structure *s = AST_Structure::narrow_from_decl (this); - this->contains_wstring_ = + this->contains_wstring_ = s->contains_wstring (); break; } case AST_Decl::NT_sequence: { AST_Sequence *s = AST_Sequence::narrow_from_decl (this); - this->contains_wstring_ = + this->contains_wstring_ = s->base_type ()->contains_wstring (); break; } @@ -1400,14 +1393,14 @@ AST_Decl::contains_wstring (void) case AST_Decl::NT_union_branch: { AST_Field *f = AST_Field::narrow_from_decl (this); - this->contains_wstring_ = + this->contains_wstring_ = f->field_type ()->contains_wstring (); break; } case AST_Decl::NT_typedef: { AST_Typedef *td = AST_Typedef::narrow_from_decl (this); - this->contains_wstring_ = + this->contains_wstring_ = td->primitive_base_type ()->contains_wstring (); break; } @@ -1424,7 +1417,7 @@ AST_Decl::contains_wstring (void) } // Non-virtual - no need to override this one. -void +void AST_Decl::contains_wstring (int val) { this->contains_wstring_ = val; diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index f93ec62483e..c58e89e6d40 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1424,13 +1424,6 @@ TAO_CodeGen::gen_stub_hdr_includes (void) this->client_header_ ); - // ParameterMode is so rarely used, it was put in a separate TAO file. - this->gen_cond_file_include ( - idl_global->parametermode_seen_, - "tao/ParameterMode.h", - this->client_header_ - ); - // Include the Messaging library entry point, if AMI is enabled. if (be_global->ami_call_back () == I_TRUE) { @@ -1544,8 +1537,8 @@ TAO_CodeGen::gen_stub_src_includes (void) "tao/ORB_Core.h"); } - // We generate this include if we - // have typecode support + // We generate this include if we + // have typecode support // AND have not already included it in the header file // OR a TypeCode or TCKind reference is not seen // AND we are not generating typecodes in a separate file. @@ -1606,7 +1599,7 @@ TAO_CodeGen::gen_skel_src_includes (void) { return; } - + this->gen_standard_include (this->server_skeletons_, "tao/PortableServer/Object_Adapter.h"); this->gen_standard_include (this->server_skeletons_, diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index 83624a8cf9e..0f6de0c430f 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -299,7 +299,6 @@ public: bool object_arg_seen_; bool octet_seq_seen_; bool operation_seen_; - bool parametermode_seen_; bool pseudo_seq_seen_; bool seq_seen_; bool short_seq_seen_; @@ -523,17 +522,17 @@ public: ACE_Hash_Map_Manager<ACE_CString, char *, ACE_Null_Mutex> & file_prefixes (void); // Accessor for the IDL file prefix container. - + idl_bool pass_orb_idl (void) const; void pass_orb_idl (idl_bool val); // Accessor for the pass_orb_idl_ member. - + bool using_ifr_backend (void) const; void using_ifr_backend (bool val); - + int check_gperf (void); // Currently called only from IDL backend, but could be useful elsewhere. - + void fini (void); // Do final cleanup just before process exits. @@ -581,7 +580,7 @@ private: char *tao_root_; // Needed if orb.idl is included. - + char *gperf_path_; // Path for the perfect hash generator(gperf) program. Default // is $ACE_ROOT/bin/gperf. @@ -621,10 +620,10 @@ private: ACE_Hash_Map_Manager<ACE_CString, char *, ACE_Null_Mutex> file_prefixes_; // Associates a prefix with a file. - + idl_bool pass_orb_idl_; // Treat orb.idl like any other included IDL file. - + bool using_ifr_backend_; // Set by the IFR backend itself. }; diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp index 96d4f23a103..9af235781a1 100644 --- a/TAO/TAO_IDL/util/utl_global.cpp +++ b/TAO/TAO_IDL/util/utl_global.cpp @@ -135,7 +135,7 @@ IDL_GlobalData::IDL_GlobalData (void) // in the environment. // Form the absolute pathname. char* ace_root = ACE_OS::getenv ("ACE_ROOT"); - + if (ace_root == 0) // This may not cause any problem if -g option is used to specify // the correct path for the gperf program. Let us ignore this @@ -229,7 +229,6 @@ IDL_GlobalData::reset_flag_seen (void) object_arg_seen_ = false; octet_seq_seen_ = false; operation_seen_ = false; - parametermode_seen_ = false; pseudo_seq_seen_ = false; seq_seen_ = false; short_seq_seen_ = false; @@ -1008,7 +1007,7 @@ IDL_GlobalData::destroy (void) delete [] trash; trash = 0; } - + for (unsigned long j = 0; j < this->pd_n_include_file_names; ++j) { // Delete the contained char* but not the UTL_String - @@ -1016,15 +1015,15 @@ IDL_GlobalData::destroy (void) this->pd_include_file_names[j]->destroy (); this->pd_include_file_names[j] = 0; } - + this->pd_n_include_file_names = 0; - + for (size_t k = 0; k < n_included_idl_files_; ++k) { // No memory allocated for these, so just set to 0. this->included_idl_files_[k] = 0; } - + this->n_included_idl_files_ = 0; this->pd_root->destroy (); @@ -1432,14 +1431,14 @@ IDL_GlobalData::create_uses_multiple_stuff ( struct_name += "Connection"; Identifier struct_id (struct_name.c_str ()); UTL_ScopedName sn (&struct_id, 0); - AST_Structure *connection = + AST_Structure *connection = idl_global->gen ()->create_structure (&sn, 0, 0); struct_id.destroy (); - + Identifier object_id ("objref"); UTL_ScopedName object_name (&object_id, 0); - AST_Field *object_field = + AST_Field *object_field = idl_global->gen ()->create_field (pd.impl, &object_name, AST_Field::vis_NA); @@ -1465,7 +1464,7 @@ IDL_GlobalData::create_uses_multiple_stuff ( } AST_ValueType *cookie = AST_ValueType::narrow_from_decl (d); - + Identifier cookie_id ("ck"); UTL_ScopedName cookie_name (&cookie_id, 0); @@ -1475,9 +1474,9 @@ IDL_GlobalData::create_uses_multiple_stuff ( AST_Field::vis_NA); (void) DeclAsScope (connection)->fe_add_field (cookie_field); cookie_id.destroy (); - + (void) c->fe_add_structure (connection); - + ACE_UINT64 bound = 0; AST_Expression *bound_expr = idl_global->gen ()->create_expr (bound, @@ -1488,7 +1487,7 @@ IDL_GlobalData::create_uses_multiple_stuff ( 0, 0, 0); - + ACE_CString seq_string (pd.id->get_string ()); seq_string += "Connections"; Identifier seq_id (seq_string.c_str ()); @@ -1500,6 +1499,6 @@ IDL_GlobalData::create_uses_multiple_stuff ( 0, 0); seq_id.destroy (); - + (void) c->fe_add_typedef (connections); } |