ChangeLogTag: Tue Oct 3 19:20:14 2000 Jeff Parsons <parsons@cs.wustl.edu>

8 files changed, 153 insertions, 180 deletions

diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h
index 25711ec2973..1facd86c72b 100644
--- a/TAO/TAO_IDL/include/ast_interface_fwd.h
+++ b/TAO/TAO_IDL/include/ast_interface_fwd.h
@@ -62,53 +62,50 @@ NOTE:
 SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
 trademarks or registered trademarks of Sun Microsystems, Inc.
 
- */
+*/
 
 #ifndef _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH
 #define _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH
 
-// Representation of a forward interface declaration
-
-/*
-** DEPENDENCIES: ast_decl.hh, ast_interface.hh, utl_scoped_name.hh,
-**               utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
+// Representation of a forward interface declaration.
 
 class TAO_IDL_FE_Export AST_InterfaceFwd : public virtual AST_Type
 {
 public:
-  // Operations
+  // Operations.
+
+  // Constructor(s).
+  AST_InterfaceFwd (void);
 
-  // Constructor(s)
-  AST_InterfaceFwd ();
   AST_InterfaceFwd (AST_Interface *dummy,
                     UTL_ScopedName *n,
                     UTL_StrList *p);
 
+  // Destructor.
   virtual ~AST_InterfaceFwd (void);
 
-  // Data Accessors
-  AST_Interface *full_definition();
-  void set_full_definition(AST_Interface *nfd);
+  // Data Accessors.
+  AST_Interface *full_definition (void);
+
+  void set_full_definition (AST_Interface *nfd);
 
-  virtual idl_bool is_local ();
-  virtual idl_bool is_valuetype ();
-  virtual idl_bool is_abstract_valuetype ();
-  virtual void set_abstract_valuetype ();
+  virtual idl_bool is_local (void);
+  virtual idl_bool is_valuetype (void);
+  virtual idl_bool is_abstract_valuetype (void);
+  virtual void set_abstract_valuetype (void);
 
-  // Narrowing
+  // Narrowing.
   DEF_NARROW_METHODS1(AST_InterfaceFwd, AST_Type);
   DEF_NARROW_FROM_DECL(AST_InterfaceFwd);
 
-  // AST Dumping
-  virtual void          dump(ostream &);
+  // AST Dumping.
+  virtual void dump(ostream &);
 
 private:
-  // Data
-  AST_Interface         *pd_full_definition;    // The interface this is a
-                                                // forward declaration of
+  // Data.
+
+  AST_Interface *pd_full_definition;
+  // The interface this is a forward declaration of
 };
 
 #endif           // _AST_INTERFACE_FWD_AST_INTERFACE_FWD_HH
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
index 24922866297..7b8959b053c 100644
--- a/TAO/TAO_IDL/include/ast_module.h
+++ b/TAO/TAO_IDL/include/ast_module.h
@@ -62,53 +62,48 @@ NOTE:
 SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
 trademarks or registered trademarks of Sun Microsystems, Inc.
 
- */
+*/
 
 #ifndef _AST_MODULE_AST_MODULE_HH
 #define _AST_MODULE_AST_MODULE_HH
 
-// Representation of module
+// Representation of module.
 //
 // NOTE: add(AST_EnumValue *) is defined here because enums can
 // be defined manifest locally; the constants defined in these
 // enums are inserted in the enclosing scope.
 
-/*
-** DEPENDENCIES: ast_decl.hh, utl_scope.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
-
 class TAO_IDL_FE_Export AST_Module : public virtual AST_Decl, 
                                      public virtual UTL_Scope
 {
 public:
-  // Operations
+  // Operations.
 
-  // Constructor(s)
-  AST_Module ();
+  // Constructor(s) and destructor.
+  AST_Module (void);
 
   AST_Module (UTL_ScopedName *n, 
               UTL_StrList *p);
 
   virtual ~AST_Module (void);
 
-  // Narrowing
+  // Narrowing.
   DEF_NARROW_METHODS2(AST_Module, AST_Decl, UTL_Scope);
   DEF_NARROW_FROM_DECL(AST_Module);
   DEF_NARROW_FROM_SCOPE(AST_Module);
 
-  // AST Dumping
-  virtual void                  dump(ostream &o);
+  // AST Dumping.
+  virtual void dump (ostream &o);
 
-  // involved in OBV_ namespace generation
-  void set_has_nested_valuetype ();
-  idl_bool has_nested_valuetype ();
+  // Involved in OBV_ namespace generation.
+  void set_has_nested_valuetype (void);
+  idl_bool has_nested_valuetype (void);
 
   // Allows adding an interface to a later point
   // The interface i is inserted after interface ix, if
   // ix is not null.
-  int be_add_interface (AST_Interface *i, AST_Interface *ix = 0);
+  int be_add_interface (AST_Interface *i, 
+                        AST_Interface *ix = 0);
 
   // The first time 'module CORBA' is seen, add predefined types
   // TypeCode, TCKind and ValueBase to its scope.
@@ -127,24 +122,34 @@ public:
   virtual void destroy (void);
 
 private:
-  friend void fe_populate(AST_Module *m);
-  friend int tao_yyparse();
+  friend void fe_populate (AST_Module *m);
+  friend int tao_yyparse (void);
 
   // Scope Management Protocol
 
-  virtual AST_PredefinedType    *fe_add_predefined_type(AST_PredefinedType *t);
-  virtual AST_Module            *fe_add_module(AST_Module               *m);
-  // Add the current interface i before interface ix
-  virtual AST_Interface         *fe_add_interface(AST_Interface         *i);
-  virtual AST_InterfaceFwd      *fe_add_interface_fwd(AST_InterfaceFwd  *i);
-  virtual AST_Constant          *fe_add_constant(AST_Constant           *c);
-  virtual AST_Exception         *fe_add_exception(AST_Exception         *e);
-  virtual AST_Union             *fe_add_union(AST_Union                 *u);
-  virtual AST_Structure         *fe_add_structure(AST_Structure         *s);
-  virtual AST_Enum              *fe_add_enum(AST_Enum                   *e);
-  virtual AST_EnumVal           *fe_add_enum_val(AST_EnumVal            *v);
-  virtual AST_Typedef           *fe_add_typedef(AST_Typedef             *t);
-  virtual AST_Native            *fe_add_native (AST_Native              *n);
+  virtual AST_PredefinedType *fe_add_predefined_type (AST_PredefinedType *t);
+
+  virtual AST_Module *fe_add_module (AST_Module *m);
+
+  virtual AST_Interface  *fe_add_interface (AST_Interface *i);
+
+  virtual AST_InterfaceFwd *fe_add_interface_fwd (AST_InterfaceFwd *i);
+
+  virtual AST_Constant *fe_add_constant (AST_Constant *c);
+
+  virtual AST_Exception *fe_add_exception (AST_Exception *e);
+
+  virtual AST_Union *fe_add_union (AST_Union *u);
+
+  virtual AST_Structure *fe_add_structure (AST_Structure *s);
+
+  virtual AST_Enum *fe_add_enum (AST_Enum  *e);
+
+  virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v);
+
+  virtual AST_Typedef *fe_add_typedef (AST_Typedef *t);
+
+  virtual AST_Native *fe_add_native (AST_Native  *n);
 
   idl_bool pd_has_nested_valuetype;
 
diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h
index f1ae461def4..efd5d54f112 100644
--- a/TAO/TAO_IDL/include/ast_native.h
+++ b/TAO/TAO_IDL/include/ast_native.h
@@ -4,36 +4,31 @@
 #ifndef _AST_NATIVE_H_
 #define _AST_NATIVE_H_
 
-// Representation of "native" IDL type added by the POA spec
-//
-/*
-** DEPENDENCIES: ast_decl.h
-**
-** USE: Included from ast.h
-*/
+// Representation of "native" IDL type added by the POA spec.
 
 class TAO_IDL_FE_Export AST_Native : public virtual AST_Type
 {
 public:
-  // =Operations
+  // Operations.
+
+  // Constructor(s).
 
-  // Constructor(s)
   AST_Native (void);
-  // default constructor
+  // Default constructor.
 
   AST_Native (UTL_ScopedName *n, 
               UTL_StrList *p);
-  // constructor that initializes its scoped name
+  // Constructor that initializes the scoped name.
 
   virtual ~AST_Native (void);
-  // destructor
+  // Destructor.
 
-  // Narrowing
+  // Narrowing.
   DEF_NARROW_METHODS1(AST_Native, AST_Type);
   DEF_NARROW_FROM_DECL(AST_Native);
 
-  // AST Dumping
-  virtual void          dump(ostream &o);
+  // AST Dumping.
+  virtual void dump(ostream &o);
 };
 
 #endif /* AST_NATIVE_H */
diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h
index a4f3e485803..5376afa638c 100644
--- a/TAO/TAO_IDL/include/ast_root.h
+++ b/TAO/TAO_IDL/include/ast_root.h
@@ -62,49 +62,43 @@ NOTE:
 SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
 trademarks or registered trademarks of Sun Microsystems, Inc.
 
- */
+*/
 
 #ifndef _AST_ROOT_AST_ROOT_HH
 #define _AST_ROOT_AST_ROOT_HH
 
-// Representation of root of AST
-
-/*
-** DEPENDENCIES: ast_module.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
+// Representation of root of AST.
 
 class TAO_IDL_FE_Export AST_Root : public virtual AST_Module
 {
 public:
-  // Operations
+  // Operations.
 
-  // Constructor(s)
-  AST_Root ();
+  // Constructor(s) and destructor.
+  AST_Root (void);
 
   AST_Root (UTL_ScopedName *n, 
             UTL_StrList *p);
 
   virtual ~AST_Root (void);
 
-  // Narrowing
+  // Narrowing.
   DEF_NARROW_METHODS1(AST_Root, AST_Module);
   DEF_NARROW_FROM_DECL(AST_Root);
   DEF_NARROW_FROM_SCOPE(AST_Root);
 
-  // AST Dumping
-  virtual void                  dump(ostream &o);
+  // AST Dumping.
+  virtual void dump (ostream &o);
 
 private:
   friend class FE_Declarator;
-  friend int tao_yyparse();
-  // Add protocol
+  friend int tao_yyparse (void);
 
-  virtual AST_Sequence          *fe_add_sequence(AST_Sequence           *s);
-  virtual AST_String            *fe_add_string(AST_String               *s);
-  virtual AST_Array             *fe_add_array(AST_Array                 *a);
+  // Add protocol.
 
+  virtual AST_Sequence *fe_add_sequence (AST_Sequence *s);
+  virtual AST_String *fe_add_string (AST_String *s);
+  virtual AST_Array *fe_add_array (AST_Array *a);
 };
 
 #endif           // _AST_ROOT_AST_ROOT_HH
diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h
index d856c917244..4b7c475ee28 100644
--- a/TAO/TAO_IDL/include/ast_string.h
+++ b/TAO/TAO_IDL/include/ast_string.h
@@ -62,28 +62,21 @@ NOTE:
 SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
 trademarks or registered trademarks of Sun Microsystems, Inc.
 
- */
+*/
 
 #ifndef _AST_STRING_AST_STRING_HH
 #define _AST_STRING_AST_STRING_HH
 
-// Representation of string declaration
-//
-// A string type is represented by a maximum size
-
-/*
-** DEPENDENCIES: ast_concrete_type.hh, ast_decl.hh, ast_expression.hh
-**
-** USE: Included from ast.hh
-*/
+// Representation of string declaration.
+// A string type is represented by a maximum size.
 
 class TAO_IDL_FE_Export AST_String : public virtual AST_ConcreteType
 {
 public:
-  // Operations
+  // Operations.
 
-  // Constructor(s)
-  AST_String ();
+  // Constructor(s) and destructor
+  AST_String (void);
 
   AST_String (AST_Expression *max_size);
 
@@ -92,21 +85,25 @@ public:
 
   virtual ~AST_String (void);
 
-  // Data Accessors
-  AST_Expression *max_size();
-  long           width();
+  // Data Accessors.
+  AST_Expression *max_size (void);
+  long width (void);
 
-  // Narrowing
+  // Narrowing.
   DEF_NARROW_METHODS1(AST_String, AST_ConcreteType);
   DEF_NARROW_FROM_DECL(AST_String);
 
-  // AST Dumping
-  virtual void                  dump(ostream &o);
+  // AST Dumping.
+  virtual void dump (ostream &o);
 
 private:
-  // Data
-  AST_Expression                *pd_max_size;   // String maximum size
-  long                          pd_width;       // Width of string
+  // Data.
+
+  AST_Expression *pd_max_size;
+  // String maximum size.
+
+  long pd_width;
+  // Width of string.
 };
 
 #endif           // _AST_STRING_AST_STRING_HH
diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h
index 1d38ab40695..ef3d6d396ce 100644
--- a/TAO/TAO_IDL/include/ast_typedef.h
+++ b/TAO/TAO_IDL/include/ast_typedef.h
@@ -62,28 +62,21 @@ NOTE:
 SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
 trademarks or registered trademarks of Sun Microsystems, Inc.
 
- */
+*/
 
 #ifndef _AST_TYPEDEF_AST_TYPEDEF_HH
 #define _AST_TYPEDEF_AST_TYPEDEF_HH
 
-// Representation of typedef declaration
-//
-// A typedef declaration is a renaming of a base type
-
-/*
-** DEPENDENCIES: ast_decl.hh, ast_type.hh, utl_scoped_name.hh, utl_strlist.hh
-**
-** USE: Included from ast.hh
-*/
+// Representation of typedef declaration.
+// A typedef declaration is a renaming of a base type.
 
 class TAO_IDL_FE_Export AST_Typedef : public virtual AST_Type
 {
 public:
-  // Operations
+  // Operations.
 
-  // Constructor(s)
-  AST_Typedef ();
+  // Constructor(s) and destructor.
+  AST_Typedef (void);
 
   AST_Typedef (AST_Type *base_type,
                UTL_ScopedName *n,
@@ -93,19 +86,21 @@ public:
 
   virtual ~AST_Typedef (void);
 
-  // Data Accessors
-  AST_Type *base_type();
+  // Data Accessors.
+  AST_Type *base_type (void);
 
-  // Narrowing
+  // Narrowing.
   DEF_NARROW_METHODS1(AST_Typedef, AST_Type);
   DEF_NARROW_FROM_DECL(AST_Typedef);
 
-  // AST Dumping
-  virtual void          dump(ostream &o);
+  // AST Dumping.
+  virtual void dump (ostream &o);
 
 private:
-  // Data
-  AST_Type              *pd_base_type;  // typedef base type
+  // Data.
+
+  AST_Type *pd_base_type;
+  // Typedef base type.
 };
 
 #endif           // _AST_TYPEDEF_AST_TYPEDEF_HH
diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h
index 4b56763b1af..46956cd97c8 100644
--- a/TAO/TAO_IDL/include/ast_union_branch.h
+++ b/TAO/TAO_IDL/include/ast_union_branch.h
@@ -62,29 +62,21 @@ NOTE:
 SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
 trademarks or registered trademarks of Sun Microsystems, Inc.
 
- */
+*/
 
 #ifndef _AST_UNION_BRANCH_AST_UNION_BRAN_HH
 #define _AST_UNION_BRANCH_AST_UNION_BRAN_HH
 
-// Representation of union branch declaration:
-//
-// A branch of a union is a field with a label
-
-/*
-** DEPEndencies: ast_field.hh, ast_union_label.hh, ast_type.hh,
-**               utl_scoped_name.hh, utl_strlist.h, ast_decl.h
-**
-** USE: Included from ast.hh
-*/
+// Representation of union branch declaration.
+// A branch of a union is a field with a label.
 
 class TAO_IDL_FE_Export AST_UnionBranch : public virtual AST_Field
 {
 public:
-  // Operations
+  // Operations.
 
-  // Constructor(s)
-  AST_UnionBranch ();
+  // Constructor(s) and destructor.
+  AST_UnionBranch (void);
 
   AST_UnionBranch (UTL_LabelList *ll,
                    AST_Type *ft,
@@ -93,22 +85,23 @@ public:
 
   virtual ~AST_UnionBranch (void);
 
-  // Data Accessors
+  // Data Accessors.
   AST_UnionLabel *label (unsigned long index = 0);
   
   unsigned long label_list_length (void);
 
-  // Narrowing
+  // Narrowing.
   DEF_NARROW_METHODS1(AST_UnionBranch, AST_Field);
   DEF_NARROW_FROM_DECL(AST_UnionBranch);
 
-  // AST Dumping
-  virtual void                  dump(ostream &o);
+  // AST Dumping.
+  virtual void dump (ostream &o);
 
 private:
-  // Data
-  UTL_LabelList                 *pd_ll;   // list of labels
+  // Data.
 
+  UTL_LabelList *pd_ll;
+  // list of labels.
 };
 
 #endif           // _AST_UNION_BRANCH_AST_UNION_BRAN_HH
diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h
index 84fa692aa93..21971c596a5 100644
--- a/TAO/TAO_IDL/include/ast_union_label.h
+++ b/TAO/TAO_IDL/include/ast_union_label.h
@@ -62,52 +62,49 @@ NOTE:
 SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
 trademarks or registered trademarks of Sun Microsystems, Inc.
 
- */
+*/
 
 #ifndef _AST_UNION_LABEL_AST_UNION_LABEL_HH
 #define _AST_UNION_LABEL_AST_UNION_LABEL_HH
 
-// AST_UnionLabel.h
-//
-// Defines labels for unions
-
-/*
-** DEPENDENCIES: ast_expression.hh
-**
-** USE: included from ast.hh
-*/
+// Defines labels for unions.
 
 class TAO_IDL_FE_Export AST_UnionLabel
 {
 public:
-  // Define kind of label
-  enum UnionLabel {
-        UL_default              // Label is "default"
-      , UL_label                // Regular label
-  };
+  // Define kind of label.
+  enum UnionLabel 
+    {
+        UL_default              // Label is "default".
+      , UL_label                // Regular label.
+    };
 
-  // Operations
+  // Operations.
 
-  // Constructor(s)
-  AST_UnionLabel ();
+  // Constructor(s) and destructor.
+  AST_UnionLabel (void);
 
   AST_UnionLabel (UnionLabel lk, 
                   AST_Expression *lv);
 
   virtual ~AST_UnionLabel (void);
 
-  // Data Accessors
-  UnionLabel label_kind();
-  AST_Expression *label_val();
+  // Data Accessors.
+  UnionLabel label_kind (void);
+
+  AST_Expression *label_val (void);
 
-  // AST Dumping
-  virtual void                  dump(ostream &o);
+  // AST Dumping.
+  virtual void dump (ostream &o);
 
 private:
-  // Data
-  UnionLabel                    pd_label_kind;  // Label kind
-  AST_Expression                *pd_label_val;  // Label expression
+  // Data.
+
+  UnionLabel pd_label_kind;
+  // Label kind.
 
+  AST_Expression *pd_label_val;
+  // Label expression.
 };
 
 #endif           // _AST_UNION_LABEL_AST_UNION_LABEL_HH