diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Driver/Arg.cpp | 47 | ||||
| -rw-r--r-- | lib/Driver/Driver.cpp | 39 | ||||
| -rw-r--r-- | lib/Driver/Option.cpp | 11 |
3 files changed, 82 insertions, 15 deletions
diff --git a/lib/Driver/Arg.cpp b/lib/Driver/Arg.cpp index a4581d0e9e..52437e7772 100644 --- a/lib/Driver/Arg.cpp +++ b/lib/Driver/Arg.cpp @@ -8,6 +8,7 @@ //===----------------------------------------------------------------------===// #include "clang/Driver/Arg.h" +#include "clang/Driver/ArgList.h" #include "clang/Driver/Option.h" #include "llvm/Support/raw_ostream.h" @@ -28,6 +29,7 @@ void Arg::dump() const { default: assert(0 && "Invalid kind"); #define P(N) case N: llvm::errs() << #N; break + P(FlagClass); P(PositionalClass); P(JoinedClass); P(SeparateClass); @@ -49,6 +51,19 @@ void Arg::dump() const { llvm::errs().flush(); // FIXME } +FlagArg::FlagArg(const Option *Opt, unsigned Index) + : Arg(FlagClass, Opt, Index) { +} + +void FlagArg::render(const ArgList &Args, ArgStringList &Output) const { + assert(0 && "FIXME: Implement"); +} + +const char *FlagArg::getValue(const ArgList &Args, unsigned N) const { + assert(0 && "Invalid index."); + return 0; +} + PositionalArg::PositionalArg(const Option *Opt, unsigned Index) : Arg(PositionalClass, Opt, Index) { } @@ -58,7 +73,8 @@ void PositionalArg::render(const ArgList &Args, ArgStringList &Output) const { } const char *PositionalArg::getValue(const ArgList &Args, unsigned N) const { - assert(0 && "FIXME: Implement"); + assert(N < getNumValues() && "Invalid index."); + return Args.getArgString(getIndex()); } JoinedArg::JoinedArg(const Option *Opt, unsigned Index) @@ -70,12 +86,28 @@ void JoinedArg::render(const ArgList &Args, ArgStringList &Output) const { } const char *JoinedArg::getValue(const ArgList &Args, unsigned N) const { - assert(0 && "FIXME: Implement"); + assert(N < getNumValues() && "Invalid index."); + // FIXME: Avoid strlen. + return Args.getArgString(getIndex()) + strlen(getOption().getName()); } CommaJoinedArg::CommaJoinedArg(const Option *Opt, unsigned Index, - unsigned _NumValues) - : Arg(CommaJoinedClass, Opt, Index), NumValues(_NumValues) { + const char *Str) + : Arg(CommaJoinedClass, Opt, Index) { + const char *Prev = Str; + for (;; ++Str) { + char c = *Str; + + if (!c) { + if (Prev != Str) + Values.push_back(std::string(Prev, Str)); + break; + } else if (c == ',') { + if (Prev != Str) + Values.push_back(std::string(Prev, Str)); + Prev = Str + 1; + } + } } void CommaJoinedArg::render(const ArgList &Args, ArgStringList &Output) const { @@ -83,7 +115,8 @@ void CommaJoinedArg::render(const ArgList &Args, ArgStringList &Output) const { } const char *CommaJoinedArg::getValue(const ArgList &Args, unsigned N) const { - assert(0 && "FIXME: Implement"); + assert(N < getNumValues() && "Invalid index."); + return Values[N].c_str(); } SeparateArg::SeparateArg(const Option *Opt, unsigned Index, unsigned _NumValues) @@ -95,7 +128,8 @@ void SeparateArg::render(const ArgList &Args, ArgStringList &Output) const { } const char *SeparateArg::getValue(const ArgList &Args, unsigned N) const { - assert(0 && "FIXME: Implement"); + assert(N < getNumValues() && "Invalid index."); + return Args.getArgString(getIndex() + 1 + N); } JoinedAndSeparateArg::JoinedAndSeparateArg(const Option *Opt, unsigned Index) @@ -109,5 +143,6 @@ void JoinedAndSeparateArg::render(const ArgList &Args, const char *JoinedAndSeparateArg::getValue(const ArgList &Args, unsigned N) const { + assert(N < getNumValues() && "Invalid index."); assert(0 && "FIXME: Implement"); } diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index d3c959499a..541a6d8eeb 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -12,7 +12,10 @@ #include "clang/Driver/Arg.h" #include "clang/Driver/ArgList.h" #include "clang/Driver/Compilation.h" +#include "clang/Driver/Option.h" #include "clang/Driver/Options.h" + +#include "llvm/Support/raw_ostream.h" using namespace clang::driver; Driver::Driver() : Opts(new OptTable()) { @@ -23,6 +26,42 @@ Driver::~Driver() { delete Opts; } +ArgList *Driver::ParseArgStrings(const char **ArgBegin, const char **ArgEnd) { + ArgList *Args = new ArgList(ArgBegin, ArgEnd); + + unsigned Index = 0, End = ArgEnd - ArgBegin; + while (Index < End) { + unsigned Prev = Index; + Arg *A = getOpts().ParseOneArg(*Args, Index, End); + if (A) + Args->append(A); + + assert(Index > Prev && "Parser failed to consume argument."); + } + + return Args; +} + Compilation *Driver::BuildCompilation(int argc, const char **argv) { + ArgList *Args = ParseArgStrings(argv + 1, argv + argc); + + // Hard coded to print-options behavior. + unsigned i = 0; + for (ArgList::iterator it = Args->begin(), ie = Args->end(); + it != ie; ++it, ++i) { + Arg *A = *it; + llvm::errs() << "Option " << i << " - " + << "Name: \"" << A->getOption().getName() << "\", " + << "Values: {"; + for (unsigned j = 0; j < A->getNumValues(); ++j) { + if (j) + llvm::errs() << ", "; + llvm::errs() << '"' << A->getValue(*Args, j) << '"'; + } + llvm::errs() << "}\n"; + + llvm::errs().flush(); // FIXME + } + return new Compilation(); } diff --git a/lib/Driver/Option.cpp b/lib/Driver/Option.cpp index 43d7e9e476..73cef25a55 100644 --- a/lib/Driver/Option.cpp +++ b/lib/Driver/Option.cpp @@ -127,7 +127,7 @@ Arg *FlagOption::accept(const ArgList &Args, unsigned &Index) const { if (strlen(getName()) != strlen(Args.getArgString(Index))) return 0; - return new PositionalArg(this, Index++); + return new FlagArg(this, Index++); } JoinedOption::JoinedOption(options::ID ID, const char *Name, @@ -153,14 +153,7 @@ Arg *CommaJoinedOption::accept(const ArgList &Args, unsigned &Index) const { // Get the suffix string. // FIXME: Avoid strlen, and move to helper method? const char *Suffix = Args.getArgString(Index) + strlen(getName()); - const char *SuffixEnd = Suffix + strlen(Suffix); - - // Degenerate case, exact match has no values. - if (Suffix == SuffixEnd) - return new CommaJoinedArg(this, Index++, 0); - - return new CommaJoinedArg(this, Index++, - std::count(Suffix, SuffixEnd, ',') + 1); + return new CommaJoinedArg(this, Index++, Suffix); } SeparateOption::SeparateOption(options::ID ID, const char *Name, |