Fix naming

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2669,21 +2669,21 @@ bool Converter::VisitSwitchStmt(clang::SwitchStmt *stmt) {
 
   clang::SwitchCase *default_case = nullptr;
   for (auto *sc : GetTopLevelSwitchCases(stmt)) {
-    if (ChainContainsDefault(sc)) {
+    if (SwitchCaseContainsDefault(sc)) {
       default_case = sc;
       continue;
     }
     StrCat("v if v == ");
     VisitSwitchCase(sc);
-    for (auto *t : GetSwitchArmBody(body, sc)) {
+    for (auto *t : GetSwitchCaseBody(body, sc)) {
       Convert(t);
     }
     StrCat("},");
   }
 
   if (default_case) {
     StrCat("_ => {");
-    for (auto *t : GetSwitchArmBody(body, default_case)) {
+    for (auto *t : GetSwitchCaseBody(body, default_case)) {
       Convert(t);
     }
     StrCat("},");

cpp2rust/converter/converter_lib.cpp

@@ -673,7 +673,7 @@ GetTopLevelSwitchCases(clang::SwitchStmt *stmt) {
   return cases;
 }
 
-bool ChainContainsDefault(clang::SwitchCase *c) {
+bool SwitchCaseContainsDefault(clang::SwitchCase *c) {
   for (clang::Stmt *cur = c;;) {
     if (clang::isa<clang::DefaultStmt>(cur)) {
       return true;
@@ -687,18 +687,18 @@ bool ChainContainsDefault(clang::SwitchCase *c) {
   return false;
 }
 
-clang::Stmt *ChainLeafBody(clang::SwitchCase *c) {
+static clang::Stmt *GetLastStmtOfSwitchCase(clang::SwitchCase *c) {
   clang::Stmt *cur = c->getSubStmt();
   while (auto *sc = clang::dyn_cast<clang::SwitchCase>(cur)) {
     cur = sc->getSubStmt();
   }
   return cur;
 }
 
-std::vector<clang::Stmt *> GetSwitchArmBody(clang::CompoundStmt *body,
-                                            clang::SwitchCase *head) {
+std::vector<clang::Stmt *> GetSwitchCaseBody(clang::CompoundStmt *body,
+                                             clang::SwitchCase *head) {
   std::vector<clang::Stmt *> out;
-  out.push_back(ChainLeafBody(head));
+  out.push_back(GetLastStmtOfSwitchCase(head));
   auto it = body->body_begin(), end = body->body_end();
   while (it != end && *it != head) {
     ++it;
@@ -712,7 +712,7 @@ std::vector<clang::Stmt *> GetSwitchArmBody(clang::CompoundStmt *body,
   return out;
 }
 
-bool SwitchArmHasFallthrough(clang::Stmt *stmt) {
+static bool SwitchCaseHasFallthrough(clang::Stmt *stmt) {
   if (stmt) {
     if (clang::isa<clang::BreakStmt>(stmt) ||
         clang::isa<clang::ReturnStmt>(stmt)) {
@@ -725,8 +725,8 @@ bool SwitchArmHasFallthrough(clang::Stmt *stmt) {
 bool SwitchHasFallthrough(clang::SwitchStmt *stmt) {
   if (auto *body = clang::dyn_cast<clang::CompoundStmt>(stmt->getBody())) {
     for (auto top_level_case : GetTopLevelSwitchCases(stmt)) {
-      auto arm = GetSwitchArmBody(body, top_level_case);
-      if (arm.empty() || SwitchArmHasFallthrough(arm.back())) {
+      auto arm = GetSwitchCaseBody(body, top_level_case);
+      if (arm.empty() || SwitchCaseHasFallthrough(arm.back())) {
         return true;
       }
     }

cpp2rust/converter/converter_lib.h

@@ -157,14 +157,10 @@ clang::Expr *CreateConversionToBool(clang::Expr *expr, clang::ASTContext &ctx);
 std::vector<clang::SwitchCase *>
 GetTopLevelSwitchCases(clang::SwitchStmt *stmt);
 
-bool ChainContainsDefault(clang::SwitchCase *c);
+bool SwitchCaseContainsDefault(clang::SwitchCase *c);
 
-clang::Stmt *ChainLeafBody(clang::SwitchCase *c);
-
-std::vector<clang::Stmt *> GetSwitchArmBody(clang::CompoundStmt *body,
-                                            clang::SwitchCase *head);
-
-bool SwitchArmHasFallthrough(clang::Stmt *stmt);
+std::vector<clang::Stmt *> GetSwitchCaseBody(clang::CompoundStmt *body,
+                                             clang::SwitchCase *head);
 
 bool SwitchHasFallthrough(clang::SwitchStmt *stmt);