diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Format/QualifierAlignmentFixer.cpp | 18 | ||||
| -rw-r--r-- | clang/lib/Format/QualifierAlignmentFixer.h | 4 |
2 files changed, 10 insertions, 12 deletions
diff --git a/clang/lib/Format/QualifierAlignmentFixer.cpp b/clang/lib/Format/QualifierAlignmentFixer.cpp index 077ce5e..a904f0b 100644 --- a/clang/lib/Format/QualifierAlignmentFixer.cpp +++ b/clang/lib/Format/QualifierAlignmentFixer.cpp @@ -281,7 +281,7 @@ const FormatToken *LeftRightQualifierAlignmentFixer::analyzeRight( const FormatToken *LastSimpleTypeSpecifier = TypeToken; while (isQualifierOrType(LastSimpleTypeSpecifier->getNextNonComment(), - &LangOpts)) { + LangOpts)) { LastSimpleTypeSpecifier = LastSimpleTypeSpecifier->getNextNonComment(); } @@ -414,7 +414,7 @@ const FormatToken *LeftRightQualifierAlignmentFixer::analyzeLeft( const FormatToken *LastSimpleTypeSpecifier = TypeToken; while (isConfiguredQualifierOrType( LastSimpleTypeSpecifier->getPreviousNonComment(), - ConfiguredQualifierTokens, &LangOpts)) { + ConfiguredQualifierTokens, LangOpts)) { LastSimpleTypeSpecifier = LastSimpleTypeSpecifier->getPreviousNonComment(); } @@ -613,18 +613,16 @@ void prepareLeftRightOrderingForQualifierAlignmentFixer( } bool LeftRightQualifierAlignmentFixer::isQualifierOrType( - const FormatToken *Tok, const LangOptions *LangOpts) { - return Tok && - (Tok->isTypeName(LangOpts ? *LangOpts : getFormattingLangOpts()) || - Tok->is(tok::kw_auto) || isQualifier(Tok)); + const FormatToken *Tok, const LangOptions &LangOpts) { + return Tok && (Tok->isTypeName(LangOpts) || Tok->is(tok::kw_auto) || + isQualifier(Tok)); } bool LeftRightQualifierAlignmentFixer::isConfiguredQualifierOrType( const FormatToken *Tok, const std::vector<tok::TokenKind> &Qualifiers, - const LangOptions *LangOpts) { - return Tok && - (Tok->isTypeName(LangOpts ? *LangOpts : getFormattingLangOpts()) || - Tok->is(tok::kw_auto) || isConfiguredQualifier(Tok, Qualifiers)); + const LangOptions &LangOpts) { + return Tok && (Tok->isTypeName(LangOpts) || Tok->is(tok::kw_auto) || + isConfiguredQualifier(Tok, Qualifiers)); } // If a token is an identifier and it's upper case, it could diff --git a/clang/lib/Format/QualifierAlignmentFixer.h b/clang/lib/Format/QualifierAlignmentFixer.h index 97fcb42..710fa2d 100644 --- a/clang/lib/Format/QualifierAlignmentFixer.h +++ b/clang/lib/Format/QualifierAlignmentFixer.h @@ -72,11 +72,11 @@ public: // Is the Token a simple or qualifier type static bool isQualifierOrType(const FormatToken *Tok, - const LangOptions *LangOpts = nullptr); + const LangOptions &LangOpts); static bool isConfiguredQualifierOrType(const FormatToken *Tok, const std::vector<tok::TokenKind> &Qualifiers, - const LangOptions *LangOpts = nullptr); + const LangOptions &LangOpts); // Is the Token likely a Macro static bool isPossibleMacro(const FormatToken *Tok); |