Changeset 1426 for trunk/yat/utility/CommandLine.cc

Timestamp:

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

Author:

Peter

Message:

fixes #414

File:

• trunk/yat/utility/CommandLine.cc (modified) (1 diff)

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;
   }