Translate pointer diff

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2028,7 +2028,7 @@ bool Converter::VisitBinaryOperator(clang::BinaryOperator *expr) {
           std::format("::std::mem::size_of::<{}>()", pointee_type_as_string);
       StrCat(size_of_as_string);
     }
-    StrCat(keyword::kAs, "u64");
+    ConvertCast(expr->getType());
     computed_expr_type_ = ComputedExprType::FreshValue;
   } else {
     ConvertGenericBinaryOperator(expr);

cpp2rust/converter/models/converter_refcount.cpp

@@ -1247,8 +1247,12 @@ bool ConverterRefCount::VisitBinaryOperator(clang::BinaryOperator *expr) {
   // fresh pointers
   if (expr->isAdditiveOp() && lhs_type->isPointerType() &&
       rhs_type->isPointerType()) {
-    StrCat(ConvertFreshPointer(lhs), expr->getOpcodeStr(),
-           ConvertFreshPointer(rhs));
+    {
+      PushParen paren(*this);
+      StrCat(ConvertFreshPointer(lhs), expr->getOpcodeStr(),
+             ConvertFreshPointer(rhs));
+    }
+    ConvertCast(expr->getType());
     computed_expr_type_ = ComputedExprType::FreshValue;
     return false;
   }

libcc2rs/src/rc.rs

@@ -675,45 +675,29 @@ impl<T> Sub for Ptr<T> {
     }
 }
 
-impl<T> std::ops::AddAssign<u64> for Ptr<T> {
-    #[inline]
-    fn add_assign(&mut self, other: u64) {
-        let step = self.elem_step();
-        self.offset = self
-            .offset
-            .wrapping_add((other as usize).wrapping_mul(step));
-    }
-}
-
-impl<T> std::ops::AddAssign<i32> for Ptr<T> {
-    #[inline]
-    fn add_assign(&mut self, other: i32) {
-        let step = self.elem_step();
-        self.offset = self
-            .offset
-            .wrapping_add(((other as isize).wrapping_mul(step as isize)) as usize);
-    }
-}
-
-impl<T> std::ops::AddAssign<u32> for Ptr<T> {
-    #[inline]
-    fn add_assign(&mut self, other: u32) {
-        let step = self.elem_step();
-        self.offset = self
-            .offset
-            .wrapping_add((other as usize).wrapping_mul(step));
-    }
-}
-
-impl<T> std::ops::AddAssign<isize> for Ptr<T> {
-    #[inline]
-    fn add_assign(&mut self, other: isize) {
-        let step = self.elem_step();
-        self.offset = self
-            .offset
-            .wrapping_add((other.wrapping_mul(step as isize)) as usize);
-    }
+macro_rules! impl_ptr_add_sub_assign {
+    ($($rhs:ty),+) => { $(
+        impl<T> std::ops::AddAssign<$rhs> for Ptr<T> {
+            #[inline]
+            fn add_assign(&mut self, other: $rhs) {
+                let step = self.elem_step();
+                self.offset = self.offset.wrapping_add(
+                    ((other as isize).wrapping_mul(step as isize)) as usize,
+                );
+            }
+        }
+        impl<T> std::ops::SubAssign<$rhs> for Ptr<T> {
+            #[inline]
+            fn sub_assign(&mut self, other: $rhs) {
+                let step = self.elem_step();
+                self.offset = self.offset.wrapping_sub(
+                    ((other as isize).wrapping_mul(step as isize)) as usize,
+                );
+            }
+        }
+    )+ }
 }
+impl_ptr_add_sub_assign!(i32, u32, u64, isize);
 
 macro_rules! impl_ptr_add_sub {
     ($($rhs:ty),+) => { $(