6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-18 14:31:27 +00:00
Code Issues Projects Releases Wiki Activity

If an invalid alternative is listed for an argument, print the valid options

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1604 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-01-31 00:42:56 +00:00
parent 93193f8063
commit 9c9be48b83
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Support/CommandLine.cpp
View File

@ -34,7 +34,7 @@ static map<string, Option*> &getOpts() {
static void AddArgument(const string &ArgName, Option *Opt) { static void AddArgument(const string &ArgName, Option *Opt) {
if (getOpts().find(ArgName) != getOpts().end()) { if (getOpts().find(ArgName) != getOpts().end()) {
cerr << "CommandLine Error: Argument '" << ArgName cerr << "CommandLine Error: Argument '" << ArgName
<< "' specified more than once!\n"; << "' defined more than once!\n";
} else { } else {
// Add argument to the argument map! // Add argument to the argument map!
getOpts().insert(std::make_pair(ArgName, Opt)); getOpts().insert(std::make_pair(ArgName, Opt));
@ -335,8 +335,17 @@ bool EnumValueBase::handleOccurance(const char *ArgName, const string &Arg) {
unsigned i; unsigned i;
for (i = 0; i < ValueMap.size(); ++i) for (i = 0; i < ValueMap.size(); ++i)
if (ValueMap[i].first == Arg) break; if (ValueMap[i].first == Arg) break;
if (i == ValueMap.size())
return error(": unrecognized alternative '"+Arg+"'!"); if (i == ValueMap.size()) {
string Alternatives;
for (i = 0; i < ValueMap.size(); ++i) {
if (i) Alternatives += ", ";
Alternatives += ValueMap[i].first;
}
return error(": unrecognized alternative '" + Arg +
"'! Alternatives are: " + Alternatives);
}
Value = ValueMap[i].second.first; Value = ValueMap[i].second.first;
return false; return false;
} }

15
support/lib/Support/CommandLine.cpp
View File

@ -34,7 +34,7 @@ static map<string, Option*> &getOpts() {
static void AddArgument(const string &ArgName, Option *Opt) { static void AddArgument(const string &ArgName, Option *Opt) {
if (getOpts().find(ArgName) != getOpts().end()) { if (getOpts().find(ArgName) != getOpts().end()) {
cerr << "CommandLine Error: Argument '" << ArgName cerr << "CommandLine Error: Argument '" << ArgName
<< "' specified more than once!\n"; << "' defined more than once!\n";
} else { } else {
// Add argument to the argument map! // Add argument to the argument map!
getOpts().insert(std::make_pair(ArgName, Opt)); getOpts().insert(std::make_pair(ArgName, Opt));
@ -335,8 +335,17 @@ bool EnumValueBase::handleOccurance(const char *ArgName, const string &Arg) {
unsigned i; unsigned i;
for (i = 0; i < ValueMap.size(); ++i) for (i = 0; i < ValueMap.size(); ++i)
if (ValueMap[i].first == Arg) break; if (ValueMap[i].first == Arg) break;
if (i == ValueMap.size())
return error(": unrecognized alternative '"+Arg+"'!"); if (i == ValueMap.size()) {
string Alternatives;
for (i = 0; i < ValueMap.size(); ++i) {
if (i) Alternatives += ", ";
Alternatives += ValueMap[i].first;
}
return error(": unrecognized alternative '" + Arg +
"'! Alternatives are: " + Alternatives);
}
Value = ValueMap[i].second.first; Value = ValueMap[i].second.first;
return false; return false;
} }