diff options
Diffstat (limited to 'TAO/TAO_IDL/include')
49 files changed, 184 insertions, 184 deletions
diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h index 602be943cc9..d50831a9395 100644 --- a/TAO/TAO_IDL/include/ast_argument.h +++ b/TAO/TAO_IDL/include/ast_argument.h @@ -102,10 +102,10 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); - + static AST_Decl::NodeType const NT; private: diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h index 5ba744a4fe0..f9d94826178 100644 --- a/TAO/TAO_IDL/include/ast_array.h +++ b/TAO/TAO_IDL/include/ast_array.h @@ -105,7 +105,7 @@ public: // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. virtual bool legal_for_primary_key (void) const; - + // Cleanup. virtual void destroy (void); @@ -118,9 +118,9 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + static AST_Decl::NodeType const NT; - + protected: virtual int compute_size_type (void); // Compute the size type if it is unknown. @@ -136,7 +136,7 @@ private: AST_Type *pd_base_type; // Base type of array. - + bool owns_base_type_; // If our base type is anonymous array or sequence, we're // responsible for destroying it. diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h index abdcbdc85ce..c8ebf245889 100644 --- a/TAO/TAO_IDL/include/ast_attribute.h +++ b/TAO/TAO_IDL/include/ast_attribute.h @@ -99,7 +99,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); @@ -108,7 +108,7 @@ public: UTL_ExceptList *be_add_set_exceptions (UTL_ExceptList *t); static AST_Decl::NodeType const NT; - + private: // Data. diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h index d40746b9b62..b2b99f86875 100644 --- a/TAO/TAO_IDL/include/ast_component.h +++ b/TAO/TAO_IDL/include/ast_component.h @@ -46,7 +46,7 @@ public: AST_Type **supports (void) const; long n_supports (void) const; - + // Override for component of UTL_Scope method. virtual AST_Decl *special_lookup (UTL_ScopedName *e, bool full_def_only); @@ -73,7 +73,7 @@ public: static AST_Decl::NodeType const NT; typedef AST_ComponentFwd FWD_TYPE; - + protected: virtual AST_Provides *fe_add_provides (AST_Provides *p); diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h index 44e961be886..79a8ff55fab 100644 --- a/TAO/TAO_IDL/include/ast_concrete_type.h +++ b/TAO/TAO_IDL/include/ast_concrete_type.h @@ -79,7 +79,7 @@ public: UTL_ScopedName *n); virtual ~AST_ConcreteType (void); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_connector.h b/TAO/TAO_IDL/include/ast_connector.h index 33c39f352e8..895f0b00376 100644 --- a/TAO/TAO_IDL/include/ast_connector.h +++ b/TAO/TAO_IDL/include/ast_connector.h @@ -17,12 +17,12 @@ public: AST_Connector *base_connector); virtual ~AST_Connector (void); - + AST_Connector *base_connector (void) const; // Cleanup function. virtual void destroy (void); - + // Narrowing. DEF_NARROW_FROM_DECL (AST_Connector); diff --git a/TAO/TAO_IDL/include/ast_consumes.h b/TAO/TAO_IDL/include/ast_consumes.h index df6f3b0fe9f..6dd17285520 100644 --- a/TAO/TAO_IDL/include/ast_consumes.h +++ b/TAO/TAO_IDL/include/ast_consumes.h @@ -13,9 +13,9 @@ class TAO_IDL_FE_Export AST_Consumes : public virtual AST_Field public: AST_Consumes (UTL_ScopedName *n, AST_Type *consumes_type); - + virtual ~AST_Consumes (void); - + // Data Accessor. AST_Type *consumes_type (void) const; @@ -27,7 +27,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index f5f7e619d18..df696838cb5 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -108,7 +108,7 @@ public: // Accessor needs to get overridden for a few types. virtual bool is_local (void); void is_local (bool val); - + bool is_abstract (void) const; void is_abstract (bool val); @@ -299,12 +299,12 @@ public: // Useful for GIOP to know if a wstring is being marshaled. virtual int contains_wstring (void); void contains_wstring (int val); - + // Additional checks when we think we have caught an IDL // masking scope error in a lookup, which starts simply with // a comparison of names in a scope masking queue. bool masking_checks (AST_Decl *mod); - + protected: // These are not private because they're used by // be_predefined_type' constructor and can be called diff --git a/TAO/TAO_IDL/include/ast_emits.h b/TAO/TAO_IDL/include/ast_emits.h index d1aba825406..b8e0a450e95 100644 --- a/TAO/TAO_IDL/include/ast_emits.h +++ b/TAO/TAO_IDL/include/ast_emits.h @@ -13,9 +13,9 @@ class TAO_IDL_FE_Export AST_Emits : public virtual AST_Field public: AST_Emits (UTL_ScopedName *n, AST_Type *emits_type); - + virtual ~AST_Emits (void); - + // Data Accessor. AST_Type *emits_type (void) const; @@ -27,7 +27,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h index f70a512353c..a1a50b4a64f 100644 --- a/TAO/TAO_IDL/include/ast_exception.h +++ b/TAO/TAO_IDL/include/ast_exception.h @@ -99,7 +99,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h index 70f49839ca0..faf9e6c72a8 100644 --- a/TAO/TAO_IDL/include/ast_expression.h +++ b/TAO/TAO_IDL/include/ast_expression.h @@ -202,7 +202,7 @@ public: AST_Expression (ACE_CDR::UShort us); AST_Expression (ACE_CDR::Long l); - + AST_Expression (ACE_CDR::LongLong ll); AST_Expression (ACE_CDR::Boolean b); @@ -286,7 +286,7 @@ public: // Accessor for the member. AST_Decl *get_tdef (void) const; - + // Accessor for the member. AST_Param_Holder *param_holder (void) const; @@ -331,10 +331,10 @@ private: AST_Decl *tdef; // Propagates aliased constant type. - + AST_Param_Holder *param_holder_; // Non-zero if we were created from a reference template param. - + private: // Fill out the lineno, filename and definition scope details. void fill_definition_details (void); diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h index 8641de10063..9cbfcecf02c 100644 --- a/TAO/TAO_IDL/include/ast_field.h +++ b/TAO/TAO_IDL/include/ast_field.h @@ -123,7 +123,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); @@ -137,7 +137,7 @@ protected: Visibility visibility_; // Used with valuetype and eventtype fields. - + bool owns_base_type_; // If our field type is anonymous array or sequence, we're // responsible for destroying it. diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h index bc8e6dda13d..0624b2f4e78 100644 --- a/TAO/TAO_IDL/include/ast_generator.h +++ b/TAO/TAO_IDL/include/ast_generator.h @@ -365,60 +365,60 @@ public: virtual AST_PortType *create_porttype (UTL_ScopedName *n); - + virtual AST_Provides *create_provides (UTL_ScopedName *n, AST_Type *provides_type); - + virtual AST_Uses *create_uses (UTL_ScopedName *n, AST_Type *uses_type, bool is_multiple); - + virtual AST_Publishes *create_publishes (UTL_ScopedName *n, AST_Type *publishes_type); - + virtual AST_Emits *create_emits (UTL_ScopedName *n, AST_Type *emits_type); - + virtual AST_Consumes *create_consumes (UTL_ScopedName *n, AST_Type *consumes_type); - + virtual AST_Extended_Port *create_extended_port ( UTL_ScopedName *n, AST_PortType *porttype_ref); - + virtual AST_Mirror_Port *create_mirror_port ( UTL_ScopedName *n, AST_PortType *porttype_ref); - + virtual AST_Connector *create_connector ( UTL_ScopedName *n, AST_Connector *base_connector); - + virtual AST_Template_Module *create_template_module ( UTL_ScopedName *n, FE_Utils::T_PARAMLIST_INFO *template_params); - + virtual AST_Template_Module_Inst *create_template_module_inst ( UTL_ScopedName *n, AST_Template_Module *ref, FE_Utils::T_ARGLIST *template_args); - + virtual AST_Template_Module_Ref *create_template_module_ref ( UTL_ScopedName *n, AST_Template_Module *ref, UTL_StrList *param_refs); - + virtual AST_Param_Holder *create_param_holder ( UTL_ScopedName *parameter_name, diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h index df69e21c001..41ac3e06391 100644 --- a/TAO/TAO_IDL/include/ast_home.h +++ b/TAO/TAO_IDL/include/ast_home.h @@ -31,8 +31,8 @@ public: // Extend lookup to the supported interfaces. virtual AST_Decl *look_in_supported (UTL_ScopedName *e, bool full_def_only); - - // Overridden for homes from the UTL_Scope method. + + // Overridden for homes from the UTL_Scope method. virtual AST_Decl *special_lookup (UTL_ScopedName *, bool full_def_only); @@ -63,10 +63,10 @@ public: virtual int ast_accept (ast_visitor *visitor); static AST_Decl::NodeType const NT; - + private: // Scope Management Protocol. - + friend int tao_yyparse (void); friend class ast_visitor_tmpl_module_inst; diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h index 6dbf5be957d..b38bf997531 100644 --- a/TAO/TAO_IDL/include/ast_interface.h +++ b/TAO/TAO_IDL/include/ast_interface.h @@ -123,7 +123,7 @@ public: // Accessors for the member. bool home_equiv (void) const; void home_equiv (bool val); - + // Accessors for the member. AST_InterfaceFwd *fwd_decl (void) const; void fwd_decl (AST_InterfaceFwd *node); @@ -131,7 +131,7 @@ public: // Look through inherited interfaces. virtual AST_Decl *look_in_inherited (UTL_ScopedName *e, bool full_def_only); - + AST_Decl *look_in_inherited_local (Identifier *e, bool full_def_only = false); @@ -146,11 +146,11 @@ public: // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. virtual bool legal_for_primary_key (void) const; - + virtual AST_Decl *special_lookup (UTL_ScopedName *e, bool full_def_only); - - /// Accessors for the members. + + /// Accessors for the members. AST_Interface *ami_handler (void) const; void ami_handler (AST_Interface *handler); AST_Interface *ami4ccm_uses (void) const; @@ -201,12 +201,12 @@ protected: // Are we the equivalent interface of a home? bool home_equiv_; - + // The forward declaration we may have been created from. AST_InterfaceFwd *fwd_decl_; - + // Must keep these base interface placeholders in a separate - // container, so they can be destroyed. Iterating over + // container, so they can be destroyed. Iterating over // pd_inherits won't work because the real interfaces will // probably already be destroyed and the pointers will be // garbage. @@ -214,7 +214,7 @@ protected: /// Do we have both abstract and concrete parents? int has_mixed_parentage_; - + /// Store here for quick retrieval without an AST lookup. AST_Interface *ami_handler_; AST_Interface *ami4ccm_uses_; diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h index 91e9591d7dc..887bcd68777 100644 --- a/TAO/TAO_IDL/include/ast_interface_fwd.h +++ b/TAO/TAO_IDL/include/ast_interface_fwd.h @@ -89,7 +89,7 @@ public: virtual bool is_local (void); virtual bool is_valuetype (void); virtual bool is_abstract_valuetype (void); - + bool full_def_seen (void); // Cleanup function. @@ -118,7 +118,7 @@ public: private: AST_Interface *pd_full_definition; // The interface this is a forward declaration of. - + bool is_defined_; // Checking the member above isn't good enough. }; diff --git a/TAO/TAO_IDL/include/ast_mirror_port.h b/TAO/TAO_IDL/include/ast_mirror_port.h index 60d926ecc33..9f2a280c6af 100644 --- a/TAO/TAO_IDL/include/ast_mirror_port.h +++ b/TAO/TAO_IDL/include/ast_mirror_port.h @@ -15,7 +15,7 @@ public: AST_PortType *porttype_ref); virtual ~AST_Mirror_Port (void); - + // Cleanup function. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h index 91c6b48ea5a..bb743d0f5bf 100644 --- a/TAO/TAO_IDL/include/ast_module.h +++ b/TAO/TAO_IDL/include/ast_module.h @@ -132,7 +132,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Accessors for the member. AST_Template_Module_Inst *from_inst (void) const; void from_inst (AST_Template_Module_Inst *node); diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h index 7b831c8f419..cf3ff280d92 100644 --- a/TAO/TAO_IDL/include/ast_native.h +++ b/TAO/TAO_IDL/include/ast_native.h @@ -6,7 +6,7 @@ #include "ast_exception.h" -// Representation of "native" IDL type. It may be used as a +// Representation of "native" IDL type. It may be used as a // return type, parameter type, or in an operation's // exception list. This last usage creates special problems // with both syntax checking and code generation. Letting @@ -18,7 +18,7 @@ public: AST_Native (UTL_ScopedName *n); virtual ~AST_Native (void); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_porttype.h b/TAO/TAO_IDL/include/ast_porttype.h index a4ae64ffc2b..7b810151039 100644 --- a/TAO/TAO_IDL/include/ast_porttype.h +++ b/TAO/TAO_IDL/include/ast_porttype.h @@ -37,12 +37,12 @@ public: virtual int ast_accept (ast_visitor *visitor); static AST_Decl::NodeType const NT; - + protected: virtual AST_Provides *fe_add_provides (AST_Provides *p); virtual AST_Uses *fe_add_uses (AST_Uses *p); - + virtual AST_Attribute *fe_add_attribute (AST_Attribute *a); }; diff --git a/TAO/TAO_IDL/include/ast_publishes.h b/TAO/TAO_IDL/include/ast_publishes.h index a6208a1f59f..483c59ad755 100644 --- a/TAO/TAO_IDL/include/ast_publishes.h +++ b/TAO/TAO_IDL/include/ast_publishes.h @@ -13,9 +13,9 @@ class TAO_IDL_FE_Export AST_Publishes : public virtual AST_Field public: AST_Publishes (UTL_ScopedName *n, AST_Type *publishes_type); - + virtual ~AST_Publishes (void); - + // Data Accessor. AST_Type *publishes_type (void) const; @@ -27,7 +27,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h index f0a9e7dfedb..dee65422b5e 100644 --- a/TAO/TAO_IDL/include/ast_sequence.h +++ b/TAO/TAO_IDL/include/ast_sequence.h @@ -99,11 +99,11 @@ public: // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. virtual bool legal_for_primary_key (void) const; - + // Is the element type a forward declared struct or union // that hasn't yet been fully defined? virtual bool is_defined (void); - + // Cleanup method. virtual void destroy (void); @@ -129,7 +129,7 @@ private: bool unbounded_; // Whether we are bounded or unbounded. - + bool owns_base_type_; // If our base type is anonymous array or sequence, we're // responsible for destroying it. diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h index 7539b64c5a7..e61c09fb52e 100644 --- a/TAO/TAO_IDL/include/ast_structure.h +++ b/TAO/TAO_IDL/include/ast_structure.h @@ -137,7 +137,7 @@ public: // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. virtual bool legal_for_primary_key (void) const; - + // Accessors for the member. AST_StructureFwd *fwd_decl (void) const; void fwd_decl (AST_StructureFwd *node); @@ -150,7 +150,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Accessor for the member. ACE_Unbounded_Queue<AST_Field *> &fields (void); @@ -188,7 +188,7 @@ private: int local_struct_; // We also need to determine whether we contain any local type. - + AST_StructureFwd *fwd_decl_; // The forward declaration we may have been created from. }; diff --git a/TAO/TAO_IDL/include/ast_structure_fwd.h b/TAO/TAO_IDL/include/ast_structure_fwd.h index 6315e24ce2e..25bfbbdcaa5 100644 --- a/TAO/TAO_IDL/include/ast_structure_fwd.h +++ b/TAO/TAO_IDL/include/ast_structure_fwd.h @@ -49,7 +49,7 @@ public: private: AST_Structure *pd_full_definition; // The structure this is a forward declaration of. - + bool is_defined_; // Checking the member above isn't good enough. }; diff --git a/TAO/TAO_IDL/include/ast_template_module.h b/TAO/TAO_IDL/include/ast_template_module.h index 41a51e9fda1..d271accf7c8 100644 --- a/TAO/TAO_IDL/include/ast_template_module.h +++ b/TAO/TAO_IDL/include/ast_template_module.h @@ -21,10 +21,10 @@ public: FE_Utils::T_PARAMLIST_INFO * template_params (void) const; - + // Checks for errors in the template args of an instantiation. bool match_arg_names (FE_Utils::T_ARGLIST *args); - + // Checks for errors in the template param refs of an alias. bool match_param_refs (UTL_StrList *refs, UTL_Scope *decl_scope); @@ -50,15 +50,15 @@ public: protected: FE_Utils::T_PARAMLIST_INFO * template_params_; - + private: // Match with a template arg. bool match_one_param (FE_Utils::T_Param_Info *param, AST_Decl *d); - - // Find one of our params by name. + + // Find one of our params by name. FE_Utils::T_Param_Info *find_param (UTL_String *name); - + // Match a param with an aliased id by type. bool match_param_by_type (FE_Utils::T_Param_Info *param); }; diff --git a/TAO/TAO_IDL/include/ast_template_module_inst.h b/TAO/TAO_IDL/include/ast_template_module_inst.h index ebe5e3c0d6c..ee4161be9d0 100644 --- a/TAO/TAO_IDL/include/ast_template_module_inst.h +++ b/TAO/TAO_IDL/include/ast_template_module_inst.h @@ -18,18 +18,18 @@ public: FE_Utils::T_ARGLIST *template_args); virtual ~AST_Template_Module_Inst (void); - + AST_Template_Module *ref (void) const; FE_Utils::T_ARGLIST * template_args (void) const; - + // Narrowing. DEF_NARROW_FROM_DECL (AST_Template_Module_Inst); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); - + // Cleanup function. virtual void destroy (void); @@ -37,7 +37,7 @@ public: virtual int ast_accept (ast_visitor *visitor); static AST_Decl::NodeType const NT; - + private: FE_Utils::T_ARGLIST * template_args_; }; diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h index 9be71f68e60..fb2927c4760 100644 --- a/TAO/TAO_IDL/include/ast_union.h +++ b/TAO/TAO_IDL/include/ast_union.h @@ -145,7 +145,7 @@ protected: virtual AST_UnionBranch *fe_add_union_branch (AST_UnionBranch *b); // Moved out of private section so it can be called from subclass. - + private: // Data. @@ -174,7 +174,7 @@ private: friend int tao_yyparse (void); friend class ast_visitor_tmpl_module_inst; - + // Scope Management Protocol. virtual AST_Union *fe_add_union (AST_Union *u); diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h index 55f74848e89..3310ffb4238 100644 --- a/TAO/TAO_IDL/include/ast_union_branch.h +++ b/TAO/TAO_IDL/include/ast_union_branch.h @@ -88,15 +88,15 @@ public: virtual ~AST_UnionBranch (void); UTL_LabelList *labels (void) const; - + AST_UnionLabel *label (unsigned long index = 0); unsigned long label_list_length (void); - + // Called if our labels are enum values - adds them to the // enclosing scope's name_referenced list. void add_labels (AST_Union *u); - + // Integer literals create a ulonglong AST_Expression. If // our union's discriminator type is some other kind of // integer, and we have more than one label, only the first @@ -113,7 +113,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h index ac25a7ca945..33df6970673 100644 --- a/TAO/TAO_IDL/include/ast_union_label.h +++ b/TAO/TAO_IDL/include/ast_union_label.h @@ -82,7 +82,7 @@ public: enum UnionLabel { UL_default - , UL_label + , UL_label }; AST_UnionLabel (UnionLabel lk, @@ -99,7 +99,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_uses.h b/TAO/TAO_IDL/include/ast_uses.h index 0d3b7f00eba..5de26d74997 100644 --- a/TAO/TAO_IDL/include/ast_uses.h +++ b/TAO/TAO_IDL/include/ast_uses.h @@ -12,9 +12,9 @@ public: AST_Uses (UTL_ScopedName *n, AST_Type *uses_type, bool is_multiple); - + virtual ~AST_Uses (void); - + // Data Accessors. AST_Type *uses_type (void) const; bool is_multiple (void) const; @@ -27,12 +27,12 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); static AST_Decl::NodeType const NT; - + private: bool is_multiple_; }; diff --git a/TAO/TAO_IDL/include/ast_valuebox.h b/TAO/TAO_IDL/include/ast_valuebox.h index 450d42c29b6..77213527a0b 100644 --- a/TAO/TAO_IDL/include/ast_valuebox.h +++ b/TAO/TAO_IDL/include/ast_valuebox.h @@ -11,12 +11,12 @@ class TAO_IDL_FE_Export AST_ValueBox : public virtual AST_ConcreteType public: AST_ValueBox (UTL_ScopedName *n, AST_Type *boxed_type); - + virtual ~AST_ValueBox (void); // Data Accessors. AST_Type *boxed_type (void) const; - + // Narrowing. DEF_NARROW_FROM_DECL(AST_ValueBox); @@ -25,7 +25,7 @@ public: // Visiting. virtual int ast_accept (ast_visitor *visitor); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h index 35ea20f10ae..44e880ec3f9 100644 --- a/TAO/TAO_IDL/include/ast_valuetype.h +++ b/TAO/TAO_IDL/include/ast_valuetype.h @@ -48,7 +48,7 @@ public: // Look up a scoped name in the supported interface list. virtual AST_Decl *look_in_supported (UTL_ScopedName *, bool full_def_only); - + // Overridden for valuetype from UTL_Scope method. virtual AST_Decl *special_lookup (UTL_ScopedName *, bool full_def_only); diff --git a/TAO/TAO_IDL/include/ast_visitor.h b/TAO/TAO_IDL/include/ast_visitor.h index ceb9ef5a7b8..fdad96a9445 100644 --- a/TAO/TAO_IDL/include/ast_visitor.h +++ b/TAO/TAO_IDL/include/ast_visitor.h @@ -139,7 +139,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; - + protected: // For abstract class. ast_visitor (void); diff --git a/TAO/TAO_IDL/include/ast_visitor_context.h b/TAO/TAO_IDL/include/ast_visitor_context.h index dbab0020f3a..88e4f12d29b 100644 --- a/TAO/TAO_IDL/include/ast_visitor_context.h +++ b/TAO/TAO_IDL/include/ast_visitor_context.h @@ -36,11 +36,11 @@ public: FE_Utils::T_PARAMLIST_INFO *template_params (void) const; void template_params (FE_Utils::T_PARAMLIST_INFO *args); - + FE_Utils::T_ARGLIST *template_args (void) const; void template_args (FE_Utils::T_ARGLIST *args); -protected: +protected: // Storage for the current template module params and args. FE_Utils::T_PARAMLIST_INFO *template_params_; FE_Utils::T_ARGLIST *template_args_; diff --git a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h index fbe95c55a63..5997ac5c44f 100644 --- a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h +++ b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h @@ -94,32 +94,32 @@ public: virtual int visit_field (AST_Field *node); virtual int visit_factory (AST_Factory *node); virtual int visit_finder (AST_Finder *node); - + private: // If arg is a param holder, return the matching template arg, // otherwise return arg unchanged. If the arg is declared in // the scope of a template module, the returned node will be a // copy created in the scope of the template module instantiation. AST_Decl *reify_type (AST_Decl *d); - + // Utility method used for attributes and operations. UTL_ExceptList *reify_exception_list (UTL_ExceptList *orig); - + // Utility method to create a NameList from a list of inherited // or supported types that may contain a template param ref. UTL_NameList *create_name_list (AST_Type **list, long length); - + private: ast_visitor_context *ctx_; // Flag to branch in visit_valuetype() where we create an // eventtype or a valuetype. bool for_eventtype_; - + // Flag to branch in visit_factory() where we create a // finder or a factory. bool for_finder_; - + // Flag to short_circuit reifying if we are the base class of // ast_visitor_tmpl_module_ref. bool ref_only_; diff --git a/TAO/TAO_IDL/include/fe_home_header.h b/TAO/TAO_IDL/include/fe_home_header.h index ea5b5eeed90..7f276821639 100644 --- a/TAO/TAO_IDL/include/fe_home_header.h +++ b/TAO/TAO_IDL/include/fe_home_header.h @@ -24,7 +24,7 @@ public: UTL_NameList *supports, UTL_ScopedName *managed_component, UTL_ScopedName *primary_key); - + virtual ~FE_HomeHeader (void); // Data Accessors. diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h index c56843d00ec..2e332ddd936 100644 --- a/TAO/TAO_IDL/include/fe_interface_header.h +++ b/TAO/TAO_IDL/include/fe_interface_header.h @@ -122,9 +122,9 @@ protected: void add_inheritance_flat (AST_Interface *i); bool already_seen (AST_Type *ip); bool already_seen_flat (AST_Interface *ip); - + void install_in_header (void); - + void destroy_flat_arrays (void); // Data. diff --git a/TAO/TAO_IDL/include/fe_obv_header.h b/TAO/TAO_IDL/include/fe_obv_header.h index 78ac265ca17..ed3b71c4886 100644 --- a/TAO/TAO_IDL/include/fe_obv_header.h +++ b/TAO/TAO_IDL/include/fe_obv_header.h @@ -28,7 +28,7 @@ public: AST_Type *inherits_concrete (void) const; AST_Type *supports_concrete (void) const; bool truncatable (void) const; - + virtual void destroy (void); // Destroy anything allocated for this class. diff --git a/TAO/TAO_IDL/include/fe_private.h b/TAO/TAO_IDL/include/fe_private.h index 0c975ff65b2..0c7e88b53c3 100644 --- a/TAO/TAO_IDL/include/fe_private.h +++ b/TAO/TAO_IDL/include/fe_private.h @@ -82,10 +82,10 @@ class TAO_IDL_FE_Export TAO_IDL_CPP_Keyword_Table // Define a table that provides the lookup for the C++ // keyword. The lookup uses a perfect hash function private: - unsigned int hash (const char *str, + unsigned int hash (const char *str, unsigned int len); public: - const TAO_IDL_CPP_Keyword_Entry *lookup (const char *str, + const TAO_IDL_CPP_Keyword_Entry *lookup (const char *str, unsigned int len); }; diff --git a/TAO/TAO_IDL/include/fe_utils.h b/TAO/TAO_IDL/include/fe_utils.h index 3abce8470f7..a021f2610c7 100644 --- a/TAO/TAO_IDL/include/fe_utils.h +++ b/TAO/TAO_IDL/include/fe_utils.h @@ -65,7 +65,7 @@ struct TAO_IDL_FE_Export FE_Utils create_uses_multiple_stuff (AST_Component *c, AST_Uses *u, const char *prefix = ""); - + /// For the executor IDL file, when a pragma ciao ami receptacle /// name is multiplex. static void @@ -94,7 +94,7 @@ struct TAO_IDL_FE_Export FE_Utils static bool is_include_file_found (ACE_CString & inc_file, UTL_String * idl_file_name); - + /// Validate the included idl files, somefiles might have been /// ignored by the preprocessor. static void @@ -107,14 +107,14 @@ struct TAO_IDL_FE_Export FE_Utils /// Strips _cxx_ prefix for use in port names. static void original_local_name (Identifier *local_name); - + /// Types, constants and exceptions can be redefined in /// derived interfaces, modules may be reopened, forward /// declarations may be repeated, etc. static bool can_be_redefined (AST_Decl *prev_dec, AST_Decl *curr_decl); - + private: static bool check_one_seq_of_param (FE_Utils::T_PARAMLIST_INFO *list, diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index 00c0b456cd5..3ed04d27d14 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -437,13 +437,13 @@ public: // = Types & methods supporting DDS DCPS data type/key definition (from #pragma) typedef ACE_Unbounded_Queue<ACE_TString> DCPS_Key_List; - + struct DCPS_Data_Type_Info { UTL_ScopedName *name_; DCPS_Key_List key_list_; }; - + typedef ACE_Unbounded_Queue_Iterator<ACE_TString> DCPS_Data_Type_Info_Iter; typedef ACE_Hash_Map_Manager_Ex< const char*, @@ -455,22 +455,22 @@ public: // FE calls when #pragma DCPS_DATA_TYPE is processed void add_dcps_data_type (const char* id); - + // FE calls when #pragma DCPS_DATA_KEY is processed bool add_dcps_data_key (const char* id, const char* key); - + // returns null if not matching; otherwise pointer to the info DCPS_Data_Type_Info* is_dcps_type (UTL_ScopedName* target); - + // FE calls when #pragma DCPS_SUPPORT_ZERO_COPY_READ is processed void dcps_support_zero_copy_read (bool value); - + // BE calls to check the status of zero-copy read support bool dcps_support_zero_copy_read (void) const; - + // FE calls when #pragma DCPS_GEN_ZERO_COPY_READ is processed void dcps_gen_zero_copy_read (bool value); - + // BE calls to check the status of zero-copy read support bool dcps_gen_zero_copy_read (void) const; @@ -607,7 +607,7 @@ public: void add_ciao_oci_ts_file_names (const char *s); ACE_Unbounded_Queue<char *> & ciao_oci_ts_file_names (void); // Accessor/mutator for the ciao_oci_ts_file_names_ member. - + void add_ciao_ami_iface_names (const char *s); ACE_Unbounded_Queue<char *> & ciao_ami_iface_names (void); // Accessor/mutator for the ciao_ami_iface_names_ member. @@ -615,25 +615,25 @@ public: void add_ciao_ami_recep_names (const char *s); ACE_Unbounded_Queue<char *> & ciao_ami_recep_names (void); // Accessor/mutator for the ciao_ami_recep_names_ member. - + void add_included_ami_recep_names (const char *s); ACE_Unbounded_Queue<char *> & included_ami_recep_names (void); // Accessor/mutator for the included_ami_recep_names_ member. - + bool included_ami_receps_done (void) const; void included_ami_receps_done (bool val); - + void add_ciao_ami_idl_fnames (const char *s); ACE_Unbounded_Queue<char *> & ciao_ami_idl_fnames (void); // Accessor/mutator for the included_ami_idl_fnames_ member. - + void add_dds4ccm_impl_fnames (const char *s); ACE_Unbounded_Queue<char *> & dds4ccm_impl_fnames (void); // Accessor mutator for the dds4ccm_impl_fnames_ member. - + ACE_Unbounded_Queue<AST_Decl *> & masking_scopes (void); // Accessor for the member - + ACE_Unbounded_Queue<AST_Interface *> & mixed_parentage_interfaces (void); // Accessor for the member @@ -706,10 +706,10 @@ public: Unbounded_Paths_Queue; typedef ACE_Unbounded_Queue_Iterator<Include_Path_Info> Unbounded_Paths_Queue_Iterator; - + Unbounded_Paths_Queue &include_paths (void); // Accessor for the member. - + enum ANON_TYPE_DIAGNOSTIC { ANON_TYPE_ERROR, @@ -718,15 +718,15 @@ public: }; // Determines which type of diagnostic to emit, if any, upon // detecting the presence of an anonymous IDL construct. - + void anon_type_diagnostic (ANON_TYPE_DIAGNOSTIC val); // Mutator for the member. - - bool anon_error (void) const; + + bool anon_error (void) const; bool anon_warning (void) const; bool anon_silent (void) const; // Simple checks for the value of anon_type_diagnostic_. - + bool in_typedef (void) const; void in_typedef (bool val); // Accessors for the member. @@ -863,41 +863,41 @@ private: ACE_Unbounded_Queue<char *> ciao_oci_ts_file_names_; // Files parsed with OpenDDS typesupport pragma - + ACE_Unbounded_Queue<char *> ciao_ami_iface_names_; // Interfaces that get a reply handler generated for AMI4CCM. - + ACE_Unbounded_Queue<char *> ciao_ami_recep_names_; // Receptacles that get a sendc_ version added for AMI4CCM. - + ACE_Unbounded_Queue<char *> included_ami_recep_names_; // We need to do something different with these... - + bool included_ami_receps_done_; // ...but we need to do it only once. - + ACE_Unbounded_Queue<char *> ciao_ami_idl_fnames_; // Stores directives from #pragma ciao ami4ccm idl "xxx". - + ACE_Unbounded_Queue<char *> dds4ccm_impl_fnames_; // Stores directives from #pragma dds4ccm impl "xxx". - + ACE_Unbounded_Queue<AST_Decl *> masking_scopes_; // Used to check for an incorrect lookup success that should // have been masked by an inner scope of the same name. - + /** * Used in the generation of overrides for CORBA::release and * CORBA::is_nil, needed when the interface inherits versions from * both CORBA::Object and CORBA::AbstractBase. */ ACE_Unbounded_Queue<AST_Interface *> mixed_parentage_interfaces_; - + /// For quick access. AST_Module *corba_module_; - + ANON_TYPE_DIAGNOSTIC anon_type_diagnostic_; - + /// Flag set in parser so we can decide whether to emit /// an anonymous type diagnostic. bool in_typedef_; diff --git a/TAO/TAO_IDL/include/utl_decllist.h b/TAO/TAO_IDL/include/utl_decllist.h index 45492f4dce7..7f0ead854c7 100644 --- a/TAO/TAO_IDL/include/utl_decllist.h +++ b/TAO/TAO_IDL/include/utl_decllist.h @@ -86,7 +86,7 @@ public: // Operations // Constructor(s) - UTL_DeclList (FE_Declarator *s, + UTL_DeclList (FE_Declarator *s, UTL_DeclList *cdr); // Get element diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h index 1c7ac5d3f9b..b4983a4208c 100644 --- a/TAO/TAO_IDL/include/utl_err.h +++ b/TAO/TAO_IDL/include/utl_err.h @@ -364,18 +364,18 @@ public: // Referenced template parameter not matched in param list. void mismatched_template_param (const char *name); - + // Given a template param of the form 'sequence<T>', the // 'T' must match a previous param in the list. void mismatch_seq_of_param (const char *param_id); - + // Informative message when a lookup fails because a // masking scope has not been correctly differentiated // in the scoped name from the scope it masks. void scope_masking_error (AST_Decl *masked, AST_Decl *loc); - - // Error (default) or warning (set by command line option). + + // Error (default) or warning (set by command line option). void anonymous_type_diagnostic (void); }; diff --git a/TAO/TAO_IDL/include/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_exceptlist.h index 5598f08c8c9..53e935571f4 100644 --- a/TAO/TAO_IDL/include/utl_exceptlist.h +++ b/TAO/TAO_IDL/include/utl_exceptlist.h @@ -82,15 +82,15 @@ class AST_Type; class TAO_IDL_FE_Export UTL_ExceptList : public UTL_List { public: - UTL_ExceptList (AST_Type *s, + UTL_ExceptList (AST_Type *s, UTL_ExceptList *cdr); // Get list item. AST_Type *head (void); - + // Cleanup. virtual void destroy (void); - + // Copies the UTL_ExceptList pointers but not the // contained AST_Exceptions. virtual UTL_ExceptList *copy (void); diff --git a/TAO/TAO_IDL/include/utl_exprlist.h b/TAO/TAO_IDL/include/utl_exprlist.h index 4b8108bbb58..4220a0e9008 100644 --- a/TAO/TAO_IDL/include/utl_exprlist.h +++ b/TAO/TAO_IDL/include/utl_exprlist.h @@ -82,7 +82,7 @@ class AST_Expression; class TAO_IDL_FE_Export UTL_ExprList : public UTL_List { public: - UTL_ExprList (AST_Expression *s, + UTL_ExprList (AST_Expression *s, UTL_ExprList *cdr); // Get list item. diff --git a/TAO/TAO_IDL/include/utl_labellist.h b/TAO/TAO_IDL/include/utl_labellist.h index 1c365b59cfb..24e5c76e9ed 100644 --- a/TAO/TAO_IDL/include/utl_labellist.h +++ b/TAO/TAO_IDL/include/utl_labellist.h @@ -82,15 +82,15 @@ class AST_UnionLabel; class TAO_IDL_FE_Export UTL_LabelList : public UTL_List { public: - UTL_LabelList (AST_UnionLabel *s, + UTL_LabelList (AST_UnionLabel *s, UTL_LabelList *cdr); // Get list item. AST_UnionLabel *head (void); - + // Override of base class method. virtual UTL_LabelList *copy (void); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h index 275e442f47b..e36ac200319 100644 --- a/TAO/TAO_IDL/include/utl_namelist.h +++ b/TAO/TAO_IDL/include/utl_namelist.h @@ -89,7 +89,7 @@ public: // Accessors. bool truncatable (void) const; void truncatable (bool val); - + // Cleanup. virtual void destroy (void); diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index 82886e43d20..39e77fc1c6a 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -179,7 +179,7 @@ public: AST_Decl *lookup_by_name (UTL_ScopedName *, bool full_def_only = false, bool for_add = true); - + AST_Decl *lookup_by_name_r (UTL_ScopedName *, bool full_def_only); @@ -195,9 +195,9 @@ public: virtual AST_Decl *look_in_prev_mods_local (Identifier *e, bool ignore_fwd = false); - + // A no-op here, overridden for types like interface - // (look_in_inherited), modules (look_in_prev_mods) etc. + // (look_in_inherited), modules (look_in_prev_mods) etc. virtual AST_Decl *special_lookup (UTL_ScopedName *e, bool ful_def_only); @@ -206,10 +206,10 @@ public: // If the Identifier string (from the scoped name which has been // already determined to be of length 1) matches a param, - // create and return a param holder AST node, otherwise + // create and return a param holder AST node, otherwise // return 0. static AST_Param_Holder *match_param (UTL_ScopedName *e); - + // Add to decls. Node represents a local declaration // The new decl e is inserted after ex if ex is not 0. // This one is public because the case of a reopened @@ -284,7 +284,7 @@ protected: void check_for_predef_seq (AST_Decl *d); // Set the appropriate *_seen_ flag if we are seeing a spec-defined // sequence of a basic type. - + protected: // Data. @@ -316,7 +316,7 @@ protected: // Have we seen a #pragma prefix declaration in this scope? bool has_prefix_; - + // Used in lookup of various CORBA pseudo objects, which also // determines generation of specific #include headers. enum WHICH_PSEUDO @@ -326,37 +326,37 @@ protected: PSEUDO_VALUEBASE, PSEUDO_ABSTRACTBASE }; - + WHICH_PSEUDO which_pseudo_; - + public: /// Scope Management Protocol. - + /// Common code for most basic adding action. AST_Decl *fe_add_decl (AST_Decl *d); - + /// Specialized for types that reference another type. AST_Field *fe_add_ref_decl (AST_Field *d); - + template<typename DECL> DECL *fe_add_full_intf_decl (DECL *t); - + template<typename FULL_DECL> typename FULL_DECL::FWD_TYPE *fe_add_fwd_intf_decl ( typename FULL_DECL::FWD_TYPE *t); - + AST_Structure *fe_add_full_struct_type (AST_Structure *t); AST_StructureFwd *fe_add_fwd_struct_type (AST_StructureFwd *t); - + /// No-op base class version of the specialized adding actions. - + virtual AST_PredefinedType *fe_add_predefined_type ( AST_PredefinedType *t); virtual AST_Module *fe_add_module (AST_Module *m); - + virtual AST_Template_Module_Inst *fe_add_template_module_inst ( AST_Template_Module_Inst *m); @@ -457,7 +457,7 @@ public: virtual AST_Factory *fe_add_factory (AST_Factory *f); - + virtual AST_Finder *fe_add_finder (AST_Finder *f); @@ -487,7 +487,7 @@ public: virtual AST_Mirror_Port *fe_add_mirror_port (AST_Mirror_Port *mp); - + protected: /// Quick check on the head of a name to see if it's global. bool is_global_name (Identifier *i); @@ -497,11 +497,11 @@ private: /// (and its subtypes) and operations respectively. bool inherited_op_attr_clash (AST_Decl *t); bool arg_specific_error (AST_Decl *t); - + /// Encapsulates the vagaries of adding fields vs decls to /// structs/unions vs other types. void smart_local_add (AST_Decl *t); - + /// Helper function for lookup_by_name(). Iterates doing local /// lookups of subsequent components of a scoped name. AST_Decl * diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h index a00d3f15325..1229cbe1a00 100644 --- a/TAO/TAO_IDL/include/utl_strlist.h +++ b/TAO/TAO_IDL/include/utl_strlist.h @@ -83,7 +83,7 @@ class UTL_String; class TAO_IDL_FE_Export UTL_StrList : public UTL_List { public: - UTL_StrList (UTL_String *s, + UTL_StrList (UTL_String *s, UTL_StrList *cdr); virtual ~UTL_StrList (void); |