This is an archive of the discontinued LLVM Phabricator instance.

Differential D137308

[clang-format][NFC] Remove parsePPElIf()
ClosedPublic

Authored by owenpan on Nov 2 2022, 6:20 PM.

Details

Reviewers
MyDeveloperDay
HazardyKnusperkeks
rymiel
Commits
rGe787708bcf53: [clang-format][NFC] Remove parsePPElIf()

Diff Detail

Event Timeline

owenpan created this revision.Nov 2 2022, 6:20 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 2 2022, 6:20 PM
owenpan requested review of this revision.Nov 2 2022, 6:20 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 2 2022, 6:20 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B195851: Diff 472823.Nov 2 2022, 6:51 PM
rymiel accepted this revision.Nov 2 2022, 8:42 PM
This revision is now accepted and ready to land.Nov 2 2022, 8:42 PM
HazardyKnusperkeks accepted this revision.Nov 3 2022, 4:30 AM
This revision was landed with ongoing or failed builds.Nov 4 2022, 12:39 AM
Closed by commit rGe787708bcf53: [clang-format][NFC] Remove parsePPElIf() (authored by owenpan). · Explain Why
This revision was automatically updated to reflect the committed changes.
owenpan added a commit: rGe787708bcf53: [clang-format][NFC] Remove parsePPElIf().

Revision Contents

PathSize
clang/
lib/
Format/
1 line
6 lines

Diff 472823

clang/lib/Format/UnwrappedLineParser.h

Show First 20 Lines • Show All 113 Lines • ▼ Show 20 Lines FormatToken *parseBlock(bool MustBeDeclaration = false,
bool UnindentWhitesmithsBraces = false, bool UnindentWhitesmithsBraces = false,
bool CanContainBracedList = true, bool CanContainBracedList = true,
TokenType NextLBracesType = TT_Unknown); TokenType NextLBracesType = TT_Unknown);
void parseChildBlock(bool CanContainBracedList = true, void parseChildBlock(bool CanContainBracedList = true,
TokenType NextLBracesType = TT_Unknown); TokenType NextLBracesType = TT_Unknown);
void parsePPDirective(); void parsePPDirective();
void parsePPDefine(); void parsePPDefine();
void parsePPIf(bool IfDef); void parsePPIf(bool IfDef);
void parsePPElIf();
void parsePPElse(); void parsePPElse();
void parsePPEndIf(); void parsePPEndIf();
void parsePPPragma(); void parsePPPragma();
void parsePPUnknown(); void parsePPUnknown();
void readTokenWithJavaScriptASI(); void readTokenWithJavaScriptASI();
void parseStructuralElement(bool IsTopLevel = false, void parseStructuralElement(bool IsTopLevel = false,
TokenType NextLBracesType = TT_Unknown, TokenType NextLBracesType = TT_Unknown,
IfStmtKind *IfKind = nullptr, IfStmtKind *IfKind = nullptr,
▲ Show 20 Lines • Show All 238 Lines • Show Last 20 Lines

clang/lib/Format/UnwrappedLineParser.cpp

Show First 20 Lines • Show All 1,102 Lines • ▼ Show 20 Linesvoid UnwrappedLineParser::parsePPDirective() {
case tok::pp_if: case tok::pp_if:
parsePPIf(/*IfDef=*/false); parsePPIf(/*IfDef=*/false);
break; break;
case tok::pp_ifdef: case tok::pp_ifdef:
case tok::pp_ifndef: case tok::pp_ifndef:
parsePPIf(/*IfDef=*/true); parsePPIf(/*IfDef=*/true);
break; break;
case tok::pp_else: case tok::pp_else:
parsePPElse();
break;
case tok::pp_elifdef: case tok::pp_elifdef:
case tok::pp_elifndef: case tok::pp_elifndef:
case tok::pp_elif: case tok::pp_elif:
parsePPElIf(); parsePPElse();
break; break;
case tok::pp_endif: case tok::pp_endif:
parsePPEndIf(); parsePPEndIf();
break; break;
case tok::pp_pragma: case tok::pp_pragma:
parsePPPragma(); parsePPPragma();
break; break;
default: default:
▲ Show 20 Lines • Show All 93 Lines • ▼ Show 20 Linesvoid UnwrappedLineParser::parsePPElse() {
if (PPBranchLevel == -1) if (PPBranchLevel == -1)
conditionalCompilationStart(/*Unreachable=*/true); conditionalCompilationStart(/*Unreachable=*/true);
conditionalCompilationAlternative(); conditionalCompilationAlternative();
--PPBranchLevel; --PPBranchLevel;
parsePPUnknown(); parsePPUnknown();
++PPBranchLevel; ++PPBranchLevel;
} }
void UnwrappedLineParser::parsePPElIf() { parsePPElse(); }
void UnwrappedLineParser::parsePPEndIf() { void UnwrappedLineParser::parsePPEndIf() {
conditionalCompilationEnd(); conditionalCompilationEnd();
parsePPUnknown(); parsePPUnknown();
// If the #endif of a potential include guard is the last thing in the file, // If the #endif of a potential include guard is the last thing in the file,
// then we found an include guard. // then we found an include guard.
if (IncludeGuard == IG_Defined && PPBranchLevel == -1 && Tokens->isEOF() && if (IncludeGuard == IG_Defined && PPBranchLevel == -1 && Tokens->isEOF() &&
Style.IndentPPDirectives != FormatStyle::PPDIS_None) { Style.IndentPPDirectives != FormatStyle::PPDIS_None) {
IncludeGuard = IG_Found; IncludeGuard = IG_Found;
▲ Show 20 Lines • Show All 3,436 Lines • Show Last 20 Lines