@@ -219,8 +219,7 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
219
219
PrefixesT Prefixes;
220
220
Prefixes.insert (std::make_pair (PrefixKeyT (), " prefix_0" ));
221
221
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)) {
224
223
std::vector<StringRef> prf = R.getValueAsListOfStrings (" Prefixes" );
225
224
PrefixKeyT prfkey (prf.begin (), prf.end ());
226
225
unsigned NewPrefix = CurPrefix + 1 ;
@@ -235,19 +234,16 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
235
234
OS << " // Prefixes\n\n " ;
236
235
OS << " #ifdef PREFIX\n " ;
237
236
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) {
240
238
OS << " PREFIX(" ;
241
239
242
240
// Prefix name.
243
- OS << I-> second ;
241
+ OS << Prefix. second ;
244
242
245
243
// Prefix values.
246
244
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 " ;
251
247
OS << " nullptr})\n " ;
252
248
}
253
249
OS << " #undef COMMA\n " ;
@@ -256,9 +252,7 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
256
252
OS << " /////////\n " ;
257
253
OS << " // Groups\n\n " ;
258
254
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)) {
262
256
// Start a single option entry.
263
257
OS << " OPTION(" ;
264
258
@@ -343,8 +337,8 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
343
337
OS << " nullptr" ;
344
338
} else {
345
339
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" ;
348
342
OS << " \" " ;
349
343
}
350
344
@@ -394,9 +388,7 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
394
388
};
395
389
396
390
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)) {
400
392
// Start a single option entry.
401
393
OS << " OPTION(" ;
402
394
WriteOptRecordFields (OS, R);
@@ -462,8 +454,7 @@ void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
462
454
OS << " #ifdef OPTTABLE_ARG_INIT\n " ;
463
455
OS << " //////////\n " ;
464
456
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)) {
467
458
if (isa<UnsetInit>(R.getValueInit (" ValuesCode" )))
468
459
continue ;
469
460
OS << " {\n " ;
0 commit comments