Changeset 1468

Timestamp:

Sep 2, 2008, 4:57:50 PM (15 years ago)

Author:

Peter

Message:

fixes #413

Location:

trunk

Files:

• test/commandline_test.cc (modified) (2 diffs)
• yat/utility/CommandLine.cc (modified) (3 diffs)
• yat/utility/CommandLine.h (modified) (2 diffs)

trunk/test/commandline_test.cc

@@ -57 +57 @@
     suite.add(test_failures(suite));
     suite.add(test_option_name_clash(suite));
-    //suite.add(test_free_arg(suite));
+    suite.add(test_free_arg(suite));
   }
   catch (std::runtime_error& e) {
@@ -459 +459 @@
 
   CommandLine cmd;
+  cmd.allow_free_args(2);
   OptionHelp help(cmd);
   int ac = 3;

trunk/yat/utility/CommandLine.cc

@@ -45 +45 @@
 
   CommandLine::CommandLine(std::string str)
-    : description_(str)
+    : description_(str), free_arg_max_(0)
   {}
 
@@ -83 +83 @@
         long_options_.find(no_name)==long_options_.end())
       long_options_[no_name] = &option;
+  }
+
+
+  void CommandLine::allow_free_args(size_t n)
+  {
+    free_arg_max_ = n;
   }
 
@@ -155 +161 @@
         else {
           free_arg_.push_back(*arg);
-          std::stringstream ss;
-          ss << ": invalid option -- " << *arg << "\n"
-             << try_help() << "\n";
-          throw cmd_error(ss.str());
-          
+          if (free_arg_.size()>free_arg_max_) {
+            std::stringstream ss;
+            ss << ": invalid option -- " << *arg << "\n"
+               << try_help() << "\n";
+            throw cmd_error(ss.str());
+          }
         }
       }

trunk/yat/utility/CommandLine.h

@@ -107 +107 @@
 
     /**
+       \brief Allow at most \a n free arguments.
+
+       An free argument is an argument not associated with an Option,
+       allowing commandlines such as \code prog foo bar \endcode
+     */
+    void allow_free_args(size_t n);
+
+    /**
        \brief parse the commandline
 
@@ -134 +142 @@
     std::string description_;
     std::vector<std::string> free_arg_;
+    size_t free_arg_max_;
     std::vector<Option*> options_;
     std::map<char, Option*> short_options_;