Convert standalone integer i++/++i to i += 1 in converter and golden files

Agent-Logs-Url: https://github.com/Cpp2Rust/cpp2rust/sessions/a93c5839-6535-4cd5-9e98-6988635319df

Co-authored-by: nunoplopes <2998477+nunoplopes@users.noreply.github.com>

Author: Copilot

cpp2rust/converter/converter.cpp

@@ -2045,8 +2045,16 @@ bool Converter::IsReferenceType(const clang::Expr *expr) const {
 bool Converter::ConvertIncAndDec(clang::UnaryOperator *expr) {
   auto opcode = expr->getOpcode();
   auto *sub_expr = expr->getSubExpr();
+  bool is_int = sub_expr->getType().getNonReferenceType()->isIntegerType();
   switch (opcode) {
   case clang::UO_PostInc: {
+    if (isVoid() && is_int) {
+      PushExprKind push(*this, ExprKind::LValue);
+      Convert(sub_expr);
+      StrCat(" += 1");
+      SetFresh();
+      return true;
+    }
     PushExprKind push(*this, ExprKind::RValue);
     Convert(sub_expr);
     StrCat(".postfix_inc()");
@@ -2061,6 +2069,13 @@ bool Converter::ConvertIncAndDec(clang::UnaryOperator *expr) {
     return true;
   }
   case clang::UO_PreInc: {
+    if (isVoid() && is_int) {
+      PushExprKind push(*this, ExprKind::LValue);
+      Convert(sub_expr);
+      StrCat(" += 1");
+      SetFresh();
+      return true;
+    }
     PushExprKind push(*this, ExprKind::RValue);
     Convert(sub_expr);
     StrCat(".prefix_inc()");

cpp2rust/converter/models/converter_refcount.cpp

@@ -586,6 +586,10 @@ bool ConverterRefCount::ConvertIncAndDec(clang::UnaryOperator *expr) {
   auto opcode = expr->getOpcode();
   auto *sub_expr = expr->getSubExpr();
 
+  bool is_inc = (opcode == clang::UO_PostInc || opcode == clang::UO_PreInc);
+  bool use_addassign = isVoid() && is_inc &&
+                       sub_expr->getType().getNonReferenceType()->isIntegerType();
+
   const char *method = nullptr;
   switch (opcode) {
   case clang::UO_PostInc:
@@ -606,9 +610,17 @@ bool ConverterRefCount::ConvertIncAndDec(clang::UnaryOperator *expr) {
 
   auto str = ConvertLValue(sub_expr);
   if (!pending_deref_.empty()) {
-    StrCat(pending_deref_.take(), ".with_mut(|__v| __v.", method, "())");
+    if (use_addassign) {
+      StrCat(pending_deref_.take(), ".with_mut(|__v| *__v += 1)");
+    } else {
+      StrCat(pending_deref_.take(), ".with_mut(|__v| __v.", method, "())");
+    }
   } else {
-    StrCat(str, ".", method, "()");
+    if (use_addassign) {
+      StrCat(str, " += 1");
+    } else {
+      StrCat(str, ".", method, "()");
+    }
   }
   return true;
 }

tests/benchmarks/out/refcount/array_sum.rs

@@ -25,15 +25,15 @@ fn main_0() -> i32 {
             let __rhs = (*i.borrow());
             (*array.borrow()).as_ref().unwrap().borrow_mut()[((*i.borrow()) as u64) as usize] =
                 __rhs;
-            (*i.borrow_mut()).prefix_inc();
+            *i.borrow_mut() += 1;
         }
         let i: Value<i32> = Rc::new(RefCell::new(0));
         'loop_: while ((*i.borrow()) < (*N.borrow())) {
             (*sum.borrow_mut()) += ((*array.borrow()).as_ref().unwrap().borrow()
                 [((*i.borrow()) as u64) as usize] as i64);
-            (*i.borrow_mut()).prefix_inc();
+            *i.borrow_mut() += 1;
         }
-        (*k.borrow_mut()).prefix_inc();
+        *k.borrow_mut() += 1;
     }
     return ((*sum.borrow()) as i32);
 }

tests/benchmarks/out/refcount/bfs.rs

@@ -143,7 +143,7 @@ pub fn BFS_0(graph: Ptr<Graph>, start_vertex: u32) -> Ptr<u32> {
             .write(false);
         let __rhs = (*i.borrow());
         (*pred.borrow()).offset((*i.borrow()) as isize).write(__rhs);
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
     }
     (*visited.borrow())
         .offset((*start_vertex.borrow()) as isize)
@@ -207,7 +207,7 @@ fn main_0() -> i32 {
         (*(*graph.borrow()).adj.borrow())
             .offset((*i.borrow()) as isize)
             .write(Default::default());
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
     }
     let i: Value<u32> = Rc::new(RefCell::new(0_u32));
     'loop_: while (((*i.borrow()) as u64) < (*V.borrow())) {
@@ -218,9 +218,9 @@ fn main_0() -> i32 {
                 let _dst: u32 = (*j.borrow());
                 (*graph.borrow()).push(_src, _dst)
             });
-            (*j.borrow_mut()).prefix_inc();
+            *j.borrow_mut() += 1;
         }
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
     }
     let pred: Value<Ptr<u32>> = Rc::new(RefCell::new(
         ({
@@ -244,7 +244,7 @@ fn main_0() -> i32 {
             (*head.borrow()).delete();
             (*head.borrow_mut()) = (*next.borrow()).clone();
         }
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
     }
     (*(*graph.borrow()).adj.borrow()).delete_array();
     (*pred.borrow()).delete_array();

tests/benchmarks/out/refcount/bst.rs

@@ -110,7 +110,7 @@ fn main_0() -> i32 {
             });
             insert_1(_node, _new_node)
         });
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
     }
     let i: Value<i32> = Rc::new(RefCell::new(0));
     'loop_: while ((*i.borrow()) < (*N.borrow())) {
@@ -119,7 +119,7 @@ fn main_0() -> i32 {
             let _value: i32 = (*i.borrow());
             find_0(_node, _value)
         });
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
     }
     return 0;
 }

tests/benchmarks/out/refcount/prime.rs

@@ -13,7 +13,7 @@ pub fn is_prime_0(x: i32) -> bool {
         if (((*x.borrow()) % (*i.borrow())) == 0) {
             return false;
         }
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
     }
     return true;
 }
@@ -28,7 +28,7 @@ pub fn largest_prime_1(n: i32) -> i32 {
         }) {
             (*max.borrow_mut()) = (*i.borrow());
         }
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
     }
     return (*max.borrow());
 }

tests/benchmarks/out/refcount/ref_array_sum.rs

@@ -13,7 +13,7 @@ pub fn initialize_0(array: Ptr<Option<Value<Box<[i32]>>>>, N: i32) {
         let __rhs = (*i.borrow());
         (*array.upgrade().deref()).as_ref().unwrap().borrow_mut()
             [((*i.borrow()) as u64) as usize] = __rhs;
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
     }
 }
 pub fn sum_1(array: Ptr<Option<Value<Box<[i32]>>>>, N: i32) -> i64 {
@@ -26,7 +26,7 @@ pub fn sum_1(array: Ptr<Option<Value<Box<[i32]>>>>, N: i32) -> i64 {
             .as_ref()
             .unwrap()
             .borrow()[((*i.borrow()) as u64) as usize] as i64);
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
     }
     return (*sum.borrow());
 }
@@ -54,7 +54,7 @@ fn main_0() -> i32 {
             let _N: i32 = (*N.borrow());
             sum_1(_array, _N)
         });
-        (*k.borrow_mut()).prefix_inc();
+        *k.borrow_mut() += 1;
     }
     return ((*out.borrow()) as i32);
 }

tests/benchmarks/out/refcount/ref_prime.rs

@@ -19,7 +19,7 @@ pub fn is_prime_0(x: Ptr<i32>) -> bool {
         {
             return false;
         }
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
     }
     return true;
 }
@@ -36,7 +36,7 @@ pub fn largest_prime_1(n: Ptr<i32>) -> i32 {
         }) {
             (*max.borrow_mut()) = (*i.borrow());
         }
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
     }
     return (*max.borrow());
 }

tests/benchmarks/out/refcount/sum.rs

@@ -16,7 +16,7 @@ fn main_0() -> i32 {
     let j: Value<i64> = Rc::new(RefCell::new((*N.borrow())));
     'loop_: while ((*i.borrow()) < (*j.borrow())) {
         (*sum.borrow_mut()) += ((*i.borrow()) + (*j.borrow()));
-        (*i.borrow_mut()).prefix_inc();
+        *i.borrow_mut() += 1;
         (*j.borrow_mut()).prefix_dec();
     }
     return ((*sum.borrow()) as i32);

tests/benchmarks/out/unsafe/array_sum.rs

@@ -24,14 +24,14 @@ unsafe fn main_0() -> i32 {
         let mut i: i32 = 0;
         'loop_: while ((i) < (N)) {
             array.as_mut().unwrap()[(i as u64) as usize] = i;
-            i.prefix_inc();
+            i += 1;
         }
         let mut i: i32 = 0;
         'loop_: while ((i) < (N)) {
             sum += (array.as_mut().unwrap()[(i as u64) as usize] as i64);
-            i.prefix_inc();
+            i += 1;
         }
-        k.prefix_inc();
+        k += 1;
     }
     return (sum as i32);
 }