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

Formatting change: Don't print space after elipsis in usage

Browse Source
This commit is contained in:
Daniel Aarno 2017-12-25 23:52:22 +01:00
parent 9ccc290a07
commit 5489dc9597
27 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/tclap/DocBookOutput.h
View File

@ -242,6 +242,7 @@ inline void DocBookOutput::printShortArg(Arg* a)
removeChar(arg,']');
removeChar(arg,'<');
removeChar(arg,'>');
removeChar(arg,'.');
arg.erase(0, arg.find_last_of(theDelimiter) + 1);
std::cout << theDelimiter;
std::cout << "<replaceable>" << arg << "</replaceable>";
@ -280,6 +281,7 @@ inline void DocBookOutput::printLongArg(Arg* a)
removeChar(arg,']');
removeChar(arg,'<');
removeChar(arg,'>');
removeChar(arg,'.');
arg.erase(0, arg.find_last_of(theDelimiter) + 1);
std::cout << theDelimiter;
std::cout << "<replaceable>" << arg << "</replaceable>";

2
include/tclap/MultiArg.h
View File

@ -359,7 +359,7 @@ template<class T>
std::string MultiArg<T>::shortID(const std::string& val) const
{
static_cast<void>(val); // Ignore input, don't warn
return Arg::shortID(_typeDesc) + " ... ";
return Arg::shortID(_typeDesc) + " ...";
}
/**

2
include/tclap/MultiSwitchArg.h
View File

@ -190,7 +190,7 @@ inline bool MultiSwitchArg::processArg(int *i, std::vector<std::string>& args)
inline std::string
MultiSwitchArg::shortID(const std::string& val) const
{
return Arg::shortID(val) + " ... ";
return Arg::shortID(val) + " ...";
}
inline std::string

4
include/tclap/ZshCompletionOutput.h
View File

@ -237,8 +237,8 @@ inline void ZshCompletionOutput::printOption(Arg* a, std::string mutex)
if ( a->isValueRequired() )
{
std::string arg = a->shortID();
// Example arg: "[-A <integer>] ... "
size_t pos = arg.rfind(" ... ");
// Example arg: "[-A <integer>] ..."
size_t pos = arg.rfind(" ...");
if (pos != std::string::npos) {
arg.erase(pos);
}

6
tests/test15.out
View File

@ -2,9 +2,9 @@ PARSE ERROR: Argument: (--stringTest)
Couldn't find delimiter for this argument!
Brief USAGE:
../examples/test3 [-f=<float>] ... [-i=<int>] ...
--stringTest=<string> [-B] [--] [--version] [-h]
<string> <string> <fileNameString> ...
../examples/test3 [-f=<float>] ... [-i=<int>] ... --stringTest=<string>
[-B] [--] [--version] [-h] <string> <string>
<fileNameString> ...
For complete USAGE and HELP type:
../examples/test3 --help

6
tests/test16.out
View File

@ -2,9 +2,9 @@ PARSE ERROR: Argument: (--stringTest)
Couldn't find delimiter for this argument!
Brief USAGE:
../examples/test3 [-f=<float>] ... [-i=<int>] ...
--stringTest=<string> [-B] [--] [--version] [-h]
<string> <string> <fileNameString> ...
../examples/test3 [-f=<float>] ... [-i=<int>] ... --stringTest=<string>
[-B] [--] [--version] [-h] <string> <string>
<fileNameString> ...
For complete USAGE and HELP type:
../examples/test3 --help

6
tests/test17.out
View File

@ -2,9 +2,9 @@ PARSE ERROR:
Required argument missing: unTest2
Brief USAGE:
../examples/test3 [-f=<float>] ... [-i=<int>] ...
--stringTest=<string> [-B] [--] [--version] [-h]
<string> <string> <fileNameString> ...
../examples/test3 [-f=<float>] ... [-i=<int>] ... --stringTest=<string>
[-B] [--] [--version] [-h] <string> <string>
<fileNameString> ...
For complete USAGE and HELP type:
../examples/test3 --help

4
tests/test22.out
View File

@ -3,8 +3,8 @@ PARSE ERROR: Argument: -b (--bbb)
Brief USAGE:
../examples/test5 {-a <string>|-b <string>} {--eee <string>|--fff
<string>|-g <string>} {-i <string> ... |-j <string>
... } [--ddd] -c <string> [--] [--version] [-h]
<string>|-g <string>} {-i <string> ...|-j <string>
...} [--ddd] -c <string> [--] [--version] [-h]
For complete USAGE and HELP type:
../examples/test5 --help

4
tests/test23.out
View File

@ -3,8 +3,8 @@ PARSE ERROR: Argument: -d
Brief USAGE:
../examples/test5 {-a <string>|-b <string>} {--eee <string>|--fff
<string>|-g <string>} {-i <string> ... |-j <string>
... } [--ddd] -c <string> [--] [--version] [-h]
<string>|-g <string>} {-i <string> ...|-j <string>
...} [--ddd] -c <string> [--] [--version] [-h]
For complete USAGE and HELP type:
../examples/test5 --help

4
tests/test24.out
View File

@ -3,8 +3,8 @@ PARSE ERROR: Argument: -b (--bbb)
Brief USAGE:
../examples/test5 {-a <string>|-b <string>} {--eee <string>|--fff
<string>|-g <string>} {-i <string> ... |-j <string>
... } [--ddd] -c <string> [--] [--version] [-h]
<string>|-g <string>} {-i <string> ...|-j <string>
...} [--ddd] -c <string> [--] [--version] [-h]
For complete USAGE and HELP type:
../examples/test5 --help

6
tests/test31.out
View File

@ -2,9 +2,9 @@ PARSE ERROR: Argument: -i (--intTest)
Couldn't read argument value from string '9a'
Brief USAGE:
../examples/test3 [-f=<float>] ... [-i=<int>] ...
--stringTest=<string> [-B] [--] [--version] [-h]
<string> <string> <fileNameString> ...
../examples/test3 [-f=<float>] ... [-i=<int>] ... --stringTest=<string>
[-B] [--] [--version] [-h] <string> <string>
<fileNameString> ...
For complete USAGE and HELP type:
../examples/test3 --help

6
tests/test32.out
View File

@ -2,9 +2,9 @@ PARSE ERROR: Argument: -f (--floatTest)
More than one valid value parsed from string '1.0.0'
Brief USAGE:
../examples/test3 [-f=<float>] ... [-i=<int>] ...
--stringTest=<string> [-B] [--] [--version] [-h]
<string> <string> <fileNameString> ...
../examples/test3 [-f=<float>] ... [-i=<int>] ... --stringTest=<string>
[-B] [--] [--version] [-h] <string> <string>
<fileNameString> ...
For complete USAGE and HELP type:
../examples/test3 --help

2
tests/test38.out
View File

@ -9,7 +9,7 @@ Brief USAGE:
<filename>] [-x <filename>] [-s
<name string>] [-d] [-g <negative
int>] [-f <negative int>] -n <homer
|marge|bart|lisa|maggie> ... [--]
|marge|bart|lisa|maggie> ... [--]
[--version] [-h] <1|2|3> ...
For complete USAGE and HELP type:

2
tests/test39.out
View File

@ -9,7 +9,7 @@ Brief USAGE:
<filename>] [-x <filename>] [-s
<name string>] [-d] [-g <negative
int>] [-f <negative int>] -n <homer
|marge|bart|lisa|maggie> ... [--]
|marge|bart|lisa|maggie> ... [--]
[--version] [-h] <1|2|3> ...
For complete USAGE and HELP type:

6
tests/test42.out
View File

@ -1,9 +1,9 @@
USAGE:
../examples/test3 [-f=<float>] ... [-i=<int>] ...
--stringTest=<string> [-B] [--] [--version] [-h]
<string> <string> <fileNameString> ...
../examples/test3 [-f=<float>] ... [-i=<int>] ... --stringTest=<string>
[-B] [--] [--version] [-h] <string> <string>
<fileNameString> ...
Where:

4
tests/test44.out
View File

@ -2,8 +2,8 @@
USAGE:
../examples/test5 {-a <string>|-b <string>} {--eee <string>|--fff
<string>|-g <string>} {-i <string> ... |-j <string>
... } [--ddd] -c <string> [--] [--version] [-h]
<string>|-g <string>} {-i <string> ...|-j <string>
...} [--ddd] -c <string> [--] [--version] [-h]
Where:

2
tests/test46.out
View File

@ -8,7 +8,7 @@ USAGE:
<filename>] [-x <filename>] [-s
<name string>] [-d] [-g <negative
int>] [-f <negative int>] -n <homer
|marge|bart|lisa|maggie> ... [--]
|marge|bart|lisa|maggie> ... [--]
[--version] [-h] <1|2|3> ...

6
tests/test49.out
View File

@ -2,9 +2,9 @@ PARSE ERROR: Argument: -s (--stringTest)
Couldn't find delimiter for this argument!
Brief USAGE:
../examples/test8 [-f=<float>] ... [-i=<int>] ... -s=<string> [-B]
[--] [--version] [-h] <string> <string>
<fileNameString> ...
../examples/test8 [-f=<float>] ... [-i=<int>] ... -s=<string> [-B] [--]
[--version] [-h] <string> <string> <fileNameString>
...
For complete USAGE and HELP type:
../examples/test8 --help

6
tests/test50.out
View File

@ -2,9 +2,9 @@ PARSE ERROR: Argument: -s (--stringTest)
Couldn't find delimiter for this argument!
Brief USAGE:
../examples/test8 [-f=<float>] ... [-i=<int>] ... -s=<string> [-B]
[--] [--version] [-h] <string> <string>
<fileNameString> ...
../examples/test8 [-f=<float>] ... [-i=<int>] ... -s=<string> [-B] [--]
[--version] [-h] <string> <string> <fileNameString>
...
For complete USAGE and HELP type:
../examples/test8 --help

6
tests/test51.out
View File

@ -2,9 +2,9 @@ PARSE ERROR:
Required argument missing: unTest2
Brief USAGE:
../examples/test8 [-f=<float>] ... [-i=<int>] ... -s=<string> [-B]
[--] [--version] [-h] <string> <string>
<fileNameString> ...
../examples/test8 [-f=<float>] ... [-i=<int>] ... -s=<string> [-B] [--]
[--version] [-h] <string> <string> <fileNameString>
...
For complete USAGE and HELP type:
../examples/test8 --help

6
tests/test52.out
View File

@ -2,9 +2,9 @@ PARSE ERROR: Argument: -i (--intTest)
Couldn't read argument value from string '9a'
Brief USAGE:
../examples/test8 [-f=<float>] ... [-i=<int>] ... -s=<string> [-B]
[--] [--version] [-h] <string> <string>
<fileNameString> ...
../examples/test8 [-f=<float>] ... [-i=<int>] ... -s=<string> [-B] [--]
[--version] [-h] <string> <string> <fileNameString>
...
For complete USAGE and HELP type:
../examples/test8 --help

6
tests/test53.out
View File

@ -2,9 +2,9 @@ PARSE ERROR: Argument: -f (--floatTest)
More than one valid value parsed from string '1.0.0'
Brief USAGE:
../examples/test8 [-f=<float>] ... [-i=<int>] ... -s=<string> [-B]
[--] [--version] [-h] <string> <string>
<fileNameString> ...
../examples/test8 [-f=<float>] ... [-i=<int>] ... -s=<string> [-B] [--]
[--version] [-h] <string> <string> <fileNameString>
...
For complete USAGE and HELP type:
../examples/test8 --help

6
tests/test54.out
View File

@ -1,9 +1,9 @@
USAGE:
../examples/test8 [-f=<float>] ... [-i=<int>] ... -s=<string> [-B]
[--] [--version] [-h] <string> <string>
<fileNameString> ...
../examples/test8 [-f=<float>] ... [-i=<int>] ... -s=<string> [-B] [--]
[--version] [-h] <string> <string> <fileNameString>
...
Where:

4
tests/test57.out
View File

@ -3,8 +3,8 @@ PARSE ERROR: Argument: -i (--iii)
Brief USAGE:
../examples/test5 {-a <string>|-b <string>} {--eee <string>|--fff
<string>|-g <string>} {-i <string> ... |-j <string>
... } [--ddd] -c <string> [--] [--version] [-h]
<string>|-g <string>} {-i <string> ...|-j <string>
...} [--ddd] -c <string> [--] [--version] [-h]
For complete USAGE and HELP type:
../examples/test5 --help

2
tests/test60.out
View File

@ -4,7 +4,7 @@ PARSE ERROR: Argument: -r (--reverse)
USAGE:
../examples/test9 [-N] ... [-V] ... [-r] [--] <won't see this>
../examples/test9 [-N] ... [-V] ... [-r] [--] <won't see this>
Where:

2
tests/test66.out
View File

@ -2,7 +2,7 @@ PARSE ERROR:
Required argument missing: vect
Brief USAGE:
../examples/test12 -v <3D vector> ... [--] [--version] [-h]
../examples/test12 -v <3D vector> ... [--] [--version] [-h]
For complete USAGE and HELP type:
../examples/test12 --help

2
tests/test67.out
View File

@ -2,7 +2,7 @@ PARSE ERROR: Argument: -v (--vect)
a 1 0.3 is not a 3D vector
Brief USAGE:
../examples/test12 -v <3D vector> ... [--] [--version] [-h]
../examples/test12 -v <3D vector> ... [--] [--version] [-h]
For complete USAGE and HELP type:
../examples/test12 --help