summaryrefslogtreecommitdiffstats
path: root/contrib/llvm/lib/Option
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/llvm/lib/Option')
-rw-r--r--contrib/llvm/lib/Option/Arg.cpp21
-rw-r--r--contrib/llvm/lib/Option/ArgList.cpp25
-rw-r--r--contrib/llvm/lib/Option/OptTable.cpp12
-rw-r--r--contrib/llvm/lib/Option/Option.cpp31
4 files changed, 59 insertions, 30 deletions
diff --git a/contrib/llvm/lib/Option/Arg.cpp b/contrib/llvm/lib/Option/Arg.cpp
index ac00073..c3de2d1 100644
--- a/contrib/llvm/lib/Option/Arg.cpp
+++ b/contrib/llvm/lib/Option/Arg.cpp
@@ -13,6 +13,7 @@
#include "llvm/Option/ArgList.h"
#include "llvm/Option/Option.h"
#include "llvm/Support/raw_ostream.h"
+#include "llvm/Support/Debug.h"
using namespace llvm;
using namespace llvm::opt;
@@ -43,23 +44,25 @@ Arg::~Arg() {
}
}
-void Arg::dump() const {
- llvm::errs() << "<";
+void Arg::print(raw_ostream& O) const {
+ O << "<";
- llvm::errs() << " Opt:";
- Opt.dump();
+ O << " Opt:";
+ Opt.print(O);
- llvm::errs() << " Index:" << Index;
+ O << " Index:" << Index;
- llvm::errs() << " Values: [";
+ O << " Values: [";
for (unsigned i = 0, e = Values.size(); i != e; ++i) {
- if (i) llvm::errs() << ", ";
- llvm::errs() << "'" << Values[i] << "'";
+ if (i) O << ", ";
+ O << "'" << Values[i] << "'";
}
- llvm::errs() << "]>\n";
+ O << "]>\n";
}
+LLVM_DUMP_METHOD void Arg::dump() const { print(dbgs()); }
+
std::string Arg::getAsString(const ArgList &Args) const {
SmallString<256> Res;
llvm::raw_svector_ostream OS(Res);
diff --git a/contrib/llvm/lib/Option/ArgList.cpp b/contrib/llvm/lib/Option/ArgList.cpp
index a74ead6..0826ef8 100644
--- a/contrib/llvm/lib/Option/ArgList.cpp
+++ b/contrib/llvm/lib/Option/ArgList.cpp
@@ -13,6 +13,7 @@
#include "llvm/ADT/Twine.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/Option.h"
+#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
using namespace llvm;
@@ -258,6 +259,21 @@ void ArgList::AddLastArg(ArgStringList &Output, OptSpecifier Id0,
}
}
+void ArgList::AddAllArgs(ArgStringList &Output,
+ ArrayRef<OptSpecifier> Ids) const {
+ for (const Arg *Arg : Args) {
+ for (OptSpecifier Id : Ids) {
+ if (Arg->getOption().matches(Id)) {
+ Arg->claim();
+ Arg->render(*this, Output);
+ break;
+ }
+ }
+ }
+}
+
+/// This 3-opt variant of AddAllArgs could be eliminated in favor of one
+/// that accepts a single specifier, given the above which accepts any number.
void ArgList::AddAllArgs(ArgStringList &Output, OptSpecifier Id0,
OptSpecifier Id1, OptSpecifier Id2) const {
for (auto Arg: filtered(Id0, Id1, Id2)) {
@@ -313,6 +329,15 @@ const char *ArgList::GetOrMakeJoinedArgString(unsigned Index,
return MakeArgString(LHS + RHS);
}
+void ArgList::print(raw_ostream &O) const {
+ for (Arg *A : *this) {
+ O << "* ";
+ A->print(O);
+ }
+}
+
+LLVM_DUMP_METHOD void ArgList::dump() const { print(dbgs()); }
+
//
void InputArgList::releaseMemory() {
diff --git a/contrib/llvm/lib/Option/OptTable.cpp b/contrib/llvm/lib/Option/OptTable.cpp
index e83536f..09d4ceb 100644
--- a/contrib/llvm/lib/Option/OptTable.cpp
+++ b/contrib/llvm/lib/Option/OptTable.cpp
@@ -84,11 +84,9 @@ static inline bool operator<(const OptTable::Info &I, const char *Name) {
OptSpecifier::OptSpecifier(const Option *Opt) : ID(Opt->getID()) {}
-OptTable::OptTable(const Info *OptionInfos, unsigned NumOptionInfos,
- bool IgnoreCase)
- : OptionInfos(OptionInfos), NumOptionInfos(NumOptionInfos),
- IgnoreCase(IgnoreCase), TheInputOptionID(0), TheUnknownOptionID(0),
- FirstSearchableIndex(0) {
+OptTable::OptTable(ArrayRef<Info> OptionInfos, bool IgnoreCase)
+ : OptionInfos(OptionInfos), IgnoreCase(IgnoreCase), TheInputOptionID(0),
+ TheUnknownOptionID(0), FirstSearchableIndex(0) {
// Explicitly zero initialize the error to work around a bug in array
// value-initialization on MinGW with gcc 4.3.5.
@@ -199,8 +197,8 @@ Arg *OptTable::ParseOneArg(const ArgList &Args, unsigned &Index,
if (isInput(PrefixesUnion, Str))
return new Arg(getOption(TheInputOptionID), Str, Index++, Str);
- const Info *Start = OptionInfos + FirstSearchableIndex;
- const Info *End = OptionInfos + getNumOptions();
+ const Info *Start = OptionInfos.begin() + FirstSearchableIndex;
+ const Info *End = OptionInfos.end();
StringRef Name = StringRef(Str).ltrim(PrefixChars);
// Search for the first next option which could be a prefix.
diff --git a/contrib/llvm/lib/Option/Option.cpp b/contrib/llvm/lib/Option/Option.cpp
index 221414d..ebf05aa 100644
--- a/contrib/llvm/lib/Option/Option.cpp
+++ b/contrib/llvm/lib/Option/Option.cpp
@@ -11,6 +11,7 @@
#include "llvm/ADT/Twine.h"
#include "llvm/Option/Arg.h"
#include "llvm/Option/ArgList.h"
+#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
#include <algorithm>
@@ -35,10 +36,10 @@ Option::Option(const OptTable::Info *info, const OptTable *owner)
}
}
-void Option::dump() const {
- llvm::errs() << "<";
+void Option::print(raw_ostream &O) const {
+ O << "<";
switch (getKind()) {
-#define P(N) case N: llvm::errs() << #N; break
+#define P(N) case N: O << #N; break
P(GroupClass);
P(InputClass);
P(UnknownClass);
@@ -54,33 +55,35 @@ void Option::dump() const {
}
if (Info->Prefixes) {
- llvm::errs() << " Prefixes:[";
- for (const char * const *Pre = Info->Prefixes; *Pre != nullptr; ++Pre) {
- llvm::errs() << '"' << *Pre << (*(Pre + 1) == nullptr ? "\"" : "\", ");
+ O << " Prefixes:[";
+ for (const char *const *Pre = Info->Prefixes; *Pre != nullptr; ++Pre) {
+ O << '"' << *Pre << (*(Pre + 1) == nullptr ? "\"" : "\", ");
}
- llvm::errs() << ']';
+ O << ']';
}
- llvm::errs() << " Name:\"" << getName() << '"';
+ O << " Name:\"" << getName() << '"';
const Option Group = getGroup();
if (Group.isValid()) {
- llvm::errs() << " Group:";
- Group.dump();
+ O << " Group:";
+ Group.print(O);
}
const Option Alias = getAlias();
if (Alias.isValid()) {
- llvm::errs() << " Alias:";
- Alias.dump();
+ O << " Alias:";
+ Alias.print(O);
}
if (getKind() == MultiArgClass)
- llvm::errs() << " NumArgs:" << getNumArgs();
+ O << " NumArgs:" << getNumArgs();
- llvm::errs() << ">\n";
+ O << ">\n";
}
+void Option::dump() const { print(dbgs()); }
+
bool Option::matches(OptSpecifier Opt) const {
// Aliases are never considered in matching, look through them.
const Option Alias = getAlias();
OpenPOWER on IntegriCloud