Fix comma operator for packs

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2730,6 +2730,7 @@ void Converter::ConvertBinaryOperator(clang::BinaryOperator *expr) {
       ConvertCast(lhs_type);
     }
   } else if (expr->isCommaOp()) {
+    PushBrace brace(*this);
     {
       PushExprKind push(*this, ExprKind::Void);
       Convert(lhs);
@@ -3099,13 +3100,10 @@ bool Converter::VisitDeclRefExpr(clang::DeclRefExpr *expr) {
 }
 
 bool Converter::VisitParenExpr(clang::ParenExpr *expr) {
-  // Comma operator becomes (A, B, C) -> { A; B; C }
-  if (auto *bin = clang::dyn_cast<clang::BinaryOperator>(expr->getSubExpr())) {
-    if (bin->isCommaOp()) {
-      PushBrace push(*this);
-      Convert(expr->getSubExpr());
-      return false;
-    }
+  if (auto *bin = clang::dyn_cast<clang::BinaryOperator>(expr->getSubExpr());
+      bin && (bin->isCommaOp() || (bin->isAssignmentOp() && isVoid()))) {
+    Convert(expr->getSubExpr());
+    return false;
   }
 
   {

tests/unit/out/refcount/break.rs

@@ -20,14 +20,20 @@ pub fn for_test_0(n: i32) -> i32 {
         let w: Value<i32> = Rc::new(RefCell::new(0));
         'loop_: while ((*w.borrow()) < (*j.borrow())) {
             break;
-            (*w.borrow_mut()) += 1;
-            (*k.borrow_mut()) += 1;
-            (*i.borrow_mut()) += (*k.borrow());
+            {
+                {
+                    (*w.borrow_mut()) += 1;
+                    (*k.borrow_mut()) += 1
+                };
+                (*i.borrow_mut()) += (*k.borrow())
+            };
         }
         let __rhs = ((*x.borrow()) + 1);
         (*x.borrow_mut()) = __rhs;
-        (*j.borrow_mut()) = (*i.borrow());
-        (*i.borrow_mut()) += 1;
+        {
+            (*j.borrow_mut()) = (*i.borrow());
+            (*i.borrow_mut()) += 1
+        };
     }
     return (*x.borrow());
 }

tests/unit/out/refcount/comma_operator.rs

@@ -19,24 +19,30 @@ fn main_0() -> i32 {
     assert!(((*x.borrow()) == 2));
     assert!(((*y.borrow()) == 3));
     let z: Value<i32> = Rc::new(RefCell::new({
-        1;
-        2;
+        {
+            1;
+            2
+        };
         3
     }));
     assert!(((*z.borrow()) == 3));
     let counter: Value<i32> = Rc::new(RefCell::new(0));
     let w: Value<i32> = Rc::new(RefCell::new({
-        (*counter.borrow_mut()).postfix_inc();
-        (*counter.borrow_mut()).postfix_inc();
+        {
+            (*counter.borrow_mut()).postfix_inc();
+            (*counter.borrow_mut()).postfix_inc()
+        };
         (*counter.borrow())
     }));
     assert!(((*counter.borrow()) == 2));
     assert!(((*w.borrow()) == 2));
     let a: Value<i32> = Rc::new(RefCell::new(0));
     let b: Value<i32> = Rc::new(RefCell::new(0));
     if {
-        (*a.borrow_mut()) = 1;
-        (*b.borrow_mut()) = 2;
+        {
+            (*a.borrow_mut()) = 1;
+            (*b.borrow_mut()) = 2
+        };
         (((*a.borrow()) + (*b.borrow())) > 0)
     } {
         assert!(((*a.borrow()) == 1));

tests/unit/out/refcount/compound_assign_paren.rs

@@ -41,48 +41,48 @@ fn main_0() -> i32 {
         flags: Rc::new(RefCell::new(0_u8)),
     }));
     let ptr: Value<Ptr<Item>> = Rc::new(RefCell::new((item.as_pointer())));
-    ({
+    {
         let rhs_0 =
             (((*(*(*ptr.borrow()).upgrade().deref()).flags.borrow()) as i32) | (1 << 0)) as u8;
         (*(*(*ptr.borrow()).upgrade().deref()).flags.borrow_mut()) = rhs_0
-    });
-    ({
+    };
+    {
         let rhs_0 =
             (((*(*(*ptr.borrow()).upgrade().deref()).flags.borrow()) as i32) | (1 << 1)) as u8;
         (*(*(*ptr.borrow()).upgrade().deref()).flags.borrow_mut()) = rhs_0
-    });
+    };
     assert!((((*(*(*ptr.borrow()).upgrade().deref()).flags.borrow()) as i32) == 3));
-    ({
+    {
         let rhs_0 = (((*(*(*ptr.borrow()).upgrade().deref()).flags.borrow()) as i32)
             & ((!(1 << 0) as u8) as i32)) as u8;
         (*(*(*ptr.borrow()).upgrade().deref()).flags.borrow_mut()) = rhs_0
-    });
+    };
     assert!((((*(*(*ptr.borrow()).upgrade().deref()).flags.borrow()) as i32) == 2));
     let bits: Value<Box<[u8]>> = Rc::new(RefCell::new(Box::new([
         0_u8,
         <u8>::default(),
         <u8>::default(),
         <u8>::default(),
     ])));
-    ({
+    {
         let rhs_0 = (((*bits.borrow())[((5) / 8) as usize] as i32)
             | (((1 << ((5) & 7)) as u8) as i32)) as u8;
         (*bits.borrow_mut())[((5) / 8) as usize] = rhs_0
-    });
-    ({
+    };
+    {
         let rhs_0 = (((*bits.borrow())[((13) / 8) as usize] as i32)
             | (((1 << ((13) & 7)) as u8) as i32)) as u8;
         (*bits.borrow_mut())[((13) / 8) as usize] = rhs_0
-    });
+    };
     assert!((((*bits.borrow())[(0) as usize] as i32) == 32));
     assert!((((*bits.borrow())[(1) as usize] as i32) == 32));
     assert!((((*bits.borrow())[(2) as usize] as i32) == 0));
     if (((*(*(*ptr.borrow()).upgrade().deref()).flags.borrow()) as i32) != 0) {
-        ({
+        {
             let rhs_0 = (((*(*(*ptr.borrow()).upgrade().deref()).flags.borrow()) as i32)
                 & ((!(1 << 1) as u8) as i32)) as u8;
             (*(*(*ptr.borrow()).upgrade().deref()).flags.borrow_mut()) = rhs_0
-        });
+        };
     }
     assert!((((*(*(*ptr.borrow()).upgrade().deref()).flags.borrow()) as i32) == 0));
     return 0;

tests/unit/out/refcount/foreach_map.rs

@@ -22,8 +22,10 @@ fn main_0() -> i32 {
                     .as_pointer()
             })
             .write((((*k.borrow()) as f64) / 2.0E+0));
-        (*i.borrow_mut()).prefix_inc();
-        (*k.borrow_mut()).prefix_dec();
+        {
+            (*i.borrow_mut()).prefix_inc();
+            (*k.borrow_mut()).prefix_dec()
+        };
     }
     let sum: Value<f64> = Rc::new(RefCell::new(0_f64));
     'loop_: for i in RefcountMapIter::begin(m.as_pointer()) {