edits

Author: nunoplopes

cpp2rust/converter/converter.cpp

@@ -1876,7 +1876,7 @@ bool Converter::VisitBinaryOperator(clang::BinaryOperator *expr) {
   auto *rhs = expr->getRHS();
   auto lhs_type = lhs->getType();
   auto rhs_type = rhs->getType();
-  std::string opcode_as_string = expr->getOpcodeStr().str();
+  std::string_view opcode_as_string = expr->getOpcodeStr();
 
   if (auto *cmpd_assign_op =
           llvm::dyn_cast<clang::CompoundAssignOperator>(expr);
@@ -1902,7 +1902,9 @@ bool Converter::VisitBinaryOperator(clang::BinaryOperator *expr) {
         Convert(lhs);
         ConvertCast(computation_result_type);
       }
-      StrCat(std::regex_replace(opcode_as_string, std::regex("="), ""));
+      std::string op(opcode_as_string);
+      op.erase(std::remove(op.begin(), op.end(), '='), op.end());
+      StrCat(op);
       Convert(rhs);
     }
     if (lhs_type->isBooleanType()) {
@@ -2207,7 +2209,7 @@ bool Converter::VisitParenExpr(clang::ParenExpr *expr) {
 bool Converter::ConvertCXXOperatorCallExpr(clang::CXXOperatorCallExpr *expr) {
   switch (expr->getOperator()) {
   case clang::OverloadedOperatorKind::OO_Equal:
-    ConvertAssignment(expr->getArg(0), expr->getArg(1), token::kAssign);
+    ConvertAssignment(expr->getArg(0), expr->getArg(1), "=");
     break;
   case clang::OverloadedOperatorKind::OO_Star:
   case clang::OverloadedOperatorKind::OO_Arrow:

cpp2rust/converter/lex.h

@@ -22,7 +22,7 @@ inline constexpr const char *kDiff = "!=";
 inline constexpr char kZero = '0';
 inline constexpr char kOne = '1';
 inline constexpr char kRef = '&';
-inline constexpr char kStar = '*';
+inline constexpr const char *kStar = "*";
 inline constexpr const char *kArrow = "->";
 inline constexpr char kHash = '#';
 inline constexpr char kMinus = '-';

cpp2rust/converter/models/converter_refcount.cpp

@@ -1144,7 +1144,7 @@ bool ConverterRefCount::VisitBinaryOperator(clang::BinaryOperator *expr) {
   auto *rhs = expr->getRHS();
   auto lhs_type = lhs->getType();
   auto rhs_type = rhs->getType();
-  std::string opcode_as_string = expr->getOpcodeStr().str();
+  std::string_view opcode_as_string = expr->getOpcodeStr();
 
   if (auto *assign = llvm::dyn_cast<clang::CompoundAssignOperator>(expr);
       assign && lhs_type != assign->getComputationResultType()) {
@@ -1165,7 +1165,9 @@ bool ConverterRefCount::VisitBinaryOperator(clang::BinaryOperator *expr) {
         StrCat(ConvertRValue(lhs));
         ConvertCast(computation_result_type);
       }
-      StrCat(std::regex_replace(opcode_as_string, std::regex("="), ""));
+      std::string op(opcode_as_string);
+      op.erase(std::remove(op.begin(), op.end(), '='), op.end());
+      StrCat(op);
       Convert(rhs);
     }
     if (lhs_type->isBooleanType()) {
@@ -1805,7 +1807,7 @@ bool ConverterRefCount::ConvertCXXOperatorCallExpr(
     clang::CXXOperatorCallExpr *expr) {
   switch (expr->getOperator()) {
   case clang::OverloadedOperatorKind::OO_Equal:
-    ConvertAssignment(expr->getArg(0), expr->getArg(1), token::kAssign);
+    ConvertAssignment(expr->getArg(0), expr->getArg(1), "=");
     break;
 
   case clang::OverloadedOperatorKind::OO_Arrow: