If an invalid alternative is listed for an argument, print the valid options
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1604 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp
index 549f42c..d396627 100644
--- a/lib/Support/CommandLine.cpp
+++ b/lib/Support/CommandLine.cpp
@@ -34,7 +34,7 @@
static void AddArgument(const string &ArgName, Option *Opt) {
if (getOpts().find(ArgName) != getOpts().end()) {
cerr << "CommandLine Error: Argument '" << ArgName
- << "' specified more than once!\n";
+ << "' defined more than once!\n";
} else {
// Add argument to the argument map!
getOpts().insert(std::make_pair(ArgName, Opt));
@@ -335,8 +335,17 @@
unsigned i;
for (i = 0; i < ValueMap.size(); ++i)
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;
return false;
}