Skip to content

Commit 06b83fd

Browse files
committed
[TableGen] NFC: Switch to range-based for loops in OptParserEmitter
This simplifies the code a bit. No functionality change. Reviewed By: dexonsmith Differential Revision: https://reviews.llvm.org/D93526
1 parent d6abd73 commit 06b83fd

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

llvm/utils/TableGen/OptParserEmitter.cpp

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,7 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
219219
PrefixesT Prefixes;
220220
Prefixes.insert(std::make_pair(PrefixKeyT(), "prefix_0"));
221221
unsigned CurPrefix = 0;
222-
for (unsigned i = 0, e = Opts.size(); i != e; ++i) {
223-
const Record &R = *Opts[i];
222+
for (const Record &R : llvm::make_pointee_range(Opts)) {
224223
std::vector<StringRef> prf = R.getValueAsListOfStrings("Prefixes");
225224
PrefixKeyT prfkey(prf.begin(), prf.end());
226225
unsigned NewPrefix = CurPrefix + 1;
@@ -235,19 +234,16 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
235234
OS << "// Prefixes\n\n";
236235
OS << "#ifdef PREFIX\n";
237236
OS << "#define COMMA ,\n";
238-
for (PrefixesT::const_iterator I = Prefixes.begin(), E = Prefixes.end();
239-
I != E; ++I) {
237+
for (const auto &Prefix : Prefixes) {
240238
OS << "PREFIX(";
241239

242240
// Prefix name.
243-
OS << I->second;
241+
OS << Prefix.second;
244242

245243
// Prefix values.
246244
OS << ", {";
247-
for (PrefixKeyT::const_iterator PI = I->first.begin(),
248-
PE = I->first.end(); PI != PE; ++PI) {
249-
OS << "\"" << *PI << "\" COMMA ";
250-
}
245+
for (StringRef PrefixKey : Prefix.first)
246+
OS << "\"" << PrefixKey << "\" COMMA ";
251247
OS << "nullptr})\n";
252248
}
253249
OS << "#undef COMMA\n";
@@ -256,9 +252,7 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
256252
OS << "/////////\n";
257253
OS << "// Groups\n\n";
258254
OS << "#ifdef OPTION\n";
259-
for (unsigned i = 0, e = Groups.size(); i != e; ++i) {
260-
const Record &R = *Groups[i];
261-
255+
for (const Record &R : llvm::make_pointee_range(Groups)) {
262256
// Start a single option entry.
263257
OS << "OPTION(";
264258

@@ -343,8 +337,8 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
343337
OS << "nullptr";
344338
} else {
345339
OS << "\"";
346-
for (size_t i = 0, e = AliasArgs.size(); i != e; ++i)
347-
OS << AliasArgs[i] << "\\0";
340+
for (StringRef AliasArg : AliasArgs)
341+
OS << AliasArg << "\\0";
348342
OS << "\"";
349343
}
350344

@@ -394,9 +388,7 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
394388
};
395389

396390
std::vector<const Record *> OptsWithMarshalling;
397-
for (unsigned I = 0, E = Opts.size(); I != E; ++I) {
398-
const Record &R = *Opts[I];
399-
391+
for (const Record &R : llvm::make_pointee_range(Opts)) {
400392
// Start a single option entry.
401393
OS << "OPTION(";
402394
WriteOptRecordFields(OS, R);
@@ -462,8 +454,7 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
462454
OS << "#ifdef OPTTABLE_ARG_INIT\n";
463455
OS << "//////////\n";
464456
OS << "// Option Values\n\n";
465-
for (unsigned I = 0, E = Opts.size(); I != E; ++I) {
466-
const Record &R = *Opts[I];
457+
for (const Record &R : llvm::make_pointee_range(Opts)) {
467458
if (isa<UnsetInit>(R.getValueInit("ValuesCode")))
468459
continue;
469460
OS << "{\n";

0 commit comments

Comments
 (0)