@@ -1733,9 +1733,9 @@ bool CommandLineParser::ParseCommandLineOptions(int argc,
1733
1733
} else if (!ConsumeAfterOpt) {
1734
1734
// Positional args have already been handled if ConsumeAfter is specified.
1735
1735
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 ,
1739
1739
PositionalVals[ValNo].second );
1740
1740
ValNo++;
1741
1741
--NumPositionalRequired; // We fulfilled our duty...
@@ -1745,16 +1745,15 @@ bool CommandLineParser::ParseCommandLineOptions(int argc,
1745
1745
// do not give it values that others need. 'Done' controls whether the
1746
1746
// option even _WANTS_ any more.
1747
1747
//
1748
- bool Done = PositionalOpts[i] ->getNumOccurrencesFlag () == cl::Required;
1748
+ bool Done = Opt ->getNumOccurrencesFlag () == cl::Required;
1749
1749
while (NumVals - ValNo > NumPositionalRequired && !Done) {
1750
- switch (PositionalOpts[i] ->getNumOccurrencesFlag ()) {
1750
+ switch (Opt ->getNumOccurrencesFlag ()) {
1751
1751
case cl::Optional:
1752
1752
Done = true ; // Optional arguments want _at most_ one value
1753
1753
[[fallthrough]];
1754
1754
case cl::ZeroOrMore: // Zero or more will take all they can get...
1755
1755
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 ,
1758
1757
PositionalVals[ValNo].second );
1759
1758
ValNo++;
1760
1759
break ;
@@ -1767,11 +1766,10 @@ bool CommandLineParser::ParseCommandLineOptions(int argc,
1767
1766
} else {
1768
1767
assert (ConsumeAfterOpt && NumPositionalRequired <= PositionalVals.size ());
1769
1768
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 );
1775
1773
ValNo++;
1776
1774
}
1777
1775
0 commit comments