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

Timestamp:

03/03/11 19:28:48 (14 years ago)

Author:

tbretz

Message:

Added fEnvMap and a default name mapper.

File:

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

trunk/FACT++/src/Configuration.cc

@@ -166 +166 @@
 If the second option is false, the options will not be displayed in any
 \b --help directive, but are available to the user. Each of the functions
-can be called more than once.
+can be called more than once. If an option should be available from
+all kind of inputs AddOptions() can be used which will call all
+four other AddOptions() functions.
 
 A special case are the options from environment variables. Since you might
-want to use the same option-key for the command-line and the environment
+want to use the same option-key for the command-line and the environment,
 a mapping is needed (e.g. from \b PATH to \b --path). This mapping
-can be implemented by a mapping function and be initialized like this:
+can be implemented by a mapping function or by the build in mapping
+and be initialized like this:
 
 \code
 
-   const string name_mapper(const string &str)
+   conf.AddEnv("path", "PATH");
+
+\endcode
+
+or
+
+\code
+
+   const string name_mapper(const string str)
    {
       return str=="PATH" ? "path" : "";
@@ -421 +432 @@
 //!
 //
-Configuration::Configuration(const string &prgname) : fName(prgname), fNameMapper(&NameMapper)
+Configuration::Configuration(const string &prgname) : fName(prgname),
+fNameMapper(bind1st(mem_fun(&Configuration::DefaultMapper), this))
 {
     po::options_description generic("Generic options");
@@ -665 +677 @@
 //!
 //
-void Configuration::SetNameMapper(const string (*mapper)(const string&))
-{
-    fNameMapper = mapper;
+void Configuration::SetNameMapper(const boost::function1<std::string, std::string> &func)
+{
+    fNameMapper = func;
+}
+
+void Configuration::SetNameMapper()
+{
+    fNameMapper = bind1st(mem_fun(&Configuration::DefaultMapper), this);
 }
 
@@ -902 +919 @@
     // ------------------------ (11) -------------------------
 
-    const po::parsed_options parsed_environment = po::parse_environment(opt_environment, *fNameMapper);
+    const po::parsed_options parsed_environment = po::parse_environment(opt_environment, fNameMapper);
 
     // ------------------------ (12) -------------------------