cuberite/TCLAP
1
0
Fork 0
mirror of https://github.com/cuberite/TCLAP.git synced 2025-09-08 20:00:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed error reading incorrect extra values in an arg

Browse Source
This commit is contained in:
mes5k 2004-02-07 01:18:03 +00:00
parent 2e935f495e
commit 594b71d526
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/tclap/MultiArg.h
View File

@ -182,6 +182,7 @@ bool MultiArg<T>::processArg(int *i, vector<string>& args)
else else
_extractValue( value ); _extractValue( value );
_checkWithVisitor();
return true; return true;
} }
else else
@ -196,13 +197,28 @@ void MultiArg<T>::_extractValue( const string& val )
{ {
T temp; T temp;
istringstream is(val); istringstream is(val);
is >> temp;
if ( is.fail() ) int valuesRead = 0;
throw( ArgException("Couldn't read argument value!", toString())); while ( is.good() )
{
if ( is.peek() != EOF )
is >> temp;
else
break;
valuesRead++;
}
if ( is.fail() )
throw( ArgException("Couldn't read argument value from string '" +
val + "'", toString() ) );
if ( valuesRead > 1 )
throw( ArgException("More than one valid value parsed from string '" +
val + "'", toString() ) );
_values.push_back(temp); _values.push_back(temp);
_checkWithVisitor();
} }
/** /**
@ -213,8 +229,6 @@ template<>
void MultiArg<string>::_extractValue( const string& val ) void MultiArg<string>::_extractValue( const string& val )
{ {
_values.push_back(val); _values.push_back(val);
_checkWithVisitor();
} }
/** /**

20
include/tclap/ValueArg.h
View File

@ -220,9 +220,25 @@ template<class T>
void ValueArg<T>::_extractValue( const string& val ) void ValueArg<T>::_extractValue( const string& val )
{ {
istringstream is(val); istringstream is(val);
is >> _value;
int valuesRead = 0;
while ( is.good() )
{
if ( is.peek() != EOF )
is >> _value;
else
break;
valuesRead++;
}
if ( is.fail() ) if ( is.fail() )
throw( ArgException("Couldn't read argument value!", toString() ) ); throw( ArgException("Couldn't read argument value from string '" +
val + "'", toString() ) );
if ( valuesRead > 1 )
throw( ArgException("More than one valid value parsed from string '" +
val + "'", toString() ) );
} }
/** /**