Changeset 820 for trunk/bin

Timestamp:

Sep 12, 2009, 4:53:45 PM (14 years ago)

Author:

Peter Johansson

Message:

do not create Option objects dynamically in Parameter class

Location:

trunk/bin

Files:

• Parameter.cc (modified) (17 diffs)
• Parameter.h (modified) (2 diffs)

trunk/bin/Parameter.cc

@@ -48 +48 @@
 
   Parameter::Parameter( int argc, char *argv[])
-    : cmd_(
-     "Mandatory arguments to long options are mandatory for short options too.") 
+    : cmd_( std::string("Mandatory arguments to long options ") + 
+            std::string("are mandatory for short options too.")), 
+      config_file_(cmd_, "config-file", 
+                   "configuration file [<ROOT>/.svndigest/config]"),
+      copyright_(cmd_, "copyright", "update copyright statement"),
+      force_(cmd_, "f,force", 
+             std::string("if sub-directory named <ROOT> exists in target dire")+
+             std::string("ctory, remove sub-directory before writing results")),
+      generate_config_(cmd_, "g,generate-config", 
+                       "write configuration to standard output"),
+      help_(cmd_),
+      ignore_cache_(cmd_, "ignore-cache", 
+                    std::string("ignore cache files and analyze ") +
+                    std::string("everything from repository")),
+      report_(cmd_, "report", "create no HTML report", true),
+      revisions_(cmd_, "revisions", 
+                 "use revision number as time scale instead of dates [dates]"),
+      root_(cmd_, "r,root", 
+            "svn controlled directory to perform statistics on [.]"),
+      target_(cmd_, "t,target", "output directory [.]"),
+      verbose_(cmd_, "v,verbose", "explain what is being done"),
+      version_(cmd_, "version", "print version information and exit", &verbose_)
   {
     init();
@@ -61 +81 @@
 
     // set default values
-    if (!root_->present())
-      root_->value(".");
-
-    if (!target_->present())
-      target_->value(".");
-
-    if (!config_file_->present())
-      config_file_->value(concatenate_path(root_->value(),".svndigest/config"));
+    if (!root_.present())
+      root_.value(".");
+
+    if (!target_.present())
+      target_.value(".");
+
+    if (!config_file_.present())
+      config_file_.value(concatenate_path(root_.value(),".svndigest/config"));
 
     // analyse arguments
@@ -77 +97 @@
   Parameter::~Parameter(void)
   {
-    delete config_file_;
-    delete copyright_;
-    delete force_;
-    delete generate_config_;
-    delete help_;
-    delete ignore_cache_;
-    delete report_;
-    delete revisions_;
-    delete root_;
-    delete target_;
-    delete verbose_;
-    delete version_;
   }
 
@@ -98 +106 @@
     // check root but not if -g option given
     if (!generate_config()) {
-      check_existence(root_->value());
-      check_readable(root_->value());
-      if (chdir(root_->value().c_str())) {
+      check_existence(root_.value());
+      check_readable(root_.value());
+      if (chdir(root_.value().c_str())) {
         std::stringstream ss;
-        ss << "svndigest: cannot read `" << root_->value() << "': " 
+        ss << "svndigest: cannot read `" << root_.value() << "': " 
            << strerror(errno);
         throw yat::utility::cmd_error(ss.str());
       }
-      root_->value(pwd());
+      root_.value(pwd());
       chdir(save_wd.c_str());
 
       // check target (only if we write report)
       if (report()) {
-        check_existence(target_->value());
-        check_readable(target_->value());
-        std::string base_root = file_name(root_->value());
-        std::string path = concatenate_path(target_->value(),base_root); 
-        if (access_rights(target_->value().c_str(), "w")) {
+        check_existence(target_.value());
+        check_readable(target_.value());
+        std::string base_root = file_name(root_.value());
+        std::string path = concatenate_path(target_.value(),base_root); 
+        if (access_rights(target_.value().c_str(), "w")) {
           std::stringstream ss;
           ss << "svndigest: cannot create directory `" << path 
@@ -127 +135 @@
           throw yat::utility::cmd_error(ss.str());
         }
-        if (chdir(target_->value().c_str())) {
+        if (chdir(target_.value().c_str())) {
           std::stringstream ss;
-          ss << "svndigest: cannot read `" << target_->value() << "': " 
+          ss << "svndigest: cannot read `" << target_.value() << "': " 
              << strerror(errno);
           throw yat::utility::cmd_error(ss.str());
         }
-        target_->value(pwd());
+        target_.value(pwd());
         chdir(save_wd.c_str());
       }
@@ -141 +149 @@
     struct stat nodestat;
     // true also if there is a broken symlink named...
-    bool config_exists = !lstat(config_file_->value().c_str(), &nodestat);
+    bool config_exists = !lstat(config_file_.value().c_str(), &nodestat);
     // the latter case in order to catch broken symlink
-    if (config_file_->present() || config_exists)
+    if (config_file_.present() || config_exists)
       // throws if file does not exists
-      check_existence(config_file_->value());
+      check_existence(config_file_.value());
     if (config_exists) {
       // throws if file is not readable
-      check_readable(config_file_->value());
-      stat(config_file_->value().c_str(), &nodestat);
+      check_readable(config_file_.value());
+      stat(config_file_.value().c_str(), &nodestat);
       if (!S_ISREG(nodestat.st_mode)) {
         std::stringstream ss;
-        ss << "svndigest: `" << config_file_->value() 
+        ss << "svndigest: `" << config_file_.value() 
            << "' is not a regular file";
         throw yat::utility::cmd_error(ss.str());
@@ -182 +190 @@
   std::string Parameter::config_file(void) const
   {
-    return config_file_->value();
+    return config_file_.value();
   }
 
@@ -188 +196 @@
   bool Parameter::copyright(void) const
   {
-    return copyright_->present();
+    return copyright_.present();
   }
 
@@ -194 +202 @@
   bool Parameter::force(void) const
   {
-    return force_->present();
+    return force_.present();
   }
 
@@ -200 +208 @@
   bool Parameter::generate_config(void) const
   {
-    return generate_config_->present();
+    return generate_config_.present();
   }
 
@@ -206 +214 @@
   bool Parameter::ignore_cache(void) const
   {
-    return ignore_cache_->present();
+    return ignore_cache_.present();
   }
 
@@ -214 +222 @@
     // don't use argv[0] because user may rename the binary
     cmd_.program_name() = PACKAGE_NAME;
-    config_file_=new yat::utility::OptionArg<std::string>(cmd_, "config-file",
-                                "configuration file [<ROOT>/.svndigest/config]");
-    config_file_->print_arg("=FILE");
+    config_file_.print_arg("=FILE");
+    root_.print_arg("=ROOT");
+    target_.print_arg("=TARGET");
     std::stringstream ss;
-    copyright_ = new yat::utility::OptionSwitch(cmd_, "copyright", 
-                                  "update copyright statement");
-
-    ss << "if sub-directory named <ROOT> exists in target directory, remove "
-       << "sub-directory before writing results";
-    force_ = new yat::utility::OptionSwitch(cmd_, "f,force", ss.str());
-    ss.str("");
-
-    help_ = new yat::utility::OptionHelp(cmd_);
-    generate_config_ = 
-      new yat::utility::OptionSwitch(cmd_, "g,generate-config", 
-                       "write configuration file to standard output");
-
-    ss.str("");
-    ss << "ignore cache files and analyze everything from repository";
-    ignore_cache_ = new yat::utility::OptionSwitch(cmd_, "ignore-cache", ss.str());
-         
-    report_ = new yat::utility::OptionSwitch(cmd_, "report", "create no HTML report", true);
-
-    ss.str("");
-    ss << "use revision numbers as time scale instead of dates [dates]";
-    revisions_ = new yat::utility::OptionSwitch(cmd_, "revisions", ss.str());
-
-    root_=
-      new yat::utility::OptionArg<std::string>(cmd_, "r,root", 
-                     "svn controlled directory to perform statistics on [.]");
-    root_->print_arg("=ROOT");
-    target_ = new yat::utility::OptionArg<std::string>(cmd_, "t,target", 
-                                         "output directory [.]");
-    target_->print_arg("=TARGET");
-    
-    verbose_ = new yat::utility::OptionSwitch(cmd_, "v,verbose", "explain what is being done");
-    version_ = new OptionVersion(cmd_, "version", 
-                                 "print version information and exit", verbose_);
-
-    ss.str("");
     ss << "Report bugs to " << PACKAGE_BUGREPORT << ".\n";
-    help_->post_arguments() = ss.str();
-    help_->synopsis() = 
+    help_.post_arguments() = ss.str();
+    help_.synopsis() = 
       "Generate statistical report for a subversion repository\n";
   }
@@ -263 +235 @@
   bool Parameter::report(void) const
   {
-    return report_->value();
+    return report_.value();
   }
 
@@ -269 +241 @@
   bool Parameter::revisions(void) const
   {
-    return revisions_->present();
+    return revisions_.present();
   }
 
@@ -275 +247 @@
   std::string Parameter::root(void) const
   {
-    return root_->value();
+    return root_.value();
   }
 
@@ -281 +253 @@
   std::string Parameter::targetdir(void) const
   {
-    return target_->value();
+    return target_.value();
   }
 
@@ -287 +259 @@
   bool Parameter::verbose(void) const
   {
-    return verbose_->present();
+    return verbose_.present();
   }
 

trunk/bin/Parameter.h

@@ -24 +24 @@
 */
 
+#include "OptionVersion.h"
+
 #include "yat/CommandLine.h"
 #include "yat/OptionArg.h"
+#include "yat/OptionHelp.h"
+#include "yat/OptionSwitch.h"
+
 
 #include <string>
@@ -70 +75 @@
 
     yat::utility::CommandLine cmd_;
-    yat::utility::OptionArg<std::string>* config_file_;
-    yat::utility::OptionSwitch* copyright_;
-    yat::utility::OptionSwitch* force_;
-    yat::utility::OptionSwitch* generate_config_;
-    yat::utility::OptionHelp* help_;
-    yat::utility::OptionSwitch* ignore_cache_;
-    yat::utility::OptionSwitch* report_;
-    yat::utility::OptionSwitch* revisions_;
-    yat::utility::OptionArg<std::string>* root_;
-    yat::utility::OptionArg<std::string>* target_;
-    yat::utility::OptionSwitch* verbose_;
-    OptionVersion* version_;
+    yat::utility::OptionArg<std::string> config_file_;
+    yat::utility::OptionSwitch copyright_;
+    yat::utility::OptionSwitch force_;
+    yat::utility::OptionSwitch generate_config_;
+    yat::utility::OptionHelp help_;
+    yat::utility::OptionSwitch ignore_cache_;
+    yat::utility::OptionSwitch report_;
+    yat::utility::OptionSwitch revisions_;
+    yat::utility::OptionArg<std::string> root_;
+    yat::utility::OptionArg<std::string> target_;
+    yat::utility::OptionSwitch verbose_;
+    OptionVersion version_;
 
   };