Changeset 13005 for trunk

Timestamp:

03/07/12 18:47:04 (13 years ago)

Author:

tbretz

Message:

Added some debug options; moved the PrintHelp at a better position so that exceptions wouldn't effect the output.

Location:

trunk/FACT++/src

Files:

• Configuration.cc (modified) (19 diffs)
• Configuration.h (modified) (1 diff)

trunk/FACT++/src/Configuration.cc

@@ -989 +989 @@
 //!    - proper handling and error messages if files not available
 //
-const po::variables_map &Configuration::Parse(int argc, const char **argv)
+const po::variables_map &Configuration::Parse(int argc, const char **argv, const std::function<void()> &PrintHelp)
 {
     const po::positional_options_description &opt_positional = fArgumentPositions;
 
     // ------------------------ (0) --------------------------
+#ifdef DEBUG
+    cout << "--0--" << endl;
+#endif
 
     po::options_description opt_commandline;
@@ -1009 +1012 @@
 
     // ------------------------ (1) --------------------------
+#ifdef DEBUG
+    cout << "--1--" << endl;
+#endif
 
     fPriorityFile = "";
@@ -1015 +1021 @@
 
     // ------------------------ (2) --------------------------
+#ifdef DEBUG
+    cout << "--2--" << endl;
+#endif
 
     po::command_line_parser parser(argc, const_cast<char**>(argv));
@@ -1025 +1034 @@
 
     // ------------------------ (3) --------------------------
+#ifdef DEBUG
+    cout << "--3--" << endl;
+#endif
 
     po::variables_map getfiles;
@@ -1049 +1061 @@
         cout << fOptionsDatabase[kVisible] << endl;
 
+
+
     // ------------------------ (4) --------------------------
+#ifdef DEBUG
+    cout << "--4--" << endl;
+#endif
 
     if (getfiles.count("print") || getfiles.count("print-all"))
@@ -1058 +1075 @@
     }
 
+    if (getfiles.count("help")     || getfiles.count("help-config") ||
+        getfiles.count("help-env") || getfiles.count("help-database"))
+    {
+        if (PrintHelp)
+            PrintHelp();
+    }
+
     // ------------------------ (5) --------------------------
+#ifdef DEBUG
+    cout << "--5--" << endl;
+#endif
 
     const boost::filesystem::path path(GetName());
@@ -1073 +1100 @@
 
     // ------------------------ (6) --------------------------
+#ifdef DEBUG
+    cout << "--6--" << endl;
+#endif
 
     // Get default file from command line
@@ -1093 +1123 @@
 
     // ------------------------ (7) --------------------------
+#ifdef DEBUG
+    cout << "--7--" << endl;
+#endif
 
     if (getfiles.count("print-default") || getfiles.count("print-all"))
@@ -1109 +1142 @@
 
     // ------------------------ (8) --------------------------
+#ifdef DEBUG
+    cout << "--8--" << endl;
+#endif
 
     // Get priority from commandline(1), defaultfile(2)
@@ -1124 +1160 @@
 
     // ------------------------ (9) --------------------------
+#ifdef DEBUG
+    cout << "--9--" << endl;
+#endif
 
     if (getfiles.count("print-config") || getfiles.count("print-all"))
@@ -1138 +1177 @@
 
     // ------------------------ (10) -------------------------
+#ifdef DEBUG
+    cout << "--10--" << endl;
+#endif
 
     po::variables_map getdatabase;
@@ -1161 +1203 @@
 #endif
     // ------------------------ (11) -------------------------
+#ifdef DEBUG
+    cout << "--11--" << endl;
+#endif
 
     if (getfiles.count("print-database") || getfiles.count("print-all"))
@@ -1175 +1220 @@
 
     // ------------------------ (12) -------------------------
+#ifdef DEBUG
+    cout << "--12--" << endl;
+#endif
 
     const po::parsed_options parsed_environment = po::parse_environment(opt_environment, fNameMapper);
 
     // ------------------------ (13) -------------------------
+#ifdef DEBUG
+    cout << "--13--" << endl;
+#endif
 
     if (getfiles.count("print-environment"))
@@ -1188 +1239 @@
 
     // ------------------------ (14) -------------------------
+#ifdef DEBUG
+    cout << "--14--" << endl;
+#endif
+
     po::variables_map result;
     po::store(parsed_commandline,  result);
@@ -1200 +1255 @@
 
     // ------------------------ (15) -------------------------
+#ifdef DEBUG
+    cout << "--15--" << endl;
+#endif
 
     const vector<string> unknown0 = collect_unrecognized(parsed_globalfile.options,   po::exclude_positional);
@@ -1215 +1273 @@
 
     // ------------------------ (16) -------------------------
+#ifdef DEBUG
+    cout << "--16--" << endl;
+#endif
 
     CreateWildcardOptions();
 
     // ------------------------ (17) -------------------------
+#ifdef DEBUG
+    cout << "--17--" << endl;
+#endif
 
     if (result.count("print-options"))
@@ -1229 +1293 @@
         PrintUnknown();
 
+#ifdef DEBUG
+    cout << "------" << endl;
+#endif
+
     return fVariables;
 }
@@ -1236 +1304 @@
     try
     {
-        Parse(argc, argv);
+        Parse(argc, argv, PrintHelp);
     }
 #if BOOST_VERSION > 104000
@@ -1251 +1319 @@
     }
 
-    if (HasVersion() || HasPrint())
-        return false;
-
-    if (HasHelp())
-    {
-        if (PrintHelp)
-            PrintHelp();
-        return false;
-    }
-
-    return true;
+    return !HasVersion() && !HasPrint() && !HasHelp();
 }
 

trunk/FACT++/src/Configuration.h

@@ -124 +124 @@
 
     // Process command line arguments
-    const po::variables_map &Parse(int argc, const char **argv);
+    const po::variables_map &Parse(int argc, const char **argv, const std::function<void()> &func=std::function<void()>());
     bool DoParse(int argc, const char **argv, const std::function<void()> &func=std::function<void()>());