This is an archive of the discontinued LLVM Phabricator instance.

Differential D65883

[Extract] Fixed SemicolonExtractionPolicy for SwitchStmt and SwitchCase
ClosedPublic

Authored by SureYeaah on Aug 7 2019, 8:19 AM.

Details

Reviewers
arphaman
sammccall
Commits
rG7137736e49ce: [Extract] Fixed SemicolonExtractionPolicy for SwitchStmt and SwitchCase
rC368267: [Extract] Fixed SemicolonExtractionPolicy for SwitchStmt and SwitchCase
rL368267: [Extract] Fixed SemicolonExtractionPolicy for SwitchStmt and SwitchCase

Diff Detail

Event Timeline

SureYeaah created this revision.Aug 7 2019, 8:19 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 7 2019, 8:19 AM
Herald added subscribers: cfe-commits, dexonsmith. · View Herald Transcript
Harbormaster completed remote builds in B36338: Diff 213900.Aug 7 2019, 8:20 AM
SureYeaah updated this revision to Diff 213909.Aug 7 2019, 8:32 AM

Removed Do

SureYeaah retitled this revision from [Extract] Fixed SemicolonExtractionPolicy for Do and Switch Stmt to [Extract] Fixed SemicolonExtractionPolicy for SwitchStmt and SwitchCase.Aug 7 2019, 8:33 AM
Harbormaster completed remote builds in B36343: Diff 213909.Aug 7 2019, 8:34 AM
SureYeaah updated this revision to Diff 213925.Aug 7 2019, 9:22 AM

Added tests

Harbormaster completed remote builds in B36349: Diff 213925.Aug 7 2019, 9:24 AM
sammccall accepted this revision.Aug 8 2019, 1:31 AM
This revision is now accepted and ready to land.Aug 8 2019, 1:31 AM
Closed by commit rL368267: [Extract] Fixed SemicolonExtractionPolicy for SwitchStmt and SwitchCase (authored by SureYeaah). · Explain WhyAug 8 2019, 1:38 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptAug 8 2019, 1:38 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
clang/
lib/
Tooling/
Refactoring/
Extract/
5 lines
test/
Refactor/
Extract/
13 lines

Diff 213925

clang/lib/Tooling/Refactoring/Extract/SourceExtraction.cpp

Show All 34 Linesbool isSemicolonRequiredAfter(const Stmt *S) {
if (const auto *While = dyn_cast<WhileStmt>(S)) if (const auto *While = dyn_cast<WhileStmt>(S))
return isSemicolonRequiredAfter(While->getBody()); return isSemicolonRequiredAfter(While->getBody());
if (const auto *For = dyn_cast<ForStmt>(S)) if (const auto *For = dyn_cast<ForStmt>(S))
return isSemicolonRequiredAfter(For->getBody()); return isSemicolonRequiredAfter(For->getBody());
if (const auto *CXXFor = dyn_cast<CXXForRangeStmt>(S)) if (const auto *CXXFor = dyn_cast<CXXForRangeStmt>(S))
return isSemicolonRequiredAfter(CXXFor->getBody()); return isSemicolonRequiredAfter(CXXFor->getBody());
if (const auto *ObjCFor = dyn_cast<ObjCForCollectionStmt>(S)) if (const auto *ObjCFor = dyn_cast<ObjCForCollectionStmt>(S))
return isSemicolonRequiredAfter(ObjCFor->getBody()); return isSemicolonRequiredAfter(ObjCFor->getBody());
if(const auto *Switch = dyn_cast<SwitchStmt>(S))
return isSemicolonRequiredAfter(Switch->getBody());
if(const auto *Case = dyn_cast<SwitchCase>(S))
return isSemicolonRequiredAfter(Case->getSubStmt());
switch (S->getStmtClass()) { switch (S->getStmtClass()) {
case Stmt::SwitchStmtClass:
case Stmt::CXXTryStmtClass: case Stmt::CXXTryStmtClass:
case Stmt::ObjCAtSynchronizedStmtClass: case Stmt::ObjCAtSynchronizedStmtClass:
case Stmt::ObjCAutoreleasePoolStmtClass: case Stmt::ObjCAutoreleasePoolStmtClass:
case Stmt::ObjCAtTryStmtClass: case Stmt::ObjCAtTryStmtClass:
return false; return false;
default: default:
return true; return true;
} }
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines

clang/test/Refactor/Extract/ExtractionSemicolonPolicy.cpp

Show First 20 Lines • Show All 58 Lines • ▼ Show 20 Lines
// CHECK-NEXT: case 2: // CHECK-NEXT: case 2:
// CHECK-NEXT: break; // CHECK-NEXT: break;
// CHECK-NEXT: }{{$}} // CHECK-NEXT: }{{$}}
// CHECK-NEXT: }{{[[:space:]].*}} // CHECK-NEXT: }{{[[:space:]].*}}
// CHECK-NEXT: void extractStatementNotSemiSwitch() { // CHECK-NEXT: void extractStatementNotSemiSwitch() {
// CHECK-NEXT: extracted();{{$}} // CHECK-NEXT: extracted();{{$}}
// CHECK-NEXT: } // CHECK-NEXT: }
void extractStatementNotSemiWhile() { void extractStatementNotSemiWhile() {
/*range eextract=->+2:4*/while (true) { /*range eextract=->+2:4*/while (true) {
int x = 0; int x = 0;
} }
} }
// CHECK: 1 'eextract' results: // CHECK: 1 'eextract' results:
// CHECK: static void extracted() { // CHECK: static void extracted() {
// CHECK-NEXT: while (true) { // CHECK-NEXT: while (true) {
▲ Show 20 Lines • Show All 110 Lines • ▼ Show 20 Lines
// CHECK-NEXT: for (int i = 0; i < 10; ++i) // CHECK-NEXT: for (int i = 0; i < 10; ++i)
// CHECK-NEXT: while (i != 0) // CHECK-NEXT: while (i != 0)
// CHECK-NEXT: ;{{$}} // CHECK-NEXT: ;{{$}}
// CHECK-NEXT: }{{[[:space:]].*}} // CHECK-NEXT: }{{[[:space:]].*}}
// CHECK-NEXT: void careForNonCompoundSemicolons2() { // CHECK-NEXT: void careForNonCompoundSemicolons2() {
// CHECK-NEXT: extracted();{{$}} // CHECK-NEXT: extracted();{{$}}
// CHECK-NEXT: // // CHECK-NEXT: //
// CHECK-NEXT: } // CHECK-NEXT: }
void careForSwitchSemicolon() {
/*range mextract=->+0:51*/switch(0) default: break;
}
// CHECK: 1 'mextract' results:
// CHECK: static void extracted() {
// CHECK-NEXT: switch(0) default: break;{{$}}
// CHECK-NEXT: }{{[[:space:]].*}}
// CHECK-NEXT: void careForSwitchSemicolon() {
// CHECK-NEXT: extracted();{{$}}
// CHECK-NEXT: }