Changeset 1634 for trunk

Timestamp:

Nov 19, 2008, 11:37:11 PM (12 years ago)

Author:

Peter

Message:

Fixed bug in CommandLine? how --no-switches are handled

Location:

trunk

Files:

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

trunk/test/commandline_test.cc

@@ -112 +112 @@
     char* av[] = { "test_prog", "--target" };
     cmd.parse(ac,av);
-    if (target.present() && !verbose.present())
+    if (target.present() && target.value() && !verbose.present())
       suite.err() << "ok\n";
     else {
@@ -142 +142 @@
     else {
       suite.err() << "failed\n";
+      ok =false;
+    }
+  }
+
+  suite.err() << "Testing OptionSwitch --no-target...";
+  {
+    int ac = 2;
+    char* av[] = { "test_prog", "--no-target" };
+    cmd.parse(ac,av);
+    if (target.present() && !target.value())
+      suite.err() << "ok\n";
+    else {
+      suite.err() << "failed\n";
+      if (!target.present())
+        suite.err() << "target.present() returned false\n";
+      if (target.value())
+        suite.err() << "target.value() returned true\n";
       ok =false;
     }

trunk/yat/utility/CommandLine.cc

@@ -74 +74 @@
     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_.find(no_name)==long_options_.end())
-      long_options_[no_name] = &option;
   }
 
@@ -139 +132 @@
           std::map<std::string, Option*>::const_iterator
             iter(long_options_.find(key));
-          if (iter==long_options_.end()) {
-            std::stringstream ss;
-            ss << ": unrecognized option `" << key << "'\n"
-               << try_help();
+          if (iter!=long_options_.end())
+            iter->second->parse(arg, arguments.end());
+          else if (key.size()>3 && key.substr(0,3)=="no-") { 
+            iter = long_options_.find(key.substr(3));
+            if (iter!=long_options_.end())
+              iter->second->parse(arg, arguments.end());
+          }           
+          else if (iter==long_options_.end()) {
+            ss.str("");
+            ss << ": unrecognized option `" << key << "'\n" << try_help();
             throw cmd_error(ss.str());
           }
-          else 
-            iter->second->parse(arg, arguments.end());
         }
         else if (is_short_option(*arg)) {

trunk/yat/utility/OptionSwitch.cc

@@ -40 +40 @@
                               const std::vector<std::string>::iterator& last)
   {   
-    if (long_name().size()>3 && long_name().substr(0,3)=="no-")
+    if (first->size()>3 && first->substr(0,3)=="no-")
       switch_=false;
     else