diff options
| -rw-r--r-- | llvm/include/llvm/Option/ArgList.h | 4 | ||||
| -rw-r--r-- | llvm/lib/Option/ArgList.cpp | 27 |
2 files changed, 26 insertions, 5 deletions
diff --git a/llvm/include/llvm/Option/ArgList.h b/llvm/include/llvm/Option/ArgList.h index 89771b5c3cf..53cb0d8dec4 100644 --- a/llvm/include/llvm/Option/ArgList.h +++ b/llvm/include/llvm/Option/ArgList.h @@ -259,6 +259,10 @@ public: void AddLastArg(ArgStringList &Output, OptSpecifier Id0, OptSpecifier Id1) const; + /// AddAllArgsExcept - Render all arguments matching any of the given ids + /// and not matching any of the excluded ids. + void AddAllArgsExcept(ArgStringList &Output, ArrayRef<OptSpecifier> Ids, + ArrayRef<OptSpecifier> ExcludeIds) const; /// AddAllArgs - Render all arguments matching any of the given ids. void AddAllArgs(ArgStringList &Output, ArrayRef<OptSpecifier> Ids) const; diff --git a/llvm/lib/Option/ArgList.cpp b/llvm/lib/Option/ArgList.cpp index d5c4a7e458b..f94de866ef3 100644 --- a/llvm/lib/Option/ArgList.cpp +++ b/llvm/lib/Option/ArgList.cpp @@ -259,19 +259,36 @@ void ArgList::AddLastArg(ArgStringList &Output, OptSpecifier Id0, } } -void ArgList::AddAllArgs(ArgStringList &Output, - ArrayRef<OptSpecifier> Ids) const { +void ArgList::AddAllArgsExcept(ArgStringList &Output, + ArrayRef<OptSpecifier> Ids, + ArrayRef<OptSpecifier> ExcludeIds) const { for (const Arg *Arg : Args) { - for (OptSpecifier Id : Ids) { + bool Excluded = false; + for (OptSpecifier Id : ExcludeIds) { if (Arg->getOption().matches(Id)) { - Arg->claim(); - Arg->render(*this, Output); + Excluded = true; break; } } + if (!Excluded) { + for (OptSpecifier Id : Ids) { + if (Arg->getOption().matches(Id)) { + Arg->claim(); + Arg->render(*this, Output); + break; + } + } + } } } +/// This is a nicer interface when you don't have a list of Ids to exclude. +void ArgList::AddAllArgs(ArgStringList &Output, + ArrayRef<OptSpecifier> Ids) const { + ArrayRef<OptSpecifier> Exclude = None; + AddAllArgsExcept(Output, Ids, Exclude); +} + /// 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, |
