@@ -357,10 +357,10 @@ class TreeTransform {
357357 /// @}
358358
359359 /// The reason why the value of a statement is not discarded, if any.
360- enum StmtDiscardKind {
361- SDK_Discarded ,
362- SDK_NotDiscarded ,
363- SDK_StmtExprResult ,
360+ enum class StmtDiscardKind {
361+ Discarded ,
362+ NotDiscarded ,
363+ StmtExprResult ,
364364 };
365365
366366 /// Transform the given statement.
@@ -372,7 +372,8 @@ class TreeTransform {
372372 /// other mechanism.
373373 ///
374374 /// \returns the transformed statement.
375- StmtResult TransformStmt(Stmt *S, StmtDiscardKind SDK = SDK_Discarded);
375+ StmtResult TransformStmt(Stmt *S,
376+ StmtDiscardKind SDK = StmtDiscardKind::Discarded);
376377
377378 /// Transform the given statement.
378379 ///
@@ -4292,9 +4293,9 @@ StmtResult TreeTransform<Derived>::TransformStmt(Stmt *S, StmtDiscardKind SDK) {
42924293 {
42934294 ExprResult E = getDerived().TransformExpr(cast<Expr>(S));
42944295
4295- if (SDK == SDK_StmtExprResult )
4296+ if (SDK == StmtDiscardKind::StmtExprResult )
42964297 E = getSema().ActOnStmtExprResult(E);
4297- return getSema().ActOnExprStmt(E, SDK == SDK_Discarded );
4298+ return getSema().ActOnExprStmt(E, SDK == StmtDiscardKind::Discarded );
42984299 }
42994300 }
43004301
@@ -8086,7 +8087,8 @@ TreeTransform<Derived>::TransformCompoundStmt(CompoundStmt *S,
80868087 SmallVector<Stmt*, 8> Statements;
80878088 for (auto *B : S->body()) {
80888089 StmtResult Result = getDerived().TransformStmt(
8089- B, IsStmtExpr && B == ExprResult ? SDK_StmtExprResult : SDK_Discarded);
8090+ B, IsStmtExpr && B == ExprResult ? StmtDiscardKind::StmtExprResult
8091+ : StmtDiscardKind::Discarded);
80908092
80918093 if (Result.isInvalid()) {
80928094 // Immediately fail if this was a DeclStmt, since it's very
@@ -9067,8 +9069,8 @@ StmtResult
90679069TreeTransform<Derived>::TransformObjCForCollectionStmt(
90689070 ObjCForCollectionStmt *S) {
90699071 // Transform the element statement.
9070- StmtResult Element =
9071- getDerived().TransformStmt( S->getElement(), SDK_NotDiscarded );
9072+ StmtResult Element = getDerived().TransformStmt(
9073+ S->getElement(), StmtDiscardKind::NotDiscarded );
90729074 if (Element.isInvalid())
90739075 return StmtError();
90749076
0 commit comments