Changeset 1426

Timestamp:

Aug 21, 2008, 12:26:31 AM (15 years ago)

Author:

Peter

Message:

fixes #414

Location:

trunk

Files:

• test/commandline_test.cc (modified) (4 diffs)
• yat/utility/CommandLine.cc (modified) (1 diff)

trunk/test/commandline_test.cc

@@ -40 +40 @@
 bool test_file(yat::test::Suite& error);
 bool test_failures(yat::test::Suite& error);
+bool test_option_name_clash(yat::test::Suite& suite);
 
 int main(int argc, char* argv[])
@@ -54 +55 @@
     suite.add(test_file(suite));
     suite.add(test_failures(suite));
+    suite.add(test_option_name_clash(suite));
   }
   catch (std::runtime_error& e) {
-    suite.err() << "exception thrown\n" << e.what() << std::endl;
+    suite.err() << "Error: unexpected exception thrown\n" << e.what() 
+                << std::endl;
+    suite.add(false);
   }
 
@@ -360 +364 @@
   suite.err() << "Testing OptionFile... ";
   {
-    int ac = 2;
-    char* av[] = { "test_prog", "--clones", "commandline_test.cc" 
+    int ac = 7;
+    char* av[] = { "test_prog", "--clones", "commandline_test.cc", 
                    "--data", "commandline_test.cc", "-o", 
                    "commandline_test.cc"};
@@ -370 +374 @@
 }
 
-
-
-
-
+bool test_option_name_clash(yat::test::Suite& suite)
+{
+  bool ok=true;
+  suite.err() << "Testing long option name clash ...";
+  try {
+    CommandLine cmd;
+    OptionSwitch op1(cmd, "opt", "bla bla");
+    OptionSwitch op2(cmd, "o,opt", "other bla");
+    ok=false;
+    suite.err() << "failed\n";
+  }
+  catch (std::runtime_error& e) {
+    suite.err() << "ok\n";
+  }
+  suite.err() << "Testing short option name clash ...";
+  try {
+    CommandLine cmd;
+    OptionSwitch op1(cmd, "o", "bla bla");
+    OptionSwitch op2(cmd, "o,opt", "other bla");
+    ok=false;
+    suite.err() << "failed\n";
+  }
+  catch (std::runtime_error& e) {
+    suite.err() << "ok\n";
+  }
+
+  return ok;
+}
+
+
+
+

trunk/yat/utility/CommandLine.cc

@@ -56 +56 @@
   void CommandLine::add(Option& option)
   {
-    if (option.long_name().size())
+    if (option.long_name().size()) {
+      if (long_options_.find(option.long_name())!=long_options_.end()) {
+        std::stringstream ss;
+        ss << "yat::utility::Commandline: two options with long_name: "
+           << option.long_name();
+        throw std::runtime_error(ss.str());
+      }
       long_options_[option.long_name()] = &option;
-    if (option.short_name())
+    }
+    if (option.short_name()) {
+      if (short_options_.find(option.short_name())!=short_options_.end()) {
+        std::stringstream ss;
+        ss << "yat::utility::Commandline: two options with short_name: "
+           << option.short_name();
+        throw std::runtime_error(ss.str());
+      }
       short_options_[option.short_name()] = &option;
+    }
     if (option.long_name().size() || option.short_name())
       options_.push_back(&option);
     // allow `no-switch' for option `switch'
     OptionSwitch* o = dynamic_cast<OptionSwitch*>(&option);
+    std::string no_name = std::string("no-")+option.long_name();
     if (option.long_name().size() && o && 
-        !( o->long_name().size()>2 && o->long_name().substr(0,3)=="no-"))
-      long_options_[std::string("no-")+option.long_name()] = &option;
+        !( o->long_name().size()>2 && o->long_name().substr(0,3)=="no-") &&
+        long_options_.find(no_name)==long_options_.end())
+      long_options_[no_name] = &option;
   }