Merge emit_push_open and emit_push_close

Author: lucic71

cpp2rust/converter/converter.h

@@ -998,8 +998,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   virtual bool emplace_back_plugin_convert(clang::CallExpr *call);
   virtual void emplace_back_plugin_construct_arg(clang::QualType elem_type,
                                                  clang::CXXConstructExpr *ctor);
-  virtual void emplace_back_emit_push_open(clang::CXXMemberCallExpr *call);
-  virtual void emplace_back_emit_push_close(clang::CXXMemberCallExpr *call);
+  virtual void emplace_back_emit_push(clang::CXXMemberCallExpr *call,
+                                      std::string_view arg);
 
   virtual const char *GetPointerDerefPrefix(clang::QualType pointee_type);
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -2504,20 +2504,18 @@ void ConverterRefCount::emplace_back_plugin_construct_arg(
   ConvertVarInit(elem_type, ctor);
 }
 
-void ConverterRefCount::emplace_back_emit_push_open(
-    clang::CXXMemberCallExpr *call) {
+void ConverterRefCount::emplace_back_emit_push(clang::CXXMemberCallExpr *call,
+                                               std::string_view arg) {
   auto *obj = GetCallObject(call);
   auto obj_type = obj->getType().getNonReferenceType();
   if (obj_type->isPointerType()) {
     obj_type = obj_type->getPointeeType();
   }
-  StrCat(ConvertObject(obj), ".with_mut(|__v: &mut ",
-         ToString(obj_type.getNonReferenceType()), "| __v.push(");
-}
-
-void ConverterRefCount::emplace_back_emit_push_close(
-    clang::CXXMemberCallExpr *call) {
-  StrCat("))");
+  StrCat(ConvertObject(obj), ".with_mut");
+  PushParen outer(*this);
+  StrCat("|__v: &mut ", ToString(obj_type.getNonReferenceType()), "| __v.push");
+  PushParen inner(*this);
+  StrCat(arg);
 }
 
 const char *

cpp2rust/converter/models/converter_refcount.h

@@ -239,8 +239,8 @@ class ConverterRefCount final : public Converter {
   void
   emplace_back_plugin_construct_arg(clang::QualType elem_type,
                                     clang::CXXConstructExpr *ctor) override;
-  void emplace_back_emit_push_open(clang::CXXMemberCallExpr *call) override;
-  void emplace_back_emit_push_close(clang::CXXMemberCallExpr *call) override;
+  void emplace_back_emit_push(clang::CXXMemberCallExpr *call,
+                              std::string_view arg) override;
 
   const char *GetPointerDerefSuffix(clang::QualType pointee_type);
   const char *GetPointerDerefPrefix(clang::QualType pointee_type) override;

cpp2rust/converter/plugins/emplace_back.cpp

@@ -134,18 +134,16 @@ clang::CXXConstructExpr *buildConstructExpr(clang::CXXMemberCallExpr *call,
 
 } // namespace
 
-void Converter::emplace_back_emit_push_open(clang::CXXMemberCallExpr *call) {
+void Converter::emplace_back_emit_push(clang::CXXMemberCallExpr *call,
+                                       std::string_view arg) {
   {
     PushExprKind push(*this, ExprKind::LValue);
     auto callee = ToString(call->getCallee());
     ReplaceAll(callee, "emplace_back", "push");
     StrCat(callee);
   }
-  StrCat('(');
-}
-
-void Converter::emplace_back_emit_push_close(clang::CXXMemberCallExpr *call) {
-  StrCat(')');
+  PushParen paren(*this);
+  StrCat(arg);
 }
 
 bool Converter::emplace_back_plugin_convert(clang::CallExpr *call) {
@@ -189,11 +187,9 @@ bool Converter::emplace_back_plugin_convert(clang::CallExpr *call) {
     arg = std::move(buf).str();
   }
 
-  StrCat("{ let __arg = ", arg, ";");
-  emplace_back_emit_push_open(member_call);
-  StrCat("__arg");
-  emplace_back_emit_push_close(member_call);
-  StrCat('}');
+  PushBrace brace(*this);
+  StrCat("let __arg = ", arg, ";");
+  emplace_back_emit_push(member_call, "__arg");
   return true;
 }