work

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2761,7 +2761,11 @@ void Converter::ConvertBinaryOperator(clang::BinaryOperator *expr) {
       Convert(lhs);
     }
     StrCat(token::kSemiColon);
-    Convert(rhs);
+    if (isRValue()) {
+      StrCat(ConvertFreshRValue(rhs));
+    } else {
+      Convert(rhs);
+    }
   } else if (IsUnsignedArithOp(expr)) {
     if (expr->isCompoundAssignmentOp()) {
       Convert(lhs);

cpp2rust/converter/models/converter_refcount.cpp

@@ -496,7 +496,7 @@ ConverterRefCount::MaterializeTemp(const std::string &binding_name,
                                    clang::QualType param_type,
                                    clang::Expr *expr) {
   auto pointee = param_type.getNonReferenceType();
-  auto value = ConvertRValue(expr, pointee);
+  auto value = ConvertFreshRValue(expr, pointee);
   auto type_str = ToStringBase(pointee);
   const auto *decl = in_const_initializer_ ? keyword::kStatic : keyword::kLet;
 

tests/unit/comma_operator.cpp

@@ -1,4 +1,14 @@
 #include <cassert>
+#include <vector>
+
+struct Pair {
+  int first;
+  int second;
+};
+
+long twice(const long &v) { return v * 2; }
+
+int sum(const Pair &p) { return p.first + p.second; }
 
 int main() {
   int x = 1;
@@ -20,5 +30,22 @@ int main() {
     assert(b == 2);
   }
 
+  std::vector<int> v1 = {1, 2};
+  std::vector<int> v2 = (a = 5, v1);
+  v2.push_back(3);
+  assert(a == 5);
+  assert(v1.size() == 2);
+  assert(v2.size() == 3);
+
+  Pair p1{1, 2};
+  Pair p2 = (b = 6, p1);
+  p2.first = 10;
+  assert(p1.first == 1);
+  assert(p2.first == 10);
+
+  assert(twice(a) == 10);
+  assert(sum((a = 7, p1)) == 3);
+  assert(a == 7);
+
   return 0;
 }