ChangeLogTag: Tue Oct 17 16:08:13 2000 Jeff Parsons <parsons@cs.wustl.edu>

2 files changed, 42 insertions, 265 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp
index f19d7fec9e3..d7071f6c2b1 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp
@@ -97,25 +97,16 @@ int be_visitor_args_request_info_arglist::visit_array (be_array *node)
   be_decl* scope =
     be_scope::narrow_from_scope (bt->defined_in ())->decl ();
 
-  AST_Decl::NodeType nt = scope->node_type ();
-
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "const ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os << ")";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -126,19 +117,12 @@ int be_visitor_args_request_info_arglist::visit_array (be_array *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os << ")";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -149,19 +133,12 @@ int be_visitor_args_request_info_arglist::visit_array (be_array *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os << "_out)";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -197,25 +174,16 @@ int be_visitor_args_request_info_arglist::visit_enum (be_enum *node)
   be_decl* scope =
     be_scope::narrow_from_scope (bt->defined_in ())->decl ();
 
-  AST_Decl::NodeType nt = scope->node_type ();
-
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "const ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os << ")" << " &";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -226,19 +194,12 @@ int be_visitor_args_request_info_arglist::visit_enum (be_enum *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os << ") &";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -249,19 +210,12 @@ int be_visitor_args_request_info_arglist::visit_enum (be_enum *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os << "_out)";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -358,8 +312,6 @@ int be_visitor_args_request_info_arglist::visit_predefined_type (
   be_decl* scope =
     be_scope::narrow_from_scope (bt->defined_in ())->decl ();
 
-  AST_Decl::NodeType nt = scope->node_type ();
-
   // Check if the type is an any.
   if (node->pt () == AST_PredefinedType::PT_any)
     {
@@ -367,19 +319,12 @@ int be_visitor_args_request_info_arglist::visit_predefined_type (
         {
         case AST_Argument::dir_IN:
           {
-            if (bt->is_nested ()
-                && !bt->imported ()
-                && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-                && this->ctx_->sub_state () 
-                     == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+            if (scope == this->ctx_->scope ())
               {
                 *os << "const ACE_NESTED_CLASS (";
 	              *os << scope->name () << ",";
 	              *os << bt->local_name ();
 	              *os << ")" << " &";
-
-                // Reset the substate.
-                this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
               }
             else
               {
@@ -390,19 +335,12 @@ int be_visitor_args_request_info_arglist::visit_predefined_type (
           }
         case AST_Argument::dir_INOUT:
           {
-            if (bt->is_nested ()
-                && !bt->imported ()
-                && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-                && this->ctx_->sub_state () 
-                     == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+            if (scope == this->ctx_->scope ())
               {
                 *os << "ACE_NESTED_CLASS (";
 	              *os << scope->name () << ",";
 	              *os << bt->local_name ();
 	              *os << ")" << " &";
-
-                // Reset the substate.
-                this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
               }
             else
               {
@@ -413,19 +351,12 @@ int be_visitor_args_request_info_arglist::visit_predefined_type (
           }
         case AST_Argument::dir_OUT:
           {
-            if (bt->is_nested ()
-                && !bt->imported ()
-                && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-                && this->ctx_->sub_state () 
-                     == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+            if (scope == this->ctx_->scope ())
               {
                 *os << "ACE_NESTED_CLASS (";
 	              *os << scope->name () << ",";
 	              *os << bt->local_name ();
 	              *os << "_out)";
-
-                // Reset the substate.
-                this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
               }
             else
               {
@@ -457,19 +388,12 @@ int be_visitor_args_request_info_arglist::visit_predefined_type (
         {
         case AST_Argument::dir_IN:
           {
-            if (bt->is_nested ()
-                && !bt->imported ()
-                && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-                && this->ctx_->sub_state () 
-                     == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+            if (scope == this->ctx_->scope ())
               {
                 *os << "const ACE_NESTED_CLASS (";
 	              *os << scope->name () << ",";
 	              *os << bt->local_name ();
 	              *os << ")" << " &";
-
-                // Reset the substate.
-                this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
               }
             else
               {
@@ -480,19 +404,12 @@ int be_visitor_args_request_info_arglist::visit_predefined_type (
           }
         case AST_Argument::dir_INOUT:
           {
-            if (bt->is_nested ()
-                && !bt->imported ()
-                && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-                && this->ctx_->sub_state () 
-                     == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+            if (scope == this->ctx_->scope ())
               {
                 *os << "ACE_NESTED_CLASS (";
 	              *os << scope->name () << ",";
 	              *os << bt->local_name ();
 	              *os << ")" << " &";
-
-                // Reset the substate.
-                this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
               }
             else
               {
@@ -503,19 +420,12 @@ int be_visitor_args_request_info_arglist::visit_predefined_type (
           }
         case AST_Argument::dir_OUT:
           {
-            if (bt->is_nested ()
-                && !bt->imported ()
-                && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-                && this->ctx_->sub_state () 
-                     == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+            if (scope == this->ctx_->scope ())
               {
                 *os << "ACE_NESTED_CLASS (";
 	              *os << scope->name () << ",";
 	              *os << bt->local_name ();
 	              *os << "_out)";
-
-                // Reset the substate.
-                this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
               }
             else
               {
@@ -552,25 +462,16 @@ int be_visitor_args_request_info_arglist::visit_sequence (be_sequence *node)
   be_decl* scope =
     be_scope::narrow_from_scope (bt->defined_in ())->decl ();
 
-  AST_Decl::NodeType nt = scope->node_type ();
-
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "const ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os << ") &";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -581,19 +482,12 @@ int be_visitor_args_request_info_arglist::visit_sequence (be_sequence *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os << ") &";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -604,19 +498,12 @@ int be_visitor_args_request_info_arglist::visit_sequence (be_sequence *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os << "_out)";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -690,26 +577,16 @@ int be_visitor_args_request_info_arglist::visit_structure (be_structure *node)
   be_decl* scope =
     be_scope::narrow_from_scope (bt->defined_in ())->decl ();
 
-  AST_Decl::NodeType nt = scope->node_type ();
-
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union)
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "const ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os << ") &";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -720,19 +597,12 @@ int be_visitor_args_request_info_arglist::visit_structure (be_structure *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os << ") &";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -743,19 +613,12 @@ int be_visitor_args_request_info_arglist::visit_structure (be_structure *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union)
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os << "_out)";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -791,25 +654,16 @@ int be_visitor_args_request_info_arglist::visit_union (be_union *node)
   be_decl* scope =
     be_scope::narrow_from_scope (bt->defined_in ())->decl ();
 
-  AST_Decl::NodeType nt = scope->node_type ();
-
   switch (this->direction ())
     {
     case AST_Argument::dir_IN:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "const ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os  << ") &";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -820,19 +674,12 @@ int be_visitor_args_request_info_arglist::visit_union (be_union *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os  << ") &";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
@@ -843,19 +690,12 @@ int be_visitor_args_request_info_arglist::visit_union (be_union *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (nt == AST_Decl::NT_interface || nt == AST_Decl::NT_union )
-            && this->ctx_->sub_state () 
-                 == TAO_CodeGen::TAO_INTERCEPTORS_INFO_ARGUMENT_STUB)
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
 	          *os << bt->local_name ();
 	          *os  << "_out)";
-
-            // Reset the substate.
-            this->ctx_->sub_state (TAO_CodeGen::TAO_SUB_STATE_UNKNOWN);
           }
         else
           {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp
index dc1a0de837a..a090d1bd95b 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp
@@ -99,10 +99,7 @@ int be_visitor_args_request_info_ch::visit_array (be_array *node)
     {
     case AST_Argument::dir_IN:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "const ACE_NESTED_CLASS (";
             *os << scope->name () << ",";
@@ -118,10 +115,7 @@ int be_visitor_args_request_info_ch::visit_array (be_array *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -137,10 +131,7 @@ int be_visitor_args_request_info_ch::visit_array (be_array *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -185,10 +176,7 @@ int be_visitor_args_request_info_ch::visit_enum (be_enum *node)
     {
     case AST_Argument::dir_IN:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "const ACE_NESTED_CLASS (";
             *os << scope->name () << ",";
@@ -204,10 +192,7 @@ int be_visitor_args_request_info_ch::visit_enum (be_enum *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -223,10 +208,7 @@ int be_visitor_args_request_info_ch::visit_enum (be_enum *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -336,10 +318,7 @@ int be_visitor_args_request_info_ch::visit_predefined_type (
         {
         case AST_Argument::dir_IN:
           {
-            if (bt->is_nested () 
-                && !bt->imported ()
-                && (scope->node_type () == AST_Decl::NT_interface
-                    || scope->node_type () == AST_Decl::NT_union ))
+            if (scope == this->ctx_->scope ())
               {
                 *os << "const ACE_NESTED_CLASS (";
                 *os << scope->name () << ",";
@@ -355,10 +334,7 @@ int be_visitor_args_request_info_ch::visit_predefined_type (
           }
         case AST_Argument::dir_INOUT:
           {
-            if (bt->is_nested () 
-                && !bt->imported ()
-                && (scope->node_type () == AST_Decl::NT_interface
-                    || scope->node_type () == AST_Decl::NT_union ))
+            if (scope == this->ctx_->scope ())
               {
                 *os << "ACE_NESTED_CLASS (";
                 *os << scope->name () << ",";
@@ -374,10 +350,7 @@ int be_visitor_args_request_info_ch::visit_predefined_type (
           }
         case AST_Argument::dir_OUT:
           {
-            if (bt->is_nested () 
-                && !bt->imported ()
-                && (scope->node_type () == AST_Decl::NT_interface
-                    || scope->node_type () == AST_Decl::NT_union ))
+            if (scope == this->ctx_->scope ())
               {
                 *os << "ACE_NESTED_CLASS (";
 	              *os << scope->name () << ",";
@@ -414,10 +387,7 @@ int be_visitor_args_request_info_ch::visit_predefined_type (
         {
         case AST_Argument::dir_IN:
           {
-            if (bt->is_nested () 
-                && !bt->imported ()
-                && (scope->node_type () == AST_Decl::NT_interface
-                    || scope->node_type () == AST_Decl::NT_union ))
+            if (scope == this->ctx_->scope ())
               {
                 *os << "const ACE_NESTED_CLASS (";
                 *os << scope->name () << ",";
@@ -433,10 +403,7 @@ int be_visitor_args_request_info_ch::visit_predefined_type (
           }
         case AST_Argument::dir_INOUT:
           {
-            if (bt->is_nested () 
-                && !bt->imported ()
-                && (scope->node_type () == AST_Decl::NT_interface
-                    || scope->node_type () == AST_Decl::NT_union ))
+            if (scope == this->ctx_->scope ())
               {
                 *os << "ACE_NESTED_CLASS (";
                 *os << scope->name () << ",";
@@ -452,10 +419,7 @@ int be_visitor_args_request_info_ch::visit_predefined_type (
           }
         case AST_Argument::dir_OUT:
           {
-            if (bt->is_nested () 
-                && !bt->imported ()
-                && (scope->node_type () == AST_Decl::NT_interface
-                    || scope->node_type () == AST_Decl::NT_union ))
+            if (scope == this->ctx_->scope ())
               {
                 *os << "ACE_NESTED_CLASS (";
 	              *os << scope->name () << ",";
@@ -501,10 +465,7 @@ int be_visitor_args_request_info_ch::visit_sequence (be_sequence *node)
     {
     case AST_Argument::dir_IN:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "const ACE_NESTED_CLASS (";
             *os << scope->name () << ",";
@@ -520,10 +481,7 @@ int be_visitor_args_request_info_ch::visit_sequence (be_sequence *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -536,10 +494,7 @@ int be_visitor_args_request_info_ch::visit_sequence (be_sequence *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -623,10 +578,7 @@ int be_visitor_args_request_info_ch::visit_structure (be_structure *node)
     {
     case AST_Argument::dir_IN:
       {
-        if (bt->is_nested ()
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "const ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -642,10 +594,7 @@ int be_visitor_args_request_info_ch::visit_structure (be_structure *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -661,10 +610,7 @@ int be_visitor_args_request_info_ch::visit_structure (be_structure *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -709,10 +655,7 @@ int be_visitor_args_request_info_ch::visit_union (be_union *node)
     {
     case AST_Argument::dir_IN:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "const ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -728,10 +671,7 @@ int be_visitor_args_request_info_ch::visit_union (be_union *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -747,10 +687,7 @@ int be_visitor_args_request_info_ch::visit_union (be_union *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested () 
-            && !bt->imported ()
-            && (scope->node_type () == AST_Decl::NT_interface
-                || scope->node_type () == AST_Decl::NT_union ))
+        if (scope == this->ctx_->scope ())
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";