Changeset 1515 for trunk/third_party/tclap/SwitchArg.h

Timestamp:

24/08/10 11:23:06 (21 months ago)

Author:

Freddie Akeroyd

Message:

Update to tclap 1.2.0 from ​http://tclap.sourceforge.net/
Refs #244

File:

• trunk/third_party/tclap/SwitchArg.h (modified) (10 diffs)

trunk/third_party/tclap/SwitchArg.h

@@ -46 +46 @@
                 bool _value;
 
+                /**
+                 * Used to support the reset() method so that ValueArg can be
+                 * reset to their constructed value.
+                 */
+        bool _default;
 
         public:
@@ -64 +69 @@
                               const std::string& name, 
                               const std::string& desc,
-                              bool def,
+                              bool def = false,
                                   Visitor* v = NULL);
 
@@ -84 +89 @@
                               const std::string& name, 
                               const std::string& desc,
-                              bool def,
                                   CmdLineInterface& parser,
+                              bool def = false,
                                   Visitor* v = NULL);
                                   
@@ -109 +114 @@
                  */
                 bool getValue();
+                
+                virtual void reset();
+
 };
 
@@ -117 +125 @@
                                  const std::string& name, 
                                  const std::string& desc, 
-                         bool _default,
+                         bool default_val,
                                          Visitor* v )
 : Arg(flag, name, desc, false, false, v),
-  _value( _default )
+  _value( default_val ),
+  _default( default_val )
 { }
 
@@ -126 +135 @@
                                         const std::string& name, 
                                         const std::string& desc, 
-                                        bool _default,
                                         CmdLineInterface& parser,
+                                        bool default_val,
                                         Visitor* v )
 : Arg(flag, name, desc, false, false, v),
-  _value( _default )
+  _value( default_val ),
+  _default(default_val)
 { 
         parser.add( this );
@@ -140 +150 @@
 {
         // make sure this is actually a combined switch
-        if ( combinedSwitches[0] != Arg::flagStartString()[0] )
+        if ( combinedSwitches.length() > 0 &&
+             combinedSwitches[0] != Arg::flagStartString()[0] )
                 return false;
 
@@ -148 +159 @@
                 return false;
 
+        // make sure the delimiter isn't in the string 
+        if ( combinedSwitches.find_first_of( Arg::delimiter() ) != std::string::npos )
+                return false;
+
         // ok, we're not specifying a ValueArg, so we know that we have
         // a combined switch list.  
         for ( unsigned int i = 1; i < combinedSwitches.length(); i++ )
-                if ( combinedSwitches[i] == _flag[0] ) 
+                if ( _flag.length() > 0 && 
+                     combinedSwitches[i] == _flag[0] &&
+                     _flag[0] != Arg::flagStartString()[0] ) 
                 {
                         // update the combined switches so this one is no longer present
@@ -180 +197 @@
                         ret = true;
 
-                if ( _alreadySet )
+                if ( _alreadySet || ( !ret && combinedSwitchesMatch( args[*i] ) ) )
                         throw(CmdLineParseException("Argument already set!", toString()));      
 
@@ -198 +215 @@
 }
 
+inline void SwitchArg::reset()
+{
+        Arg::reset();
+        _value = _default;  
+}
 //////////////////////////////////////////////////////////////////////
 //End SwitchArg.cpp