ChangeLogTag: Mon Jul 12 08:26:24 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>

5 files changed, 102 insertions, 58 deletions

diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index 8990208136a..ce08954f346 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -25,6 +25,7 @@ project(TAO_IFR_BE) : taolib, tao_output, conv_lib, ifr_client, avoids_minimum_c
     be_global.cpp
     be_init.cpp
     be_produce.cpp
+    be_util.cpp
     ifr_adding_visitor.cpp
     ifr_adding_visitor_exception.cpp
     ifr_adding_visitor_operation.cpp
diff --git a/TAO/orbsvcs/IFR_Service/be_global.cpp b/TAO/orbsvcs/IFR_Service/be_global.cpp
index 08367331070..a1cf1de6e9b 100644
--- a/TAO/orbsvcs/IFR_Service/be_global.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_global.cpp
@@ -22,10 +22,6 @@
 #include "global_extern.h"
 #include "idl_defines.h"
 
-ACE_RCSID (IFR_Service,
-           be_global,
-           "$Id$")
-
 TAO_IFR_BE_Export BE_GlobalData *be_global = 0;
 
 BE_GlobalData::BE_GlobalData (void)
@@ -202,45 +198,3 @@ BE_GlobalData::parse_args (long &i, char **av)
     }
 }
 
-// Does nothing in this backend.
-void
-BE_GlobalData::prep_be_arg (char *)
-{
-}
-
-// Does nothing in this backend.
-void
-BE_GlobalData::arg_post_proc (void)
-{
-}
-
-void
-BE_GlobalData::usage (void) const
-{
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -L\t\t\tEnable locking at the IDL file level\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -r\t\t\tRemove contents of IDL file(s) from repository\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Si\t\t\tSuppress processing of included IDL files\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -T\t\t\tAllow duplicate typedefs in IDL files\n")
-    ));
-}
-
-AST_Generator *
-BE_GlobalData::generator_init (void)
-{
-  AST_Generator *gen = 0;
-  ACE_NEW_RETURN (gen,
-                  AST_Generator,
-                  0);
-  return gen;
-}
diff --git a/TAO/orbsvcs/IFR_Service/be_global.h b/TAO/orbsvcs/IFR_Service/be_global.h
index d0be5140861..d0c5fb389c0 100644
--- a/TAO/orbsvcs/IFR_Service/be_global.h
+++ b/TAO/orbsvcs/IFR_Service/be_global.h
@@ -87,18 +87,6 @@ public:
   void parse_args (long &i, char **av);
   // Parse args that affect the backend.
 
-  void prep_be_arg (char *s);
-  // Special BE arg call factored out of DRV_args.
-
-  void arg_post_proc (void);
-  // Checks made after parsing args.
-
-  void usage (void) const;
-  // Display usage of BE-specific options.
-
-  AST_Generator *generator_init (void);
-  // Create an AST node generator.
-
 private:
   bool removing_;
   // Are we removing IR objects from the repository?
diff --git a/TAO/orbsvcs/IFR_Service/be_util.cpp b/TAO/orbsvcs/IFR_Service/be_util.cpp
new file mode 100644
index 00000000000..b1feb7ce332
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/be_util.cpp
@@ -0,0 +1,57 @@
+
+//=============================================================================
+/**
+ *  @file    be_util.cpp
+ *
+ *  $Id$
+ *
+ *  Static helper methods used by multiple visitors.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+#include "be_util.h"
+#include "be_extern.h"
+
+#include "ast_generator.h"
+
+#include "ace/Log_Msg.h"
+
+// Prepare an argument for a BE.
+void
+be_util::prep_be_arg (char *)
+{
+}
+
+void
+be_util::arg_post_proc (void)
+{
+}
+
+void
+be_util::usage (void)
+{
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -o <dir>\t\tOutput directory for the generated file.")
+      ACE_TEXT (" Default is current directory\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -e\t\t\tGenerate just an include of original IDL file")
+      ACE_TEXT (" if no IDL3 declarations are found\n")
+    ));
+}
+
+AST_Generator *
+be_util::generator_init (void)
+{
+  AST_Generator *gen = 0;
+  ACE_NEW_RETURN (gen,
+                  AST_Generator,
+                  0);
+  return gen;
+}
+
diff --git a/TAO/orbsvcs/IFR_Service/be_util.h b/TAO/orbsvcs/IFR_Service/be_util.h
new file mode 100644
index 00000000000..a2038a283a9
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/be_util.h
@@ -0,0 +1,44 @@
+/* -*- c++ -*- */
+
+//=============================================================================
+/**
+ *  @file    be_util.h
+ *
+ *  $Id$
+ *
+ *  Static helper methods used by multiple visitors.
+ *
+ *
+ *  @author Jeff Parsons
+ */
+//=============================================================================
+
+#ifndef TAO_BE_UTIL_H
+#define TAO_BE_UTIL_H
+
+#include "TAO_IFR_BE_Export.h"
+
+class AST_Generator;
+
+class be_util
+{
+public:
+  /// Special BE arg call factored out of DRV_args.
+  static TAO_IFR_BE_Export void
+  prep_be_arg (char *s);
+
+  /// Checks made after parsing args.
+  static TAO_IFR_BE_Export void
+  arg_post_proc (void);
+
+  /// Display usage of BE-specific options.
+  static TAO_IFR_BE_Export void
+  usage (void);
+
+  /// Create an AST node generator.
+  static TAO_IFR_BE_Export AST_Generator *
+  generator_init (void);
+};
+
+#endif // if !defined
+