RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

Some cleanup. Use a class (OptionInfo) instead of a pair of a pair and remove

Browse Source 
some default values that are not used.

llvm-svn: 110485
This commit is contained in:
Rafael Espindola 2010-08-06 23:03:52 +00:00
parent 6944ea9801
commit 2145c31de3
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/PassSupport.h
View File

@ -53,8 +53,7 @@ public:
/// PassInfo ctor - Do not call this directly, this should only be invoked
/// through RegisterPass.
PassInfo(const char *name, const char *arg, const void *pi,
NormalCtor_t normal = 0,
bool isCFGOnly = false, bool is_analysis = false)
NormalCtor_t normal, bool isCFGOnly, bool is_analysis)
: PassName(name), PassArgument(arg), PassID(pi),
IsCFGOnlyPass(isCFGOnly),
IsAnalysis(is_analysis), IsAnalysisGroup(false), NormalCtor(normal) {

23
include/llvm/Support/CommandLine.h
View File

@ -443,16 +443,23 @@ protected:
template <class DataType>
class parser : public generic_parser_base {
protected:
SmallVector<std::pair<const char *,
std::pair<DataType, const char *> >, 8> Values;
class OptionInfo {
public:
OptionInfo(const char *name, DataType v, const char *helpStr) :
Name(name), V(v), HelpStr(helpStr) {}
const char *Name;
DataType V;
const char *HelpStr;
};
SmallVector<OptionInfo, 8> Values;
public:
typedef DataType parser_data_type;
// Implement virtual functions needed by generic_parser_base
unsigned getNumOptions() const { return unsigned(Values.size()); }
const char *getOption(unsigned N) const { return Values[N].first; }
const char *getOption(unsigned N) const { return Values[N].Name; }
const char *getDescription(unsigned N) const {
return Values[N].second.second;
return Values[N].HelpStr;
}
// parse - Return true on error.
@ -465,8 +472,8 @@ public:
for (unsigned i = 0, e = static_cast<unsigned>(Values.size());
i != e; ++i)
if (Values[i].first == ArgVal) {
V = Values[i].second.first;
if (Values[i].Name == ArgVal) {
V = Values[i].V;
return false;
}
@ -478,8 +485,8 @@ public:
template <class DT>
void addLiteralOption(const char *Name, const DT &V, const char *HelpStr) {
assert(findOption(Name) == Values.size() && "Option already exists!");
Values.push_back(std::make_pair(Name,
std::make_pair(static_cast<DataType>(V),HelpStr)));
OptionInfo X(Name, static_cast<DataType>(V), HelpStr);
Values.push_back(X);
MarkOptionsChanged();
}

5
include/llvm/Support/PassNameParser.h
View File

@ -78,10 +78,9 @@ public:
virtual void passEnumerate(const PassInfo *P) { passRegistered(P); }
// ValLessThan - Provide a sorting comparator for Values elements...
typedef std::pair<const char*,
std::pair<const PassInfo*, const char*> > ValType;
typedef PassNameParser::OptionInfo ValType;
static bool ValLessThan(const ValType &VT1, const ValType &VT2) {
return std::string(VT1.first) < std::string(VT2.first);
return std::string(VT1.Name) < std::string(VT2.Name);
}
// printOptionInfo - Print out information about this option. Override the