diff options
author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-01-18 15:38:47 +0000 |
---|---|---|
committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-01-18 15:38:47 +0000 |
commit | b25678db1c641614bdc4e742245f005f687fe1e4 (patch) | |
tree | cba99f5893adcd3a13d442845e17131a0b341347 /modules/TAO | |
parent | f12e80a08f04f6b9630097a958fe9c4041d506c3 (diff) | |
download | ATCD-b25678db1c641614bdc4e742245f005f687fe1e4.tar.gz |
ChangeLogTag: Mon Jan 18 15:35:54 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'modules/TAO')
5 files changed, 75 insertions, 71 deletions
diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog index 2ee70e4faa3..60a5d18571b 100644 --- a/modules/TAO/ChangeLog +++ b/modules/TAO/ChangeLog @@ -1,3 +1,14 @@ +Mon Jan 18 15:35:54 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/be/be_visitor_valuebox/field_ci.cpp: + * TAO_IDL//be_visitor_valuebox/union_member_ci.cpp: + * TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h: + * TAO_IDL/be_include/be_visitor_valuebox/field_ci.h: + + Removed parameter 'vb_node' from private methods + emit_member_get() and emit_member_set(), since this value + is now stored in a member variable. + Fri Jan 15 20:31:51 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/include/idl_global.h: diff --git a/modules/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/modules/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp index e3348ce2fa8..a293b311af7 100644 --- a/modules/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp +++ b/modules/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp @@ -184,8 +184,8 @@ be_visitor_valuebox_field_ci::visit_enum (be_enum *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "", ""); - this->emit_member_get (vb_node_, field, bt, "", "", "const", ""); + this->emit_member_set (field, bt, "", ""); + this->emit_member_get (field, bt, "", "", "const", ""); return 0; } @@ -231,7 +231,7 @@ be_visitor_valuebox_field_ci::visit_interface (be_interface *node) << ">::duplicate (val);" << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; - this->emit_member_get (vb_node_, field, bt, "", "_ptr", "const", ".in ()"); + this->emit_member_get (field, bt, "", "_ptr", "const", ".in ()"); return 0; } @@ -277,7 +277,7 @@ be_visitor_valuebox_field_ci::visit_interface_fwd (be_interface_fwd *node) << ">::duplicate (val);" << be_uidt << be_uidt_nl << "}" << be_nl << be_nl; - this->emit_member_get (vb_node_, field, bt, "", "_ptr", "const", ".in ()"); + this->emit_member_get (field, bt, "", "_ptr", "const", ".in ()"); return 0; } @@ -354,19 +354,18 @@ be_visitor_valuebox_field_ci::visit_predefined_type (be_predefined_type *node) << " = ::" << bt->name() << "::_duplicate (val);" << be_uidt_nl << "}" << be_nl << be_nl; - this->emit_member_get (vb_node_, field, bt, " ::", "_ptr", "const", - ".in ()"); + this->emit_member_get (field, bt, " ::", "_ptr", "const", ".in ()"); break; case AST_PredefinedType::PT_any: - this->emit_member_set (vb_node_, field, bt, "const ::", " &"); - this->emit_member_get (vb_node_, field, bt, "const ::", " &", "const", ""); - this->emit_member_get (vb_node_, field, bt, " ::", " &", "", ""); + this->emit_member_set (field, bt, "const ::", " &"); + this->emit_member_get (field, bt, "const ::", " &", "const", ""); + this->emit_member_get (field, bt, " ::", " &", "", ""); break; case AST_PredefinedType::PT_void: break; default: - this->emit_member_set (vb_node_, field, bt, " ::", ""); - this->emit_member_get (vb_node_, field, bt, " ::", "", "const", ""); + this->emit_member_set (field, bt, " ::", ""); + this->emit_member_get (field, bt, " ::", "", "const", ""); break; } @@ -403,9 +402,9 @@ be_visitor_valuebox_field_ci::visit_sequence (be_sequence *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "const ", " &"); - this->emit_member_get (vb_node_, field, bt, "const ", " &", "const", ""); - this->emit_member_get (vb_node_, field, bt, "", " &", "", ""); + this->emit_member_set (field, bt, "const ", " &"); + this->emit_member_get (field, bt, "const ", " &", "const", ""); + this->emit_member_get (field, bt, "", " &", "", ""); return 0; } @@ -440,8 +439,8 @@ be_visitor_valuebox_field_ci::visit_string (be_string *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "", ""); - this->emit_member_set (vb_node_, field, bt, "const ", ""); + this->emit_member_set (field, bt, "", ""); + this->emit_member_set (field, bt, "const ", ""); *os << "// Modifier to set the member." << be_nl; @@ -463,7 +462,7 @@ be_visitor_valuebox_field_ci::visit_string (be_string *node) << " = val;" << be_uidt_nl << "}" << be_nl << be_nl; - this->emit_member_get (vb_node_, field, bt, "const ", "", "const", ""); + this->emit_member_get (field, bt, "const ", "", "const", ""); return 0; } @@ -498,9 +497,9 @@ be_visitor_valuebox_field_ci::visit_structure (be_structure *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "const ", " &"); - this->emit_member_get (vb_node_, field, bt, "const ", " &", "const", ""); - this->emit_member_get (vb_node_, field, bt, "", " &", "", ""); + this->emit_member_set (field, bt, "const ", " &"); + this->emit_member_get (field, bt, "const ", " &", "const", ""); + this->emit_member_get (field, bt, "", " &", "", ""); return 0; } @@ -554,16 +553,15 @@ be_visitor_valuebox_field_ci::visit_union (be_union *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "const ", " &"); - this->emit_member_get (vb_node_, field, bt, "const ", " &", "const", ""); - this->emit_member_get (vb_node_, field, bt, "", " &", "", ""); + this->emit_member_set (field, bt, "const ", " &"); + this->emit_member_get (field, bt, "const ", " &", "const", ""); + this->emit_member_get (field, bt, "", " &", "", ""); return 0; } void -be_visitor_valuebox_field_ci::emit_member_set (be_decl *vb_node_, - be_decl *field, +be_visitor_valuebox_field_ci::emit_member_set (be_decl *field, be_type *field_type, const char *const_arg, const char *arg_modifier) @@ -583,8 +581,7 @@ be_visitor_valuebox_field_ci::emit_member_set (be_decl *vb_node_, } void -be_visitor_valuebox_field_ci::emit_member_get (be_decl *vb_node_, - be_decl *field, +be_visitor_valuebox_field_ci::emit_member_get (be_decl *field, be_type *field_type, const char *const_prefix, const char *type_suffix, diff --git a/modules/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/modules/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp index 1a78b148b4d..d2459a9e862 100644 --- a/modules/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp +++ b/modules/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp @@ -181,8 +181,8 @@ be_visitor_valuebox_union_member_ci::visit_enum (be_enum *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "", ""); - this->emit_member_get (vb_node_, field, bt, "", "", "const"); + this->emit_member_set (field, bt, "", ""); + this->emit_member_get (field, bt, "", "", "const"); return 0; } @@ -217,8 +217,8 @@ be_visitor_valuebox_union_member_ci::visit_interface (be_interface *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "", "_ptr"); - this->emit_member_get (vb_node_, field, bt, "", "_ptr", "const"); + this->emit_member_set (field, bt, "", "_ptr"); + this->emit_member_get (field, bt, "", "_ptr", "const"); return 0; } @@ -253,8 +253,8 @@ be_visitor_valuebox_union_member_ci::visit_interface_fwd (be_interface_fwd *node *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "", "_ptr"); - this->emit_member_get (vb_node_, field, bt, "", "_ptr", "const"); + this->emit_member_set (field, bt, "", "_ptr"); + this->emit_member_get (field, bt, "", "_ptr", "const"); return 0; } @@ -307,19 +307,19 @@ be_visitor_valuebox_union_member_ci::visit_predefined_type (be_predefined_type * { case AST_PredefinedType::PT_pseudo: case AST_PredefinedType::PT_object: - this->emit_member_set (vb_node_, field, bt, " ::", "_ptr"); - this->emit_member_get (vb_node_, field, bt, " ::", "_ptr", "const"); + this->emit_member_set (field, bt, " ::", "_ptr"); + this->emit_member_get (field, bt, " ::", "_ptr", "const"); break; case AST_PredefinedType::PT_any: - this->emit_member_set (vb_node_, field, bt, "const ::", " &"); - this->emit_member_get (vb_node_, field, bt, "const ::", " &", "const"); - this->emit_member_get (vb_node_, field, bt, "::", " &", ""); + this->emit_member_set (field, bt, "const ::", " &"); + this->emit_member_get (field, bt, "const ::", " &", "const"); + this->emit_member_get (field, bt, "::", " &", ""); break; case AST_PredefinedType::PT_void: break; default: - this->emit_member_set (vb_node_, field, bt, " ::", ""); - this->emit_member_get (vb_node_, field, bt, " ::", "", "const"); + this->emit_member_set (field, bt, " ::", ""); + this->emit_member_get (field, bt, " ::", "", "const"); break; } @@ -356,9 +356,9 @@ be_visitor_valuebox_union_member_ci::visit_sequence (be_sequence *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "const ", " &"); - this->emit_member_get (vb_node_, field, bt, "const ", " &", "const"); - this->emit_member_get (vb_node_, field, bt, "", " &", ""); + this->emit_member_set (field, bt, "const ", " &"); + this->emit_member_get (field, bt, "const ", " &", "const"); + this->emit_member_get (field, bt, "", " &", ""); return 0; } @@ -393,8 +393,8 @@ be_visitor_valuebox_union_member_ci::visit_string (be_string *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "", ""); - this->emit_member_set (vb_node_, field, bt, "const ", ""); + this->emit_member_set (field, bt, "", ""); + this->emit_member_set (field, bt, "const ", ""); *os << "// Modifier to set the member." << be_nl; @@ -416,7 +416,7 @@ be_visitor_valuebox_union_member_ci::visit_string (be_string *node) << " (val);" << be_uidt_nl << "}" << be_nl << be_nl; - this->emit_member_get (vb_node_, field, bt, "const ", "", "const"); + this->emit_member_get (field, bt, "const ", "", "const"); return 0; } @@ -451,9 +451,9 @@ be_visitor_valuebox_union_member_ci::visit_structure (be_structure *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "const ", " &"); - this->emit_member_get (vb_node_, field, bt, "const ", " &", "const"); - this->emit_member_get (vb_node_, field, bt, "", " &", ""); + this->emit_member_set (field, bt, "const ", " &"); + this->emit_member_get (field, bt, "const ", " &", "const"); + this->emit_member_get (field, bt, "", " &", ""); return 0; } @@ -507,19 +507,19 @@ be_visitor_valuebox_union_member_ci::visit_union (be_union *node) *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl; - this->emit_member_set (vb_node_, field, bt, "const ", " &"); - this->emit_member_get (vb_node_, field, bt, "const ", " &", "const"); - this->emit_member_get (vb_node_, field, bt, "", " &", ""); + this->emit_member_set (field, bt, "const ", " &"); + this->emit_member_get (field, bt, "const ", " &", "const"); + this->emit_member_get (field, bt, "", " &", ""); return 0; } void -be_visitor_valuebox_union_member_ci::emit_member_set (be_decl *vb_node_, - be_decl *field, - be_type *field_type, - const char *const_arg, - const char *arg_modifier) +be_visitor_valuebox_union_member_ci::emit_member_set ( + be_decl *field, + be_type *field_type, + const char *const_arg, + const char *arg_modifier) { TAO_OutStream *os = this->ctx_->stream (); @@ -536,12 +536,12 @@ be_visitor_valuebox_union_member_ci::emit_member_set (be_decl *vb_node_, } void -be_visitor_valuebox_union_member_ci::emit_member_get (be_decl *vb_node_, - be_decl *field, - be_type *field_type, - const char *const_prefix, - const char *type_suffix, - const char *const_method) +be_visitor_valuebox_union_member_ci::emit_member_get ( + be_decl *field, + be_type *field_type, + const char *const_prefix, + const char *type_suffix, + const char *const_method) { TAO_OutStream *os = this->ctx_->stream (); diff --git a/modules/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h b/modules/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h index fb35d5e28ae..0698ee6c226 100644 --- a/modules/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h +++ b/modules/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h @@ -83,14 +83,12 @@ public: // visit union type private: - void emit_member_set (be_decl *vb_node, - be_decl *field, + void emit_member_set (be_decl *field, be_type *field_type, const char *const_arg, const char *arg_modifier); - void emit_member_get (be_decl *vb_node, - be_decl *field, + void emit_member_get (be_decl *field, be_type *field_type, const char *const_prefix, const char *type_suffix, diff --git a/modules/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h b/modules/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h index 4ed5b8162e5..066f4958d94 100644 --- a/modules/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h +++ b/modules/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h @@ -81,14 +81,12 @@ public: // visit union type private: - void emit_member_set (be_decl *vb_node, - be_decl *field, + void emit_member_set (be_decl *field, be_type *field_type, const char *const_arg, const char *arg_modifier); - void emit_member_get (be_decl *vb_node, - be_decl *field, + void emit_member_get (be_decl *field, be_type *field_type, const char *const_prefix, const char *type_suffix, |