ChangeLogTag: Wed Sep 20 09:38:32 2000 Jeff Parsons <parsons@cs.wustl.edu>

5 files changed, 59 insertions, 357 deletions

diff --git a/TAO/TAO_IDL/TAO_IDL_BE_DLL.dsp b/TAO/TAO_IDL/TAO_IDL_BE_DLL.dsp
index ebbd0eea6cd..2bdfde73f66 100644
--- a/TAO/TAO_IDL/TAO_IDL_BE_DLL.dsp
+++ b/TAO/TAO_IDL/TAO_IDL_BE_DLL.dsp
@@ -452,10 +452,6 @@ SOURCE=.\be_include\be_sequence.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\be_include\be_state.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\be_include\be_stream_factory.h

 # End Source File

 # Begin Source File

diff --git a/TAO/TAO_IDL/TAO_IDL_BE_LIB.dsp b/TAO/TAO_IDL/TAO_IDL_BE_LIB.dsp
index 6a8cf987071..66f186cc99a 100644
--- a/TAO/TAO_IDL/TAO_IDL_BE_LIB.dsp
+++ b/TAO/TAO_IDL/TAO_IDL_BE_LIB.dsp
@@ -445,10 +445,6 @@ SOURCE=.\be_include\be_sequence.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\be_include\be_state.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\be_include\be_stream_factory.h

 # End Source File

 # Begin Source File

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 4b812321972..a3282866409 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
@@ -95,14 +95,13 @@ int be_visitor_args_request_info_ch::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 () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "const ACE_NESTED_CLASS (";
             *os << scope->name () << ",";
@@ -118,8 +117,9 @@ int be_visitor_args_request_info_ch::visit_array (be_array *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -135,8 +135,9 @@ int be_visitor_args_request_info_ch::visit_array (be_array *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -177,14 +178,13 @@ int be_visitor_args_request_info_ch::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 () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "const ACE_NESTED_CLASS (";
             *os << scope->name () << ",";
@@ -200,8 +200,9 @@ int be_visitor_args_request_info_ch::visit_enum (be_enum *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -217,8 +218,9 @@ int be_visitor_args_request_info_ch::visit_enum (be_enum *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -257,7 +259,9 @@ int be_visitor_args_request_info_ch::visit_interface (be_interface *node)
   return 0;
 }
 
-int be_visitor_args_request_info_ch::visit_interface_fwd (be_interface_fwd *node)
+int be_visitor_args_request_info_ch::visit_interface_fwd (
+    be_interface_fwd *node
+  )
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
 
@@ -295,7 +299,9 @@ int be_visitor_args_request_info_ch::visit_native (be_native *node)
   return 0;
 }
 
-int be_visitor_args_request_info_ch::visit_predefined_type (be_predefined_type *node)
+int be_visitor_args_request_info_ch::visit_predefined_type (
+    be_predefined_type *node
+  )
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
   be_type *bt = 0;
@@ -317,9 +323,7 @@ int be_visitor_args_request_info_ch::visit_predefined_type (be_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
+  // Check if the type is an any.
   if (node->pt () == AST_PredefinedType::PT_any)
     {
       switch (this->direction ())
@@ -350,14 +354,15 @@ int be_visitor_args_request_info_ch::visit_predefined_type (be_predefined_type *
           break;
         } // end switch direction
     } // end else if
-  else // simple predefined types
+  else // Simple predefined types.
     {
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
           {
-            if (bt->is_nested () && (scope->node_type () == AST_Decl::NT_interface
-                                     || scope->node_type () == AST_Decl::NT_union ))
+            if (bt->is_nested () 
+                && (scope->node_type () == AST_Decl::NT_interface
+                    || scope->node_type () == AST_Decl::NT_union ))
               {
                 *os << "const ACE_NESTED_CLASS (";
                 *os << scope->name () << ",";
@@ -405,14 +410,13 @@ int be_visitor_args_request_info_ch::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 () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "const ACE_NESTED_CLASS (";
             *os << scope->name () << ",";
@@ -428,8 +432,9 @@ int be_visitor_args_request_info_ch::visit_sequence (be_sequence *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -442,8 +447,9 @@ int be_visitor_args_request_info_ch::visit_sequence (be_sequence *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -522,14 +528,13 @@ int be_visitor_args_request_info_ch::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 () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "const ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -545,8 +550,9 @@ int be_visitor_args_request_info_ch::visit_structure (be_structure *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -562,8 +568,9 @@ int be_visitor_args_request_info_ch::visit_structure (be_structure *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -604,14 +611,13 @@ int be_visitor_args_request_info_ch::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 () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "const ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -627,8 +633,9 @@ int be_visitor_args_request_info_ch::visit_union (be_union *node)
       }
     case AST_Argument::dir_INOUT:
       {
-        if (bt->is_nested () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -644,8 +651,9 @@ int be_visitor_args_request_info_ch::visit_union (be_union *node)
       }
     case AST_Argument::dir_OUT:
       {
-        if (bt->is_nested () && (scope->node_type () == AST_Decl::NT_interface
-                                 || scope->node_type () == AST_Decl::NT_union ))
+        if (bt->is_nested () 
+            && (scope->node_type () == AST_Decl::NT_interface
+                || scope->node_type () == AST_Decl::NT_union ))
           {
             *os << "ACE_NESTED_CLASS (";
 	          *os << scope->name () << ",";
@@ -703,7 +711,9 @@ int be_visitor_args_request_info_ch::visit_valuetype (be_valuetype *node)
   return 0;
 }
 
-int be_visitor_args_request_info_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
+int be_visitor_args_request_info_ch::visit_valuetype_fwd (
+    be_valuetype_fwd *node
+  )
 {
   TAO_OutStream *os = this->ctx_->stream (); // get the stream
 
diff --git a/TAO/TAO_IDL/be_include/Makefile.am b/TAO/TAO_IDL/be_include/Makefile.am
index 376730b83b2..86d6a401dbd 100644
--- a/TAO/TAO_IDL/be_include/Makefile.am
+++ b/TAO/TAO_IDL/be_include/Makefile.am
@@ -38,7 +38,6 @@ noinst_HEADERS = \
   be_root.h \
   be_scope.h \
   be_sequence.h \
-  be_state.h \
   be_stream_factory.h \
   be_string.h \
   be_structure.h \
diff --git a/TAO/TAO_IDL/be_include/be_state.h b/TAO/TAO_IDL/be_include/be_state.h
deleted file mode 100644
index eaee5f30407..00000000000
--- a/TAO/TAO_IDL/be_include/be_state.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_state.h
-//
-// = DESCRIPTION
-//   The Code generator state class and its subclasses
-//
-// = AUTHOR
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef TAO_BE_STATE_H
-#define TAO_BE_STATE_H
-
-class be_type;
-class be_decl;
-
-class be_state
-{
-  // =TITLE
-  // be_state
-  // =DESCRIPTION
-  // Emits code based on current state. This is an abstract base class. The
-  // task of code generation is handled by subclasses.
-public:
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0) = 0;
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-
-  virtual ~be_state (void);
-  // destructor
-
-protected:
-  be_state (void);
-  // constructor
-};
-
-// ============== subclasses ====================
-
-class be_state_struct : public be_state
-{
-  // =TITLE
-  // be_state_struct
-  // =DESCRIPTION
-  // struct generation
-public:
-
-  be_state_struct (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_struct, ACE_SYNCH_RECURSIVE_MUTEX> TAO_BE_STATE_STRUCT;
-
-class be_state_union_disctypedefn_ch: public be_state
-{
-  // =TITLE
-  // be_state_union_disctypedefn_ch
-  // =DESCRIPTION
-  // union discriminant defn generation in client header
-public:
-
-  be_state_union_disctypedefn_ch (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_disctypedefn_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_DISCTYPEDEFN_CH;
-
-class be_state_union_disctypedefn_ci: public be_state
-{
-  // =TITLE
-  // be_state_union_disctypedefn_ci
-  // =DESCRIPTION
-  // union discriminant defn generation in client inline file
-public:
-
-  be_state_union_disctypedefn_ci (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_disctypedefn_ci, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_DISCTYPEDEFN_CI;
-
-class be_state_union_public_ch: public be_state
-{
-  // =TITLE
-  // be_state_union_public_ch
-  // =DESCRIPTION
-  // union discriminant defn generation in client header file
-public:
-
-  be_state_union_public_ch (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_public_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_PUBLIC_CH;
-
-class be_state_union_public_ci: public be_state
-{
-  // =TITLE
-  // be_state_union_public_ci
-  // =DESCRIPTION
-  // union discriminant defn generation in client inline file
-public:
-
-  be_state_union_public_ci (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_public_ci, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_PUBLIC_CI;
-
-class be_state_union_private_ch: public be_state
-{
-  // =TITLE
-  // be_state_union_private_ch
-  // =DESCRIPTION
-  // union discriminant defn generation in client header file
-public:
-
-  be_state_union_private_ch (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_private_ch, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_PRIVATE_CH;
-
-class be_state_union_public_cs: public be_state
-{
-  // =TITLE
-  // be_state_union_public_cs
-  // =DESCRIPTION
-  // union discriminant defn generation in client stubs file
-public:
-
-  be_state_union_public_cs (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_union_public_cs, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_UNION_PUBLIC_CS;
-
-class be_state_operation: public be_state
-{
-  // =TITLE
-  // be_state_operation
-  // =DESCRIPTION
-  // operation return type
-public:
-
-  be_state_operation (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_operation, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_OPERATION;
-
-class be_state_argument: public be_state
-{
-  // =TITLE
-  // be_state_argument
-  // =DESCRIPTION
-  // argument return type
-public:
-
-  be_state_argument (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_argument, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_ARGUMENT;
-
-class be_state_typedef: public be_state
-{
-  // =TITLE
-  // be_state_typedef
-  // =DESCRIPTION
-  // typedef code generation
-public:
-
-  be_state_typedef (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_typedef, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_TYPEDEF;
-
-class be_state_array: public be_state
-{
-  // =TITLE
-  // be_state_array
-  // =DESCRIPTION
-  // array code generation
-public:
-
-  be_state_array (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_array, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_ARRAY;
-
-class be_state_sequence: public be_state
-{
-  // =TITLE
-  // be_state_sequence
-  // =DESCRIPTION
-  // sequence code generation
-public:
-
-  be_state_sequence (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third parameter is
-  // used for recursive invocation involving a typedef
-};
-typedef ACE_Singleton<be_state_sequence, ACE_SYNCH_RECURSIVE_MUTEX>
-                                    TAO_BE_STATE_SEQUENCE;
-
-class be_state_attribute : public be_state
-{
-  // =TITLE
-  // be_state_attribute
-  // =DESCRIPTION
-  // attribute code generation
-public:
-  be_state_attribute (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third
-  // parameter is used for recursive invocation involving a typedef
-};
-
-typedef ACE_Singleton<be_state_attribute, ACE_SYNCH_RECURSIVE_MUTEX>
-        TAO_BE_STATE_ATTRIBUTE;
-
-class be_state_exception : public be_state
-{
-  // =TITLE
-  // be_state_exception
-  // =DESCRIPTION
-  // exception code generation
-public:
-  be_state_exception (void);
-  // constructor
-
-  virtual int gen_code (be_type *bt, be_decl *d, be_type *type=0);
-  // code generation for node "d" whose type is "bt". The third
-  // parameter is used for recursive invocation involving a typedef
-};
-
-typedef ACE_Singleton<be_state_exception, ACE_SYNCH_RECURSIVE_MUTEX>
-        TAO_BE_STATE_EXCEPTION;
-
-#endif /* end of be_state */