diff options
author | Erik Verbruggen <erikjv@me.com> | 2016-10-26 13:06:13 +0000 |
---|---|---|
committer | Erik Verbruggen <erikjv@me.com> | 2016-10-26 13:06:13 +0000 |
commit | e4fd6522c19040782aed6b5acc218e94034d71e5 (patch) | |
tree | 1ccca3e613a972a428ff8c1a5d578a3f609073d8 /clang/lib/Lex/PPMacroExpansion.cpp | |
parent | 3f515cd795872e40bcd84ea42d74ec0e812d939a (diff) | |
download | bcm5719-llvm-e4fd6522c19040782aed6b5acc218e94034d71e5.tar.gz bcm5719-llvm-e4fd6522c19040782aed6b5acc218e94034d71e5.zip |
[PP] Replace some index based for loops with range based ones
While in the area, also change some unsigned variables to size_t, and
introduce an LLVM_FALLTHROUGH instead of a comment stating that.
Differential Revision: http://reviews.llvm.org/D25982
llvm-svn: 285193
Diffstat (limited to 'clang/lib/Lex/PPMacroExpansion.cpp')
-rw-r--r-- | clang/lib/Lex/PPMacroExpansion.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp index 940192bafb7..fde053b7c74 100644 --- a/clang/lib/Lex/PPMacroExpansion.cpp +++ b/clang/lib/Lex/PPMacroExpansion.cpp @@ -411,8 +411,7 @@ bool Preprocessor::isNextPPTokenLParen() { // macro stack. if (CurPPLexer) return false; - for (unsigned i = IncludeMacroStack.size(); i != 0; --i) { - IncludeStackInfo &Entry = IncludeMacroStack[i-1]; + for (const IncludeStackInfo &Entry : llvm::reverse(IncludeMacroStack)) { if (Entry.TheLexer) Val = Entry.TheLexer->isNextPPTokenLParen(); else if (Entry.ThePTHLexer) @@ -501,9 +500,7 @@ bool Preprocessor::HandleMacroExpandedIdentifier(Token &Identifier, } else { Callbacks->MacroExpands(Identifier, M, ExpansionRange, Args); if (!DelayedMacroExpandsCallbacks.empty()) { - for (unsigned i = 0, e = DelayedMacroExpandsCallbacks.size(); i != e; - ++i) { - MacroExpandsInfo &Info = DelayedMacroExpandsCallbacks[i]; + for (const MacroExpandsInfo &Info : DelayedMacroExpandsCallbacks) { // FIXME: We lose macro args info with delayed callback. Callbacks->MacroExpands(Info.Tok, Info.MD, Info.Range, /*Args=*/nullptr); @@ -757,7 +754,7 @@ MacroArgs *Preprocessor::ReadFunctionLikeMacroArgs(Token &MacroName, assert(Tok.isOneOf(tok::l_paren, tok::comma) && "only expect argument separators here"); - unsigned ArgTokenStart = ArgTokens.size(); + size_t ArgTokenStart = ArgTokens.size(); SourceLocation ArgStartLoc = Tok.getLocation(); // C99 6.10.3p11: Keep track of the number of l_parens we have seen. Note @@ -1009,10 +1006,10 @@ Token *Preprocessor::cacheMacroExpandedTokens(TokenLexer *tokLexer, if (cacheNeedsToGrow) { // Go through all the TokenLexers whose 'Tokens' pointer points in the // buffer and update the pointers to the (potential) new buffer array. - for (unsigned i = 0, e = MacroExpandingLexersStack.size(); i != e; ++i) { + for (const auto &Lexer : MacroExpandingLexersStack) { TokenLexer *prevLexer; size_t tokIndex; - std::tie(prevLexer, tokIndex) = MacroExpandingLexersStack[i]; + std::tie(prevLexer, tokIndex) = Lexer; prevLexer->Tokens = MacroExpandedTokens.data() + tokIndex; } } |