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

minor formatting

Browse Source
This commit is contained in:
mes5k 2004-09-26 23:54:16 +00:00
parent 5b198cd996
commit ad7f3fdab3
6 changed files with 909 additions and 867 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/tclap/Arg.h
View File

@ -50,15 +50,14 @@ class Arg
*/ */
static bool& ignoreRestRef() { static bool ign = false; return ign; } static bool& ignoreRestRef() { static bool ign = false; return ign; }
protected:
/** /**
* The delimiter that separates an argument flag/name from the * The delimiter that separates an argument flag/name from the
* value. * value.
*/ */
static char& delimiterRef() { static char delim = ' '; return delim; } static char& delimiterRef() { static char delim = ' '; return delim; }
protected:
/** /**
* The single char flag used to identify the argument. * The single char flag used to identify the argument.
* This value (preceded by a dash {-}), can be used to identify * This value (preceded by a dash {-}), can be used to identify
@ -446,7 +445,8 @@ inline bool Arg::operator==(const Arg& a)
// should be overridden // should be overridden
inline bool Arg::processArg(int* i, std::vector<std::string>& args) inline bool Arg::processArg(int* i, std::vector<std::string>& args)
{ {
std::cerr << "WARNING: Ignoring unknown argument: " << args[*i] << std::endl; std::cerr << "WARNING: Ignoring unknown argument: "
<< args[*i] << std::endl;
return false; return false;
} }

16
include/tclap/CmdLine.h
View File

@ -37,8 +37,6 @@
#include <list> #include <list>
#include <iostream> #include <iostream>
#include <ostream> #include <ostream>
#include <cstdio>
#include <cstdarg>
#include <iomanip> #include <iomanip>
#include <algorithm> #include <algorithm>
@ -231,7 +229,9 @@ class CmdLine : public CmdLineInterface
//Begin CmdLine.cpp //Begin CmdLine.cpp
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
inline CmdLine::CmdLine(const std::string& n, const std::string& m, const std::string& v ) inline CmdLine::CmdLine(const std::string& n,
const std::string& m,
const std::string& v )
: _progName(n), : _progName(n),
_message(m), _message(m),
_version(v), _version(v),
@ -241,7 +241,9 @@ inline CmdLine::CmdLine(const std::string& n, const std::string& m, const std::s
_constructor(); _constructor();
} }
inline CmdLine::CmdLine(const std::string& m, char delim, const std::string& v ) inline CmdLine::CmdLine(const std::string& m,
char delim,
const std::string& v )
: _progName("not_set_yet"), : _progName("not_set_yet"),
_message(m), _message(m),
_version(v), _version(v),
@ -339,7 +341,8 @@ inline void CmdLine::add( Arg* a )
inline void CmdLine::version(int exitVal) inline void CmdLine::version(int exitVal)
{ {
std::cout << std::endl << _progName << " version: " << _version << std::endl << std::endl; std::cout << std::endl << _progName << " version: "
<< _version << std::endl << std::endl;
exit( exitVal ); exit( exitVal );
} }
@ -436,7 +439,8 @@ inline void CmdLine::parse(int argc, char** argv)
_shortUsage( std::cerr ); _shortUsage( std::cerr );
std::cerr << std::endl << "For complete USAGE and HELP type: " std::cerr << std::endl << "For complete USAGE and HELP type: "
<< std::endl << " " << _progName << " --help" << std::endl << std::endl; << std::endl << " " << _progName << " --help"
<< std::endl << std::endl;
exit(1); exit(1);
} }

4
include/tclap/CmdLineInterface.h
View File

@ -45,6 +45,10 @@ namespace TCLAP {
class CmdLineInterface class CmdLineInterface
{ {
public: public:
/**
* Destructor
*/
virtual ~CmdLineInterface() {} virtual ~CmdLineInterface() {}
/** /**

147
include/tclap/MultiArg.h
View File

@ -1,5 +1,3 @@
/* -*- Mode: CC; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/****************************************************************************** /******************************************************************************
* *
* file: MultiArg.h * file: MultiArg.h
@ -37,34 +35,49 @@ namespace TCLAP {
namespace MULTI_ARG_HELPER { namespace MULTI_ARG_HELPER {
enum Error_e { enum Error_e { EFAIL = 1000, EMANY };
EFAIL = 1000,
EMANY
};
//This class is used to extract a value from an argument. /**
//It is used because we need a special implementation to * This class is used to extract a value from an argument.
//deal with std::string and making a specialiced function * It is used because we need a special implementation to
//puts it in the T segment, thus generating link errors. * deal with std::string and making a specialiced function
//Having a specialiced class makes the symbols weak. * puts it in the T segment, thus generating link errors.
//This is not pretty but I don't know how to make it * Having a specialiced class makes the symbols weak.
//work any other way. * This is not pretty but I don't know how to make it
* work any other way.
*/
template<class T> template<class T>
class ValueExtractor class ValueExtractor
{ {
friend class MultiArg<T>; friend class MultiArg<T>;
private: private:
/**
* Reference to the vector of values where the result of the
* extraction will be put.
*/
std::vector<T> &_values; std::vector<T> &_values;
/**
* Constructor.
* \param values - Where the values extracted will be put.
*/
ValueExtractor(std::vector<T> &values) : _values(values) {} ValueExtractor(std::vector<T> &values) : _values(values) {}
int extractValue( const std::string& val ) { /**
* Method that will attempt to parse the input stream for values
* of type T.
* \param val - Where the values parsed will be put.
*/
int extractValue( const std::string& val )
{
T temp; T temp;
std::istringstream is(val); std::istringstream is(val);
int valuesRead = 0; int valuesRead = 0;
while ( is.good() ) { while ( is.good() )
{
if ( is.peek() != EOF ) if ( is.peek() != EOF )
is >> temp; is >> temp;
else else
@ -91,14 +104,31 @@ namespace MULTI_ARG_HELPER {
* read 'X'... and thus the specialization. * read 'X'... and thus the specialization.
*/ */
template<> template<>
class ValueExtractor<std::string> { class ValueExtractor<std::string>
{
friend class MultiArg<std::string>; friend class MultiArg<std::string>;
private: private:
/**
* Reference to the vector of strings where the result of the
* extraction will be put.
*/
std::vector<std::string> &_values; std::vector<std::string> &_values;
/**
* Constructor.
* \param values - Where the strings extracted will be put.
*/
ValueExtractor(std::vector<std::string> &values) : _values(values) {} ValueExtractor(std::vector<std::string> &values) : _values(values) {}
int extractValue( const std::string& val ) { /**
* Method that will attempt to parse the input stream for values
* of type std::string.
* \param val - Where the values parsed will be put.
*/
int extractValue( const std::string& val )
{
_values.push_back( val ); _values.push_back( val );
return 0; return 0;
} }
@ -140,21 +170,7 @@ namespace MULTI_ARG_HELPER {
* is thrown. * is thrown.
* \param val - The string to be read. * \param val - The string to be read.
*/ */
void _extractValue( const std::string& val ) { void _extractValue( const std::string& val );
MULTI_ARG_HELPER::ValueExtractor<T> ve(_values);
int err = ve.extractValue(val);
if(err == MULTI_ARG_HELPER::EFAIL)
throw( ArgException("Couldn't read argument value "
"from string '" +
val + "'", toString() ) );
if(err == MULTI_ARG_HELPER::EMANY)
throw( ArgException("More than one valid value "
"parsed from string '" +
val + "'", toString() ) );
_checkAllowed( val );
}
/** /**
* Checks to see if parsed value is in allowed list. * Checks to see if parsed value is in allowed list.
@ -213,6 +229,7 @@ namespace MULTI_ARG_HELPER {
const std::string& typeDesc, const std::string& typeDesc,
CmdLineInterface& parser, CmdLineInterface& parser,
Visitor* v = NULL ); Visitor* v = NULL );
/** /**
* Constructor. * Constructor.
* \param flag - The one character flag that identifies this * \param flag - The one character flag that identifies this
@ -316,6 +333,7 @@ namespace MULTI_ARG_HELPER {
if ( i > 0 ) if ( i > 0 )
_typeDesc += "|"; _typeDesc += "|";
_typeDesc += temp; _typeDesc += temp;
} }
} }
@ -421,58 +439,13 @@ namespace MULTI_ARG_HELPER {
_extractValue( value ); _extractValue( value );
_checkWithVisitor(); _checkWithVisitor();
return true; return true;
} }
else else
return false; return false;
} }
/*
template<class T>
void MultiArg<T>::_extractValue( const std::string& val )
{
T temp;
std::istringstream is(val);
int valuesRead = 0;
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);
_checkAllowed( val );
}
*/
/**
* Specialization to handle strings with spaces in them. This is needed
* because there is no way to tell operator>> to ignore spaces.
*
template<>
void MultiArg<std::string>::_extractValue( const std::string& val )
{
_values.push_back( val );
_checkAllowed( val );
}
*/
/** /**
* Checks to see if the value parsed is in the allowed list. * Checks to see if the value parsed is in the allowed list.
*/ */
@ -527,6 +500,24 @@ namespace MULTI_ARG_HELPER {
} }
template<class T>
void MultiArg<T>::_extractValue( const std::string& val )
{
MULTI_ARG_HELPER::ValueExtractor<T> ve(_values);
int err = ve.extractValue(val);
if ( err == MULTI_ARG_HELPER::EFAIL )
throw( ArgException("Couldn't read argument value "
"from string '" + val + "'", toString() ) );
if(err == MULTI_ARG_HELPER::EMANY)
throw( ArgException("More than one valid value "
"parsed from string '" + val + "'", toString() ) );
_checkAllowed( val );
} }
} // namespace TCLAP
#endif #endif

109
include/tclap/ValueArg.h
View File

@ -1,5 +1,3 @@
/* -*- Mode: CC; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/****************************************************************************** /******************************************************************************
* *
* file: ValueArg.h * file: ValueArg.h
@ -37,31 +35,50 @@ namespace TCLAP {
namespace VALUE_ARG_HELPER { namespace VALUE_ARG_HELPER {
enum Error_e { enum Error_e { EFAIL = 1000, EMANY };
EFAIL = 1000,
EMANY
};
//This class is used to extract a value from an argument.
//It is used because we need a special implementation to
//deal with std::string and making a specialiced function
//puts it in the T segment, thus generating link errors.
//Having a specialiced class makes the symbols weak.
//This is not pretty but I don't know how to make it
//work any other way.
template<class T> class ValueExtractor {
/**
* This class is used to extract a value from an argument.
* It is used because we need a special implementation to
* deal with std::string and making a specialiced function
* puts it in the T segment, thus generating link errors.
* Having a specialiced class makes the symbols weak.
* This is not pretty but I don't know how to make it
* work any other way.
*/
template<class T> class ValueExtractor
{
/**
*
*/
friend class ValueArg<T>; friend class ValueArg<T>;
private: private:
/**
* Reference to the value where the result of the extraction will
* be put.
*/
T &_value; T &_value;
/**
* Constructor.
* \param value - Where the value extracted will be put.
*/
ValueExtractor(T &value) : _value(value) { } ValueExtractor(T &value) : _value(value) { }
int extractValue( const std::string& val ) { /**
* Method that will attempt to parse the input stream for a value
* of type T.
* \param val - Where the value parsed will be put.
*/
int extractValue( const std::string& val )
{
std::istringstream is(val); std::istringstream is(val);
int valuesRead = 0; int valuesRead = 0;
while ( is.good() ) { while ( is.good() )
{
if ( is.peek() != EOF ) if ( is.peek() != EOF )
is >> _value; is >> _value;
else else
@ -85,15 +102,34 @@ namespace VALUE_ARG_HELPER {
* operator>> is not able to ignore spaces... meaning -x "X Y" will only * operator>> is not able to ignore spaces... meaning -x "X Y" will only
* read 'X'... and thus the specialization. * read 'X'... and thus the specialization.
*/ */
template<> class ValueExtractor<std::string> { template<> class ValueExtractor<std::string>
{
/**
*
*/
friend class ValueArg<std::string>; friend class ValueArg<std::string>;
private: private:
/**
* Reference to the value where the result of the extraction will
* be put.
*/
std::string &_value; std::string &_value;
/**
* Constructor.
* \param value - Where the value extracted will be put.
*/
ValueExtractor(std::string &value) : _value(value) {} ValueExtractor(std::string &value) : _value(value) {}
int extractValue( const std::string& val ) { /**
* Method that will attempt to parse the input stream for a value
* of type std::string.
* \param val - Where the string parsed will be put.
*/
int extractValue( const std::string& val )
{
_value = val; _value = val;
return 0; return 0;
} }
@ -144,19 +180,7 @@ namespace VALUE_ARG_HELPER {
* is thrown. * is thrown.
* \param val - value to be parsed. * \param val - value to be parsed.
*/ */
void _extractValue( const std::string& val ) { void _extractValue( const std::string& val );
VALUE_ARG_HELPER::ValueExtractor<T> ve(_value);
int err = ve.extractValue(val);
if(err == VALUE_ARG_HELPER::EFAIL)
throw( ArgException("Couldn't read argument value from string '" +
val + "'", toString() ) );
if(err == VALUE_ARG_HELPER::EMANY)
throw( ArgException("More than one valid value parsed from string '" +
val + "'", toString() ) );
_checkAllowed( val );
}
/** /**
* Checks to see if parsed value is in allowed list. * Checks to see if parsed value is in allowed list.
@ -495,5 +519,24 @@ namespace VALUE_ARG_HELPER {
return Arg::longID( _typeDesc ); return Arg::longID( _typeDesc );
} }
template<class T>
void ValueArg<T>::_extractValue( const std::string& val )
{
VALUE_ARG_HELPER::ValueExtractor<T> ve(_value);
int err = ve.extractValue(val);
if ( err == VALUE_ARG_HELPER::EFAIL )
throw( ArgException("Couldn't read argument value from string '" +
val + "'", toString() ) );
if ( err == VALUE_ARG_HELPER::EMANY )
throw( ArgException("More than one valid value parsed from string '" +
val + "'", toString() ) );
_checkAllowed( val );
} }
} // namespace TCLAP
#endif #endif