6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 04:30:23 +00:00
Code Issues Projects Releases Wiki Activity

ArrayRef-ify ParseArgs

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240233 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2015-06-21 06:31:53 +00:00
parent 87ae2e8ab0
commit 006bce7764
4 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/Option/OptTable.h
View File

@ -10,6 +10,7 @@
#ifndef LLVM_OPTION_OPTTABLE_H #ifndef LLVM_OPTION_OPTTABLE_H
#define LLVM_OPTION_OPTTABLE_H #define LLVM_OPTION_OPTTABLE_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/StringSet.h" #include "llvm/ADT/StringSet.h"
#include "llvm/Option/OptSpecifier.h" #include "llvm/Option/OptSpecifier.h"
@ -152,10 +153,8 @@ public:
/// is the default and means exclude nothing. /// is the default and means exclude nothing.
/// \return An InputArgList; on error this will contain all the options /// \return An InputArgList; on error this will contain all the options
/// which could be parsed. /// which could be parsed.
InputArgList *ParseArgs(const char* const *ArgBegin, InputArgList *ParseArgs(ArrayRef<const char *> Args,
const char* const *ArgEnd, unsigned &MissingArgIndex, unsigned &MissingArgCount,
unsigned &MissingArgIndex,
unsigned &MissingArgCount,
unsigned FlagsToInclude = 0, unsigned FlagsToInclude = 0,
unsigned FlagsToExclude = 0) const; unsigned FlagsToExclude = 0) const;

4
lib/LibDriver/LibDriver.cpp
View File

@ -114,8 +114,8 @@ int llvm::libDriverMain(int Argc, const char **Argv) {
LibOptTable Table; LibOptTable Table;
unsigned MissingIndex; unsigned MissingIndex;
unsigned MissingCount; unsigned MissingCount;
std::unique_ptr<llvm::opt::InputArgList> Args( std::unique_ptr<llvm::opt::InputArgList> Args(Table.ParseArgs(
Table.ParseArgs(&Argv[1], &Argv[Argc], MissingIndex, MissingCount)); makeArrayRef(Argv, Argc).slice(1), MissingIndex, MissingCount));
if (MissingCount) { if (MissingCount) {
llvm::errs() << "missing arg value for \"" llvm::errs() << "missing arg value for \""
<< Args->getArgString(MissingIndex) << Args->getArgString(MissingIndex)

7
lib/Option/OptTable.cpp
View File

@ -247,18 +247,17 @@ Arg *OptTable::ParseOneArg(const ArgList &Args, unsigned &Index,
return new Arg(getOption(TheUnknownOptionID), Str, Index++, Str); return new Arg(getOption(TheUnknownOptionID), Str, Index++, Str);
} }
InputArgList *OptTable::ParseArgs(const char *const *ArgBegin, InputArgList *OptTable::ParseArgs(ArrayRef<const char *> ArgArr,
const char *const *ArgEnd,
unsigned &MissingArgIndex, unsigned &MissingArgIndex,
unsigned &MissingArgCount, unsigned &MissingArgCount,
unsigned FlagsToInclude, unsigned FlagsToInclude,
unsigned FlagsToExclude) const { unsigned FlagsToExclude) const {
InputArgList *Args = new InputArgList(ArgBegin, ArgEnd); InputArgList *Args = new InputArgList(ArgArr.begin(), ArgArr.end());
// FIXME: Handle '@' args (or at least error on them). // FIXME: Handle '@' args (or at least error on them).
MissingArgIndex = MissingArgCount = 0; MissingArgIndex = MissingArgCount = 0;
unsigned Index = 0, End = ArgEnd - ArgBegin; unsigned Index = 0, End = ArgArr.size();
while (Index < End) { while (Index < End) {
// Ingore nullptrs, they are response file's EOL markers // Ingore nullptrs, they are response file's EOL markers
if (Args->getArgString(Index) == nullptr) { if (Args->getArgString(Index) == nullptr) {

30
unittests/Option/OptionParsingTest.cpp
View File

@ -67,8 +67,7 @@ const char *Args[] = {
TEST(Option, OptionParsing) { TEST(Option, OptionParsing) {
TestOptTable T; TestOptTable T;
unsigned MAI, MAC; unsigned MAI, MAC;
std::unique_ptr<InputArgList> AL( std::unique_ptr<InputArgList> AL(T.ParseArgs(Args, MAI, MAC));
T.ParseArgs(std::begin(Args), std::end(Args), MAI, MAC));
// Check they all exist. // Check they all exist.
EXPECT_TRUE(AL->hasArg(OPT_A)); EXPECT_TRUE(AL->hasArg(OPT_A));
@ -114,7 +113,7 @@ TEST(Option, ParseWithFlagExclusions) {
std::unique_ptr<InputArgList> AL; std::unique_ptr<InputArgList> AL;
// Exclude flag3 to avoid parsing as OPT_SLASH_C. // Exclude flag3 to avoid parsing as OPT_SLASH_C.
AL.reset(T.ParseArgs(std::begin(Args), std::end(Args), MAI, MAC, AL.reset(T.ParseArgs(Args, MAI, MAC,
/*FlagsToInclude=*/0, /*FlagsToInclude=*/0,
/*FlagsToExclude=*/OptFlag3)); /*FlagsToExclude=*/OptFlag3));
EXPECT_TRUE(AL->hasArg(OPT_A)); EXPECT_TRUE(AL->hasArg(OPT_A));
@ -122,7 +121,7 @@ TEST(Option, ParseWithFlagExclusions) {
EXPECT_FALSE(AL->hasArg(OPT_SLASH_C)); EXPECT_FALSE(AL->hasArg(OPT_SLASH_C));
// Exclude flag1 to avoid parsing as OPT_C. // Exclude flag1 to avoid parsing as OPT_C.
AL.reset(T.ParseArgs(std::begin(Args), std::end(Args), MAI, MAC, AL.reset(T.ParseArgs(Args, MAI, MAC,
/*FlagsToInclude=*/0, /*FlagsToInclude=*/0,
/*FlagsToExclude=*/OptFlag1)); /*FlagsToExclude=*/OptFlag1));
EXPECT_TRUE(AL->hasArg(OPT_B)); EXPECT_TRUE(AL->hasArg(OPT_B));
@ -130,7 +129,7 @@ TEST(Option, ParseWithFlagExclusions) {
EXPECT_TRUE(AL->hasArg(OPT_SLASH_C)); EXPECT_TRUE(AL->hasArg(OPT_SLASH_C));
const char *NewArgs[] = { "/C", "foo", "--C=bar" }; const char *NewArgs[] = { "/C", "foo", "--C=bar" };
AL.reset(T.ParseArgs(std::begin(NewArgs), std::end(NewArgs), MAI, MAC)); AL.reset(T.ParseArgs(NewArgs, MAI, MAC));
EXPECT_TRUE(AL->hasArg(OPT_SLASH_C)); EXPECT_TRUE(AL->hasArg(OPT_SLASH_C));
EXPECT_TRUE(AL->hasArg(OPT_C)); EXPECT_TRUE(AL->hasArg(OPT_C));
EXPECT_EQ(AL->getLastArgValue(OPT_SLASH_C), "foo"); EXPECT_EQ(AL->getLastArgValue(OPT_SLASH_C), "foo");
@ -142,8 +141,7 @@ TEST(Option, ParseAliasInGroup) {
unsigned MAI, MAC; unsigned MAI, MAC;
const char *MyArgs[] = { "-I" }; const char *MyArgs[] = { "-I" };
std::unique_ptr<InputArgList> AL( std::unique_ptr<InputArgList> AL(T.ParseArgs(MyArgs, MAI, MAC));
T.ParseArgs(std::begin(MyArgs), std::end(MyArgs), MAI, MAC));
EXPECT_TRUE(AL->hasArg(OPT_H)); EXPECT_TRUE(AL->hasArg(OPT_H));
} }
@ -152,8 +150,7 @@ TEST(Option, AliasArgs) {
unsigned MAI, MAC; unsigned MAI, MAC;
const char *MyArgs[] = { "-J", "-Joo" }; const char *MyArgs[] = { "-J", "-Joo" };
std::unique_ptr<InputArgList> AL( std::unique_ptr<InputArgList> AL(T.ParseArgs(MyArgs, MAI, MAC));
T.ParseArgs(std::begin(MyArgs), std::end(MyArgs), MAI, MAC));
EXPECT_TRUE(AL->hasArg(OPT_B)); EXPECT_TRUE(AL->hasArg(OPT_B));
EXPECT_EQ(AL->getAllArgValues(OPT_B)[0], "foo"); EXPECT_EQ(AL->getAllArgValues(OPT_B)[0], "foo");
EXPECT_EQ(AL->getAllArgValues(OPT_B)[1], "bar"); EXPECT_EQ(AL->getAllArgValues(OPT_B)[1], "bar");
@ -164,8 +161,7 @@ TEST(Option, IgnoreCase) {
unsigned MAI, MAC; unsigned MAI, MAC;
const char *MyArgs[] = { "-a", "-joo" }; const char *MyArgs[] = { "-a", "-joo" };
std::unique_ptr<InputArgList> AL( std::unique_ptr<InputArgList> AL(T.ParseArgs(MyArgs, MAI, MAC));
T.ParseArgs(std::begin(MyArgs), std::end(MyArgs), MAI, MAC));
EXPECT_TRUE(AL->hasArg(OPT_A)); EXPECT_TRUE(AL->hasArg(OPT_A));
EXPECT_TRUE(AL->hasArg(OPT_B)); EXPECT_TRUE(AL->hasArg(OPT_B));
} }
@ -175,8 +171,7 @@ TEST(Option, DoNotIgnoreCase) {
unsigned MAI, MAC; unsigned MAI, MAC;
const char *MyArgs[] = { "-a", "-joo" }; const char *MyArgs[] = { "-a", "-joo" };
std::unique_ptr<InputArgList> AL( std::unique_ptr<InputArgList> AL(T.ParseArgs(MyArgs, MAI, MAC));
T.ParseArgs(std::begin(MyArgs), std::end(MyArgs), MAI, MAC));
EXPECT_FALSE(AL->hasArg(OPT_A)); EXPECT_FALSE(AL->hasArg(OPT_A));
EXPECT_FALSE(AL->hasArg(OPT_B)); EXPECT_FALSE(AL->hasArg(OPT_B));
} }
@ -186,8 +181,7 @@ TEST(Option, SlurpEmpty) {
unsigned MAI, MAC; unsigned MAI, MAC;
const char *MyArgs[] = { "-A", "-slurp" }; const char *MyArgs[] = { "-A", "-slurp" };
std::unique_ptr<InputArgList> AL( std::unique_ptr<InputArgList> AL(T.ParseArgs(MyArgs, MAI, MAC));
T.ParseArgs(std::begin(MyArgs), std::end(MyArgs), MAI, MAC));
EXPECT_TRUE(AL->hasArg(OPT_A)); EXPECT_TRUE(AL->hasArg(OPT_A));
EXPECT_TRUE(AL->hasArg(OPT_Slurp)); EXPECT_TRUE(AL->hasArg(OPT_Slurp));
EXPECT_EQ(AL->getAllArgValues(OPT_Slurp).size(), 0U); EXPECT_EQ(AL->getAllArgValues(OPT_Slurp).size(), 0U);
@ -198,8 +192,7 @@ TEST(Option, Slurp) {
unsigned MAI, MAC; unsigned MAI, MAC;
const char *MyArgs[] = { "-A", "-slurp", "-B", "--", "foo" }; const char *MyArgs[] = { "-A", "-slurp", "-B", "--", "foo" };
std::unique_ptr<InputArgList> AL( std::unique_ptr<InputArgList> AL(T.ParseArgs(MyArgs, MAI, MAC));
T.ParseArgs(std::begin(MyArgs), std::end(MyArgs), MAI, MAC));
EXPECT_EQ(AL->size(), 2U); EXPECT_EQ(AL->size(), 2U);
EXPECT_TRUE(AL->hasArg(OPT_A)); EXPECT_TRUE(AL->hasArg(OPT_A));
EXPECT_FALSE(AL->hasArg(OPT_B)); EXPECT_FALSE(AL->hasArg(OPT_B));
@ -216,8 +209,7 @@ TEST(Option, FlagAliasToJoined) {
// Check that a flag alias provides an empty argument to a joined option. // Check that a flag alias provides an empty argument to a joined option.
const char *MyArgs[] = { "-K" }; const char *MyArgs[] = { "-K" };
std::unique_ptr<InputArgList> AL( std::unique_ptr<InputArgList> AL(T.ParseArgs(MyArgs, MAI, MAC));
T.ParseArgs(std::begin(MyArgs), std::end(MyArgs), MAI, MAC));
EXPECT_EQ(AL->size(), 1U); EXPECT_EQ(AL->size(), 1U);
EXPECT_TRUE(AL->hasArg(OPT_B)); EXPECT_TRUE(AL->hasArg(OPT_B));
EXPECT_EQ(AL->getAllArgValues(OPT_B).size(), 1U); EXPECT_EQ(AL->getAllArgValues(OPT_B).size(), 1U);