Use RAII delimiters

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2704,21 +2704,32 @@ void Converter::EmitSwitchArm(clang::CompoundStmt *body, clang::SwitchCase *sc,
 }
 
 bool Converter::VisitSwitchStmt(clang::SwitchStmt *stmt) {
+  bool has_fallthrough = SwitchHasFallthrough(stmt);
   PushBreakTarget push(break_target_, has_fallthrough
                                           ? BreakTarget::FallthroughSwitch
                                           : BreakTarget::Switch);
   auto *body = clang::dyn_cast<clang::CompoundStmt>(stmt->getBody());
   assert(body);
 
   if (has_fallthrough) {
-    StrCat("switch!(match ", ToString(stmt->getCond()), " {");
+    // Use the switch-with-fallthrough macro
+    StrCat("switch!");
+  } else {
+    StrCat("'switch:");
+  }
+
+  PushParen switch_macro_paren(*this, has_fallthrough);
+  PushBrace switch_label_brace(*this, !has_fallthrough);
+
+  if (has_fallthrough) {
+    StrCat("match", ToString(stmt->getCond()));
   } else {
-    StrCat("'switch: {");
     StrCat(std::format("let __match_cond = {};", ToString(stmt->getCond())));
     StrCat("match __match_cond");
-    StrCat("{");
   }
 
+  PushBrace match_brace(*this);
+
   clang::SwitchCase *default_case = nullptr;
   for (auto *sc : GetTopLevelSwitchCases(stmt)) {
     if (SwitchCaseContainsDefault(sc)) {
@@ -2734,12 +2745,6 @@ bool Converter::VisitSwitchStmt(clang::SwitchStmt *stmt) {
     StrCat(R"( _ => {})");
   }
 
-  if (has_fallthrough) {
-    StrCat("})");
-  } else {
-    StrCat("}");
-    StrCat("}");
-  }
   return false;
 }