Driver: Provide Arg::render implementations.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67182 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Driver/Arg.cpp b/lib/Driver/Arg.cpp
index 6a860b6..fa8e233 100644
--- a/lib/Driver/Arg.cpp
+++ b/lib/Driver/Arg.cpp
@@ -55,7 +55,7 @@
}
void FlagArg::render(const ArgList &Args, ArgStringList &Output) const {
- assert(0 && "FIXME: Implement");
+ Output.push_back(Args.getArgString(getIndex()));
}
const char *FlagArg::getValue(const ArgList &Args, unsigned N) const {
@@ -68,7 +68,7 @@
}
void PositionalArg::render(const ArgList &Args, ArgStringList &Output) const {
- assert(0 && "FIXME: Implement");
+ Output.push_back(Args.getArgString(getIndex()));
}
const char *PositionalArg::getValue(const ArgList &Args, unsigned N) const {
@@ -81,7 +81,12 @@
}
void JoinedArg::render(const ArgList &Args, ArgStringList &Output) const {
- assert(0 && "FIXME: Implement");
+ if (getOption().hasForceSeparateRender()) {
+ Output.push_back(getOption().getName());
+ Output.push_back(getValue(Args, 0));
+ } else {
+ Output.push_back(Args.getArgString(getIndex()));
+ }
}
const char *JoinedArg::getValue(const ArgList &Args, unsigned N) const {
@@ -110,7 +115,7 @@
}
void CommaJoinedArg::render(const ArgList &Args, ArgStringList &Output) const {
- assert(0 && "FIXME: Implement");
+ Output.push_back(Args.getArgString(getIndex()));
}
const char *CommaJoinedArg::getValue(const ArgList &Args, unsigned N) const {
@@ -123,7 +128,17 @@
}
void SeparateArg::render(const ArgList &Args, ArgStringList &Output) const {
- assert(0 && "FIXME: Implement");
+ if (getOption().hasForceJoinedRender()) {
+ assert(getNumValues() == 1 && "Cannot force joined render with > 1 args.");
+ // FIXME: Avoid std::string.
+ std::string Joined(getOption().getName());
+ Joined += Args.getArgString(getIndex());
+ Output.push_back(Args.MakeArgString(Joined.c_str()));
+ } else {
+ Output.push_back(Args.getArgString(getIndex()));
+ for (unsigned i = 0; i < NumValues; ++i)
+ Output.push_back(Args.getArgString(getIndex() + 1 + i));
+ }
}
const char *SeparateArg::getValue(const ArgList &Args, unsigned N) const {
@@ -137,7 +152,8 @@
void JoinedAndSeparateArg::render(const ArgList &Args,
ArgStringList &Output) const {
- assert(0 && "FIXME: Implement");
+ Output.push_back(Args.getArgString(getIndex()));
+ Output.push_back(Args.getArgString(getIndex()) + 1);
}
const char *JoinedAndSeparateArg::getValue(const ArgList &Args,