Skip to content

Commit 0f9d6ae

Browse files
fixup! [clang] Change representation of CurLexerKind
Co-authored-by: cor3ntin <[email protected]>
1 parent c815ac1 commit 0f9d6ae

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

clang/include/clang/Lex/Preprocessor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1909,7 +1909,7 @@ class Preprocessor {
19091909

19101910
/// Recompute the current lexer kind based on the CurLexer/
19111911
/// CurTokenLexer pointers.
1912-
void recomputeCurLexerCallback();
1912+
void recomputeCurLexerKind();
19131913

19141914
/// Returns true if incremental processing is enabled
19151915
bool isIncrementalProcessingEnabled() const { return IncrementalProcessing; }

clang/lib/Lex/PPCaching.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void Preprocessor::Backtrack() {
4242
&& "EnableBacktrackAtThisPos was not called!");
4343
CachedLexPos = BacktrackPositions.back();
4444
BacktrackPositions.pop_back();
45-
recomputeCurLexerCallback();
45+
recomputeCurLexerKind();
4646
}
4747

4848
void Preprocessor::CachingLex(Token &Result) {

clang/lib/Lex/PPLexerChange.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) {
452452
CurLexer.reset();
453453

454454
CurPPLexer = nullptr;
455-
recomputeCurLexerCallback();
455+
recomputeCurLexerKind();
456456
return true;
457457
}
458458

clang/lib/Lex/Preprocessor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ StringRef Preprocessor::getLastMacroWithSpelling(
380380
return BestSpelling;
381381
}
382382

383-
void Preprocessor::recomputeCurLexerCallback() {
383+
void Preprocessor::recomputeCurLexerKind() {
384384
if (CurLexer)
385385
CurLexerCallback = CurLexer->isDependencyDirectivesLexer()
386386
? CLK_DependencyDirectivesLexer
@@ -1134,7 +1134,7 @@ void Preprocessor::CollectPpImportSuffix(SmallVectorImpl<Token> &Toks) {
11341134
/// We respond to a pp-import by importing macros from the named module.
11351135
bool Preprocessor::LexAfterModuleImport(Token &Result) {
11361136
// Figure out what kind of lexer we actually have.
1137-
recomputeCurLexerCallback();
1137+
recomputeCurLexerKind();
11381138

11391139
// Lex the next token. The header-name lexing rules are used at the start of
11401140
// a pp-import.

0 commit comments

Comments
 (0)