tao_idl: Move variables to conventional place

1 files changed, 142 insertions, 137 deletions

diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index 89842d5a77e..e492620e7ce 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -300,6 +300,9 @@ public:
     , PS_AnnotationDeclSeen
   };
 
+  /**
+   * Choices for how to react to unkown annotations
+   */
   enum Unknown_Annotations {
     UNKNOWN_ANNOTATIONS_WARN_ONCE,
     UNKNOWN_ANNOTATIONS_WARN_ALL,
@@ -307,143 +310,6 @@ public:
     UNKNOWN_ANNOTATIONS_IGNORE
   };
 
-  // flags for types of declarations seen while parsing.
-  bool abstract_iface_seen_;
-  bool abstractbase_seen_;
-  bool aggregate_seen_;
-  bool ambiguous_type_seen_;
-  bool any_arg_seen_;
-  bool any_seen_;
-  bool any_seq_seen_;
-  bool array_seen_;
-  bool array_seq_seen_;
-  bool base_object_seen_;
-  bool basic_type_seen_;
-  bool bd_string_seen_;
-  bool boolean_seq_seen_;
-  bool char_seq_seen_;
-  bool component_seen_;
-  bool connector_seen_;
-  bool double_seq_seen_;
-  bool enum_seen_;
-  bool exception_seen_;
-  bool fixed_array_decl_seen_;
-  bool fixed_size_decl_seen_;
-  bool float_seq_seen_;
-  bool fwd_iface_seen_;
-  bool fwd_valuetype_seen_;
-  bool iface_seq_seen_;
-  bool interface_seen_;
-  bool local_iface_seen_;
-  bool long_seq_seen_;
-  bool longdouble_seq_seen_;
-  bool longlong_seq_seen_;
-  bool non_local_fwd_iface_seen_;
-  bool non_local_iface_seen_;
-  bool non_local_op_seen_;
-  bool object_arg_seen_;
-  bool octet_seq_seen_;
-  bool operation_seen_;
-  bool pseudo_seq_seen_;
-  bool recursive_type_seen_;
-  bool seq_seen_;
-  bool short_seq_seen_;
-  bool special_basic_decl_seen_;
-  bool string_seen_;
-  bool string_member_seen_;
-  bool string_seq_seen_;
-  bool typecode_seen_;
-  bool ub_string_seen_;
-  bool ulong_seq_seen_;
-  bool ulonglong_seq_seen_;
-  bool union_seen_;
-  bool ushort_seq_seen_;
-  bool valuebase_seen_;
-  bool valuefactory_seen_;
-  bool valuetype_seen_;
-  bool var_array_decl_seen_;
-  bool var_size_decl_seen_;
-  bool vt_seq_seen_;
-  bool wchar_seq_seen_;
-  bool wstring_seq_seen_;
-  bool dds_connector_seen_;
-  bool ami_connector_seen_;
-
-  // flag to force generation of skeleton includes (see bug #2419).
-  bool need_skeleton_includes_;
-
-  /**
-   * Version of IDL to enforce
-   */
-  IdlVersion idl_version_;
-
-  /**
-   * Perform the compilation process right up until invoking the backend.
-   * In other words just check the syntax of the input files, do not create
-   * any output.
-   */
-  bool syntax_only_;
-
-  /**
-   * Exit when finished processing cli arguments
-   * Default is false.
-   */
-  bool parse_args_exit_;
-
-  /**
-   * If parse_args_exit_ is true, this is the program status to return from
-   * main.
-   * Default is 0.
-   */
-  int parse_args_exit_status_;
-
-  /**
-   * Print command line argument help message when finished processing
-   * cli arguments.
-   */
-  bool print_help_;
-
-  /**
-   * Print compiler version when finished processing cli arguments.
-   */
-  bool print_version_;
-
-  /**
-   * If true, we are inside the eval() function
-   */
-  bool in_eval_;
-
-  /**
-   * Dump constructs defined using eval() if true.
-   */
-  bool dump_builtins_;
-
-  /**
-   * If true, Dump only the IDL defined using eval() and exit using
-   * ignore_files_
-   */
-  bool just_dump_builtins_;
-
-  /**
-   * Exit right before parsing input files.
-   */
-  bool ignore_files_;
-
-  /**
-   * If true, silently ignore lookup errors.
-   */
-  bool ignore_lookup_errors_;
-
-  /**
-   * Reaction to unknown annotations
-   */
-  Unknown_Annotations unknown_annotations_;
-
-  /**
-   * Set of the local names of unkown annotations already seen
-   */
-  ACE_Unbounded_Set<Identifier> unknown_annotations_seen_;
-
   IDL_GlobalData (void);
   ~IDL_GlobalData (void);
 
@@ -876,6 +742,145 @@ public:
    */
   void dump_ast ();
 
+  /// flags for types of declarations seen while parsing.
+  ///{
+  bool abstract_iface_seen_;
+  bool abstractbase_seen_;
+  bool aggregate_seen_;
+  bool ambiguous_type_seen_;
+  bool any_arg_seen_;
+  bool any_seen_;
+  bool any_seq_seen_;
+  bool array_seen_;
+  bool array_seq_seen_;
+  bool base_object_seen_;
+  bool basic_type_seen_;
+  bool bd_string_seen_;
+  bool boolean_seq_seen_;
+  bool char_seq_seen_;
+  bool component_seen_;
+  bool connector_seen_;
+  bool double_seq_seen_;
+  bool enum_seen_;
+  bool exception_seen_;
+  bool fixed_array_decl_seen_;
+  bool fixed_size_decl_seen_;
+  bool float_seq_seen_;
+  bool fwd_iface_seen_;
+  bool fwd_valuetype_seen_;
+  bool iface_seq_seen_;
+  bool interface_seen_;
+  bool local_iface_seen_;
+  bool long_seq_seen_;
+  bool longdouble_seq_seen_;
+  bool longlong_seq_seen_;
+  bool non_local_fwd_iface_seen_;
+  bool non_local_iface_seen_;
+  bool non_local_op_seen_;
+  bool object_arg_seen_;
+  bool octet_seq_seen_;
+  bool operation_seen_;
+  bool pseudo_seq_seen_;
+  bool recursive_type_seen_;
+  bool seq_seen_;
+  bool short_seq_seen_;
+  bool special_basic_decl_seen_;
+  bool string_seen_;
+  bool string_member_seen_;
+  bool string_seq_seen_;
+  bool typecode_seen_;
+  bool ub_string_seen_;
+  bool ulong_seq_seen_;
+  bool ulonglong_seq_seen_;
+  bool union_seen_;
+  bool ushort_seq_seen_;
+  bool valuebase_seen_;
+  bool valuefactory_seen_;
+  bool valuetype_seen_;
+  bool var_array_decl_seen_;
+  bool var_size_decl_seen_;
+  bool vt_seq_seen_;
+  bool wchar_seq_seen_;
+  bool wstring_seq_seen_;
+  bool dds_connector_seen_;
+  bool ami_connector_seen_;
+  ///}
+
+  /// flag to force generation of skeleton includes (see bug #2419).
+  bool need_skeleton_includes_;
+
+  /**
+   * Version of IDL to enforce
+   */
+  IdlVersion idl_version_;
+
+  /**
+   * Perform the compilation process right up until invoking the backend.
+   * In other words just check the syntax of the input files, do not create
+   * any output.
+   */
+  bool syntax_only_;
+
+  /**
+   * Exit when finished processing cli arguments
+   * Default is false.
+   */
+  bool parse_args_exit_;
+
+  /**
+   * If parse_args_exit_ is true, this is the program status to return from
+   * main.
+   * Default is 0.
+   */
+  int parse_args_exit_status_;
+
+  /**
+   * Print command line argument help message when finished processing
+   * cli arguments.
+   */
+  bool print_help_;
+
+  /**
+   * Print compiler version when finished processing cli arguments.
+   */
+  bool print_version_;
+
+  /**
+   * If true, we are inside the eval() function
+   */
+  bool in_eval_;
+
+  /**
+   * Dump constructs defined using eval() if true.
+   */
+  bool dump_builtins_;
+
+  /**
+   * If true, Dump only the IDL defined using eval() and exit using
+   * ignore_files_
+   */
+  bool just_dump_builtins_;
+
+  /**
+   * Exit right before parsing input files.
+   */
+  bool ignore_files_;
+
+  /**
+   * If true, silently ignore lookup errors.
+   */
+  bool ignore_lookup_errors_;
+
+  /**
+   * Reaction to unknown annotations
+   */
+  Unknown_Annotations unknown_annotations_;
+
+  /**
+   * Set of the local names of unkown annotations already seen
+   */
+  ACE_Unbounded_Set<Identifier> unknown_annotations_seen_;
+
 private:
   // Data
   UTL_ScopeStack             pd_scopes;              // Store scopes stack