made some syntax corrections

2 files changed, 51 insertions, 245 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
index d7b1d10988d..0ad2a0ffc13 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -365,11 +365,7 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node,
 
     }
   os->indent ();
-  /* *os << "PortableInterceptor::Cookies _tao_cookies;" << be_nl
-      << "CORBA::NVList_var _tao_interceptor_args;" << be_nl
-      << "if (_tao_vfr.valid ())" << be_idt_nl << "{" << be_idt_nl
-      << "istub->orb_core ()->orb ()->create_list "
-      << "(0, _tao_interceptor_args.inout (), ACE_TRY_ENV);\n";*/
+
   // Obtain the scope.
 
   os->indent ();
@@ -404,7 +400,6 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node,
   ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_CS);
   visitor = tao_cg->make_visitor (&ctx);
 
-  //  if ((!visitor) || (bt->accept (visitor) == -1))
   if ((!visitor) || (node->accept (visitor) == -1))
     {
       delete visitor;
@@ -416,8 +411,7 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node,
     }
   delete visitor;
   *os << ");\n";
-
-  /* 
+   
   if (this->gen_check_exception (bt) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -426,13 +420,13 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node,
                          "codegen for checking exception failed\n"),
                         -1);
 
-                        }*/
+    }
   os->decr_indent ();
   //  *os << "}\n" << be_uidt_nl;
 
   *os << "ACE_TRY" << be_idt_nl
-      << "{\n"
-      << "#endif /* TAO_HAS_INTERCEPTORS */\n";
+      << "{\n";
+     *os << "#endif /* TAO_HAS_INTERCEPTORS */\n";
 
   *os << be_nl
       << "for (;;)" << be_nl
@@ -453,20 +447,6 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node,
 
   // Invoke preinvoke interceptor
   *os << be_nl << "TAO_INTERCEPTOR (" << be_idt << be_idt_nl
-    /*      << "_tao_vfr.preinvoke (" << be_idt << be_idt_nl
-      << "_tao_call.request_id ()," << be_nl;
-
-  if (node->flags () == AST_Operation::OP_oneway)
-    *os << "0";
-  else
-    *os << "1";
-
-  *os << "," << be_nl << "this," << be_nl
-      << this->compute_operation_name (node) << ","
-      << be_nl << "_tao_call.service_info ()," << be_nl
-      << "_tao_interceptor_args.inout ()," << be_nl
-      << "_tao_cookies,"*/
-
     // Get the request_id field for the Request Info. In TAO, request id's
     // change with differnet profiles so this seems to be the appropriate 
     // place to populate the Request Info with it.
@@ -739,129 +719,57 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node,
                                  "codegen for return var failed\n"),
                                 -1);
         }
-          *os <<")" << be_nl;
-    }
-  /*
-  // Obtain the scope.
-
-  os->indent ();
-  if (node->is_nested ())
-    {
-      be_decl *parent =
-        be_scope::narrow_from_scope (node->defined_in ())->decl ();
-      // But since we are at the interface level our parents full_name
-      // will include the interface name which we dont want and so we 
-      // get our parent's parent's full name.
-      //    be_interface *parent_interface = be_interface::narrow_from_decl (parent);
-      // be_decl *parents_parent = be_interface::narrow_from_scope (parent_interface->scope ())->decl ();
-      // Generate the scope::operation name.
-      //  *os << parents_parent->full_name () << "::";
-      *os << parent->full_name () << "::";
-    }
-
-  *os << "TAO_ClientRequest_Info_"<< node->flat_name ()  << "  ri_next (" << this->compute_operation_name (node) << ",\n"
-      << "_tao_call.service_info ()," << be_nl
-      << "(CORBA::Object_ptr) this" << be_nl;
-
-  // This necesary becos: (a) a comma is needed if there are arguments
-  // (b) not needed if exceptions enabled since thats done already (c)
-  // not needed if there are no args and exceptions is disabled.
-
-  os->indent ();
-  if (node->argument_count () > 0)
-    *os << ",\n";
-
-  // Generate the formal argument fields which are passed to the RequestInfo object
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_CS);
-  visitor = tao_cg->make_visitor (&ctx);
-
-  //  if ((!visitor) || (bt->accept (visitor) == -1))
-  if ((!visitor) || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for arglist failed\n"),
-                        -1);
-    }
-  delete visitor;
-  *os << ");\n";
-  */
-  
-  // Invoke postinvoke interceptor
-  *os << be_nl << "TAO_INTERCEPTOR (" << be_idt << be_idt_nl;
-    /*      << "_tao_vfr.postinvoke (" << be_idt << be_idt_nl
-      << "_tao_call.request_id ()," << be_nl;
-
-  if (node->flags () == AST_Operation::OP_oneway)
-    *os << "0";
-  else
-    *os << "1";
-
-  *os << "," << be_nl << "this," << be_nl
-      << this->compute_operation_name (node)
-      << "," << be_nl << "_tao_call.service_info ()," << be_nl
-      << "_tao_interceptor_args.inout ()," << be_nl
-      << "_tao_cookies," <<*/
-
-  *os << "_tao_vfr.receive_reply (" << be_idt_nl 
-    //      << "&ri_next," 
-      << "&ri," 
-      << be_nl << "ACE_TRY_ENV" << be_uidt_nl
-      << ")" << be_uidt << be_uidt_nl << ");\n";
-  if (this->gen_check_interceptor_exception (bt) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "gen_marshal_and_invoke - "
-                         "codegen for checking exception failed\n"),
+          *os <<");" << be_nl;
+    }
+
+  // Oneway operations dont have receive reply since once the request
+  // goes over the wire, its the end of the story!
+
+  if (node->flags () != AST_Operation::OP_oneway)
+  {
+    // Invoke postinvoke interceptor
+    *os << be_nl << "TAO_INTERCEPTOR (" << be_idt << be_idt_nl;
+    *os << "_tao_vfr.receive_reply (" << be_idt_nl 
+        << "&ri," 
+        << be_nl << "ACE_TRY_ENV" << be_uidt_nl
+        << ")" << be_uidt << be_uidt_nl << ");\n";
+    if (this->gen_check_interceptor_exception (bt) == -1)
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "(%N:%l) be_visitor_operation_cs::"
+                           "gen_marshal_and_invoke - "
+                           "codegen for checking exception failed\n"),
                         -1);
-
-    }
-
-  os->indent ();
-  *os << "break;" << be_nl
-      << be_uidt_nl << "}\n";
-
+        
+      }
+    os->indent ();
+    *os << "break;" << be_nl;
+  } // End of if its not a oneway operation
+  *os << be_uidt_nl << "}\n";  
   // Generate exception occurred interceptor code
   *os << "#if (TAO_HAS_INTERCEPTORS == 1)" << be_nl
-      << be_uidt_nl << "}" << be_uidt_nl
-      << "ACE_CATCHANY" << be_idt_nl
-      << "{" << be_idt_nl;
-
+        << be_uidt_nl << "}" << be_uidt_nl
+        << "ACE_CATCHANY" << be_idt_nl
+        << "{" << be_idt_nl;
+    
   // Update the exception field of teh request info.
   *os << "ri.exception (&ACE_ANY_EXCEPTION);"<< be_nl;
-
+  
   *os << "_tao_vfr.receive_exception (" << be_idt << be_idt_nl
-           // << "_tao_call.request_id ()," << be_nl;
-    //      << "&ri_excp," << be_nl
       << "&ri," << be_nl
-           /*
-  if (node->flags () == AST_Operation::OP_oneway)
-    *os << "0";
-  else
-    *os << "1";
-
-  *os << "," << be_nl << "this," << be_nl
-      << this->compute_operation_name (node)
-      << "," << be_nl
-      << "_tao_cookies," << be_nl */
-
       << "ACE_TRY_ENV" << be_uidt_nl
       << ");" << be_uidt_nl;
-
+  
   // Forward Request exception needs to be taken care off here.
   // For now we dont bother about it.
   if (idl_global->use_raw_throw ())
     *os << "throw;" << be_uidt_nl;
-  else
-  *os << "ACE_RE_THROW;" << be_uidt_nl;
-
+    else
+      *os << "ACE_RE_THROW;" << be_uidt_nl;
+    
   *os << "}" << be_uidt_nl
       << "ACE_ENDTRY;\n";
-
+  
   if (this->gen_check_exception (bt) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -870,10 +778,8 @@ be_visitor_operation_cs::gen_marshal_and_invoke (be_operation *node,
                          "codegen for checking exception failed\n"),
                         -1);
     }
-
-  *os << "#endif /* TAO_HAS_INTERCEPTORS */\n";
-
-  return 0;
+  *os << "#endif /* TAO_HAS_INTERCEPTORS */\n";  
+return 0;
 }
 
 int
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index b50eb3dc1e6..661db61d067 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -180,10 +180,8 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
       << "TAO_ServerRequestInterceptor_Adapter" << be_idt_nl
       << "_tao_vfr (_tao_server_request.orb ()->_get_server_interceptor (ACE_TRY_ENV));" << be_uidt_nl
       << "ACE_CHECK;" << be_nl
-    /*      << "PortableInterceptor::Cookies _tao_cookies;" << be_nl
-            << "CORBA::NVList_var _tao_interceptor_args;" << be_nl*/
-
       << "CORBA::Object_var _tao_objref;" << be_nl;
+
   // Obtain the scope.
 
   os->indent ();
@@ -217,7 +215,6 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_SS);
   visitor = tao_cg->make_visitor (&ctx);
 
-  //  if ((!visitor) || (bt->accept (visitor) == -1))
   if ((!visitor) || (node->accept (visitor) == -1))
     {
       delete visitor;
@@ -230,31 +227,18 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   delete visitor;
   *os << ");\n";
 
-
   *os << "if (_tao_vfr.valid ())" << be_idt_nl
       << "{" << be_idt_nl
-      /*      << "_tao_server_request.orb ()->create_list "
-      << "(0, _tao_interceptor_args.inout (), ACE_TRY_ENV);"
-      << be_nl << "ACE_CHECK;\n" << be_nl*/
       << "_tao_objref = "
       << "_tao_server_request.objref (ACE_TRY_ENV);" << be_nl
       << "ACE_CHECK;" << be_uidt_nl << "}\n" << be_uidt_nl;
-      /*      << "ACE_TRY" << be_idt_nl
-      << "{" << be_idt_nl
-       << "_tao_vfr.preinvoke (" << be_idt << be_idt_nl
-      << "_tao_server_request.request_id ()," << be_nl;
 
-  if (node->flags () == AST_Operation::OP_oneway)
-    *os << "0";
-  else
-    *os << "1";
-
-  *os << "," << be_nl << "_tao_objref.in ()," << be_nl
-      << this->compute_operation_name (node) << ","
-      << be_nl << "_tao_server_request.service_info ()," << be_nl
-      << "_tao_interceptor_args.inout ()," << be_nl
-      << "_tao_cookies," << be_nl << "ACE_TRY_ENV" << be_uidt_nl
-      << ");" << be_uidt_nl
+   *os << "ACE_TRY" << be_idt_nl
+       << "{" << be_idt_nl;
+    // Update the request id field of the Request Info
+  *os << "ri.request_id (_tao_server_request.request_id ());" << be_nl
+      << "_tao_vfr.receive_request (&ri, ACE_TRY_ENV);"
+      << be_uidt_nl
       << "TAO_INTERCEPTOR_CHECK;\n";
   if (node->flags () == AST_Operation::OP_oneway
       && !this->has_param_type (node, AST_Argument::dir_IN))
@@ -262,15 +246,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
       *os << "#else" << be_nl
           << "ACE_UNUSED_ARG (_tao_server_request);\n";
     }
-    */
 
-  *os << "ACE_TRY" << be_idt_nl
-      << "{" << be_idt_nl
-    // Update the request id field of the Request Info
-      << "ri.request_id (_tao_server_request.request_id ());" << be_nl
-      << "_tao_vfr.receive_request (&ri, ACE_TRY_ENV);"
-      << be_uidt_nl
-      << "TAO_INTERCEPTOR_CHECK;\n";
   *os << "#endif /* TAO_HAS_INTERCEPTORS */\n\n";
 
   // make the upcall and assign to the return val
@@ -334,97 +310,21 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
                              "codegen for retval assignment failed\n"),
                         -1);
         }
-      *os << ")"<< be_nl;
+      *os << ");"<< be_nl;
     }
   *os << "TAO_INTERCEPTOR_CHECK;\n\n";
-  /*  // Obtain the scope.
-
-  os->indent ();
-  if (node->is_nested ())
-    {
-      be_decl *parent =
-        be_scope::narrow_from_scope (node->defined_in ())->decl ();
-      // But since we are at the interface level our parents full_name
-      // will include the interface name which we dont want and so we 
-      // get our parent's parent's full name.
-      //    be_interface *parent_interface = be_interface::narrow_from_decl (parent);
-      // be_decl *parents_parent = be_interface::narrow_from_scope (parent_interface->scope ())->decl ();
-      // Generate the scope::operation name.
-      //  *os << parents_parent->full_name () << "::";
-      *os << "POA_" <<parent->full_name () << "::";
-    }
-
-  *os << "TAO_ServerRequest_Info_"<< node->flat_name () << "  ri_next (" << this->compute_operation_name (node) << ",\n"
-      << "_tao_server_request.service_info ()";
-  
-  // This necesary becos: (a) a comma is needed if there are arguments
-  // (b) not needed if exceptions enabled since thats done already (c)
-  // not needed if there are no args and exceptions is disabled.
-  
-  os->indent ();
-  if (node->argument_count () > 0)
-    *os << ",\n";
-  
-  // Generate the formal argument fields which are passed to the RequestInfo object
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_INTERCEPTORS_INFO_ARGLIST_SS);
-  visitor = tao_cg->make_visitor (&ctx);
-
-  //  if ((!visitor) || (bt->accept (visitor) == -1))
-  if ((!visitor) || (node->accept (visitor) == -1))
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_cs::"
-                         "visit_operation - "
-                         "codegen for arglist failed\n"),
-                        -1);
-    }
-  delete visitor;
-  *os << ");\n";
-  */
 
   // do postinvoke, and check for exception.
   *os << "#if (TAO_HAS_INTERCEPTORS == 1)" << be_nl;
-    /*      << "_tao_vfr.postinvoke (" << be_idt << be_idt_nl
-      << "_tao_server_request.request_id ()," << be_nl;
-
-  if (node->flags () == AST_Operation::OP_oneway)
-    *os << "0";
-  else
-    *os << "1";
-
-  *os << "," << be_nl << "_tao_objref.in ()," << be_nl
-      << this->compute_operation_name (node) << ","
-      << be_nl << "_tao_server_request.service_info ()," << be_nl
-      << "_tao_interceptor_args.inout ()," << be_nl
-      << "_tao_cookies," << be_nl << "ACE_TRY_ENV" << be_uidt_nl
-      << ");"*/
   *os << be_uidt_nl
-    //    << " _tao_vfr.send_reply (&ri_next, ACE_TRY_ENV);"<<be_nl
       << " _tao_vfr.send_reply (&ri, ACE_TRY_ENV);"<<be_nl
       << "TAO_INTERCEPTOR_CHECK;" << be_uidt_nl
       << "}" << be_uidt_nl
       << "ACE_CATCHANY" << be_idt_nl
       << "{" << be_idt_nl;
-  //    << "_tao_vfr.exception_occurred (" << be_idt << be_idt_nl
-
   // Update the exception field of teh request info.
   *os << "ri.exception (&ACE_ANY_EXCEPTION);"<< be_nl;
-
-  //  *os << "_tao_vfr.send_exception (&ri_excp ," << be_idt << be_idt_nl
   *os << "_tao_vfr.send_exception (&ri," << be_idt << be_idt_nl
-    /*      << "_tao_server_request.request_id ()," << be_nl;
-
-  if (node->flags () == AST_Operation::OP_oneway)
-    *os << "0";
-  else
-    *os << "1";
-
-  *os << "," << be_nl << "_tao_objref.in ()," << be_nl
-      << this->compute_operation_name (node) << "," << be_nl
-      << "_tao_cookies," << be_nl*/
-
       << "ACE_TRY_ENV" << be_uidt_nl
       << ");" << be_uidt_nl;