Changeset 11483 for trunk/FACT++/src/Configuration.cc

Timestamp:

07/20/11 10:27:17 (13 years ago)

Author:

tbretz

Message:

Added a registry for wildcarded options to detect unaccessed options; for this EvalConfiguration(const Configuration&) has been changed to EvalOptions(Configuration&)

File:

• trunk/FACT++/src/Configuration.cc (modified) (7 diffs)

trunk/FACT++/src/Configuration.cc

@@ -528 +528 @@
         ("print-unknown",       "Print unrecognized options.")
         ("print-options",       "Print options as passed to program.")
+        ("print-wildcards",     "Print all options registered with wildcards.")
         ("dont-check",          "Do not check validity of options from files and database.")
         ("dont-check-files",    "Do not check validity of options from files.")
@@ -591 +592 @@
         //for (int j=0; j<options[i].value.size(); j++)
         //    cout << "\t = " << options[i].value[j];
-
-        //cout << "/" << options[i].position_key;
         //cout << "/" << options[i].original_tokens[0];
-        //cout << "/" << options[i].unregistered << endl;
+
+        ostringstream com;
+
+        if (opt.position_key>=0)
+            com << " [position=" << opt.position_key << "]";
         if (opt.unregistered)
-            cout << "   # option unknown";
+            com << " [unregistered]";
+
+        if (!com.str().empty())
+            cout << "  # " << com.str();
+
         cout << endl;
     }
@@ -963 +970 @@
 //!         options from the default configuration-file and options
 //!         from the environment.
-//!  - (15) Finally all options which were found and flagged as unrecognized,
+//!  - (15) Find all options which were found and flagged as unrecognized,
 //!         because they are not in the user-defined list of described
 //!         options, are collected and stored in the corresponding
 //!         data-members.
-//!  - (16) Before the function returns it check for \b --print-options
+//!  - (16) Find all options which where registered with wildcards and
+//!         store the list in fWildcardOptions.
+//!  - (17) Before the function returns it check for \b --print-options
 //!         and \b --print-unknown and performs the corresponding actions.
 //!
@@ -1058 +1067 @@
     const string globalfile = path.parent_path().string()+"/fact++.rc";
 
-    cerr << "Reading options from '" << globalfile << "'." << endl;
+    cerr << "Reading global  options from '" << globalfile << "'." << endl;
 
     ifstream gfile(globalfile.c_str());
@@ -1073 +1082 @@
     {
         fDefaultFile = getfiles["default"].as<string>();
-        cerr << "Reading options from '" << fDefaultFile << "'." << endl;
+        cerr << "Reading default options from '" << fDefaultFile << "'." << endl;
     }
 
@@ -1109 +1118 @@
     {
         fPriorityFile = getfiles["config"].as<string>();
-        cerr << "Reading options from '" << fPriorityFile << "'." << endl;
+        cerr << "Reading config options from '" << fPriorityFile << "'." << endl;
     }
 
@@ -1208 +1217 @@
     // ------------------------ (16) -------------------------
 
+    CreateWildcardOptions();
+
+    // ------------------------ (17) -------------------------
+
     if (result.count("print-options"))
         PrintOptions();
 
+    if (result.count("print-wildcards"))
+        PrintWildcardOptions();
+
     if (result.count("print-unknown"))
         PrintUnknown();
 
     return fVariables;
+}
+
+// --------------------------------------------------------------------------
+//
+//! Create a list of all options which were registered using wildcards
+//!
+void Configuration::CreateWildcardOptions()
+{
+    po::options_description opts;
+
+    for (int i=0; i<2; i++)
+    {
+        opts.add(fOptionsCommandline[i]);
+        opts.add(fOptionsConfigfile[i]);
+        opts.add(fOptionsEnvironment[i]);
+        opts.add(fOptionsDatabase[i]);
+    }
+
+    fWildcardOptions.clear();
+
+    typedef map<string,po::variable_value> Vars;
+    typedef vector<boost::shared_ptr<po::option_description>> Descs;
+
+    const Descs &desc = opts.options();
+
+    for (Vars::const_iterator io=fVariables.begin(); io!=fVariables.end(); io++)
+    {
+        for (Descs::const_iterator id=desc.begin(); id!=desc.end(); id++)
+            if ((*id)->match(io->first, false, false, false)==po::option_description::approximate_match)
+                fWildcardOptions[io->first] = (*id)->long_name();
+    }
+}
+
+// --------------------------------------------------------------------------
+//
+//! Print a list of all options which were registered using wildcards and
+//! have not be registered subsequently by access.
+//!
+void Configuration::PrintWildcardOptions() const
+{
+    cout << "Options registered with wildcards and not yet accessed:" << endl;
+
+    size_t max = 0;
+    for (map<string,string>::const_iterator it=fWildcardOptions.begin(); it!=fWildcardOptions.end(); it++)
+        if (it->second.length()>max)
+            max = it->second.length();
+
+    cout.setf(ios_base::left);
+    for (map<string,string>::const_iterator it=fWildcardOptions.begin(); it!=fWildcardOptions.end(); it++)
+        cout << setw(max+1) << it->second << " : " << it->first <<endl;
 }