@@ -1733,9 +1733,9 @@ bool CommandLineParser::ParseCommandLineOptions(int argc,
17331733 } else if (!ConsumeAfterOpt) {
17341734 // Positional args have already been handled if ConsumeAfter is specified.
17351735 unsigned ValNo = 0 , NumVals = static_cast <unsigned >(PositionalVals.size ());
1736- for (size_t i = 0 , e = PositionalOpts. size (); i != e; ++i ) {
1737- if (RequiresValue (PositionalOpts[i] )) {
1738- ProvidePositionalOption (PositionalOpts[i] , PositionalVals[ValNo].first ,
1736+ for (Option *Opt : PositionalOpts) {
1737+ if (RequiresValue (Opt )) {
1738+ ProvidePositionalOption (Opt , PositionalVals[ValNo].first ,
17391739 PositionalVals[ValNo].second );
17401740 ValNo++;
17411741 --NumPositionalRequired; // We fulfilled our duty...
@@ -1745,16 +1745,15 @@ bool CommandLineParser::ParseCommandLineOptions(int argc,
17451745 // do not give it values that others need. 'Done' controls whether the
17461746 // option even _WANTS_ any more.
17471747 //
1748- bool Done = PositionalOpts[i] ->getNumOccurrencesFlag () == cl::Required;
1748+ bool Done = Opt ->getNumOccurrencesFlag () == cl::Required;
17491749 while (NumVals - ValNo > NumPositionalRequired && !Done) {
1750- switch (PositionalOpts[i] ->getNumOccurrencesFlag ()) {
1750+ switch (Opt ->getNumOccurrencesFlag ()) {
17511751 case cl::Optional:
17521752 Done = true ; // Optional arguments want _at most_ one value
17531753 [[fallthrough]];
17541754 case cl::ZeroOrMore: // Zero or more will take all they can get...
17551755 case cl::OneOrMore: // One or more will take all they can get...
1756- ProvidePositionalOption (PositionalOpts[i],
1757- PositionalVals[ValNo].first ,
1756+ ProvidePositionalOption (Opt, PositionalVals[ValNo].first ,
17581757 PositionalVals[ValNo].second );
17591758 ValNo++;
17601759 break ;
@@ -1767,11 +1766,10 @@ bool CommandLineParser::ParseCommandLineOptions(int argc,
17671766 } else {
17681767 assert (ConsumeAfterOpt && NumPositionalRequired <= PositionalVals.size ());
17691768 unsigned ValNo = 0 ;
1770- for (size_t J = 0 , E = PositionalOpts.size (); J != E; ++J)
1771- if (RequiresValue (PositionalOpts[J])) {
1772- ErrorParsing |= ProvidePositionalOption (PositionalOpts[J],
1773- PositionalVals[ValNo].first ,
1774- PositionalVals[ValNo].second );
1769+ for (Option *Opt : PositionalOpts)
1770+ if (RequiresValue (Opt)) {
1771+ ErrorParsing |= ProvidePositionalOption (
1772+ Opt, PositionalVals[ValNo].first , PositionalVals[ValNo].second );
17751773 ValNo++;
17761774 }
17771775
0 commit comments