Add i128/u128 inc/dec and i64 Ptr add/sub (#466)

Author: lucic71

libcc2rs/src/dec.rs

@@ -59,10 +59,14 @@ macro_rules! prefix_wrap_dec_impl {
     };
 }
 
-postfix_wrap_dec_impl!(i8, u8, i16, u16, i32, u32, i64, u64, isize, usize);
+postfix_wrap_dec_impl!(
+    i8, u8, i16, u16, i32, u32, i64, u64, i128, u128, isize, usize
+);
 postfix_nowrap_dec_impl!(f32, f64);
 
-prefix_wrap_dec_impl!(i8, u8, i16, u16, i32, u32, i64, u64, isize, usize);
+prefix_wrap_dec_impl!(
+    i8, u8, i16, u16, i32, u32, i64, u64, i128, u128, isize, usize
+);
 prefix_nowrap_dec_impl!(f32, f64);
 
 pub trait UnsafePostfixDec {

libcc2rs/src/inc.rs

@@ -59,10 +59,14 @@ macro_rules! prefix_wrap_inc_impl {
     };
 }
 
-prefix_wrap_inc_impl!(i8, u8, i16, u16, i32, u32, i64, u64, isize, usize);
+prefix_wrap_inc_impl!(
+    i8, u8, i16, u16, i32, u32, i64, u64, i128, u128, isize, usize
+);
 prefix_nowrap_inc_impl!(f32, f64);
 
-postfix_wrap_inc_impl!(i8, u8, i16, u16, i32, u32, i64, u64, isize, usize);
+postfix_wrap_inc_impl!(
+    i8, u8, i16, u16, i32, u32, i64, u64, i128, u128, isize, usize
+);
 postfix_nowrap_inc_impl!(f32, f64);
 
 pub trait UnsafePostfixInc {

libcc2rs/src/rc.rs

@@ -925,7 +925,7 @@ macro_rules! impl_ptr_add_sub {
         }
     )+ }
 }
-impl_ptr_add_sub!(i32, u32, u64, isize, usize);
+impl_ptr_add_sub!(i32, u32, i64, u64, isize, usize);
 
 impl<T> PostfixInc for Ptr<T> {
     #[inline]

tests/unit/out/refcount/pointer_offset.rs

@@ -45,6 +45,11 @@ fn main_0() -> i32 {
         i.prefix_inc();
     }
     assert!((out == 51));
+    let mut step: i64 = 2_i64;
+    let mut offset: Ptr<i32> = (arr.as_pointer() as Ptr<i32>).offset((step) as isize);
+    assert!(({ (offset.read()) } == { (*arr.borrow())[(2) as usize] }));
+    offset = { offset.offset(-((step) as isize)) };
+    assert!(({ (offset).clone() } == { ((arr.as_pointer() as Ptr<i32>).offset(0)) }));
     return 0;
 }
 pub fn __cpp2rust_init_globals() {}

tests/unit/out/refcount/unary.rs

@@ -31,6 +31,16 @@ fn main_0() -> i32 {
     assert!((d == 1.5E+0));
     assert!(((n + n) == (2 * x2)));
     assert!((a[(0) as usize] == a[(0) as usize]));
+    let mut wide: i128 = 5_i128;
+    let mut w1: i128 = wide.postfix_inc();
+    let mut w2: i128 = wide.prefix_inc();
+    let mut w3: i128 = wide.postfix_dec();
+    let mut w4: i128 = wide.prefix_dec();
+    assert!((((w1 == 5_i128) && (w2 == 7_i128)) && (w3 == 7_i128)) && (w4 == 5_i128));
+    let mut uwide: u128 = 0_u128;
+    uwide.prefix_dec();
+    uwide.postfix_inc();
+    assert!((uwide == 0_u128));
     return 0;
 }
 pub fn __cpp2rust_init_globals() {}

tests/unit/out/unsafe/pointer_offset.rs

@@ -47,6 +47,11 @@ unsafe fn main_0() -> i32 {
         i.prefix_inc();
     }
     assert!(((out) == (51)));
+    let mut step: i64 = 2_i64;
+    let mut offset: *mut i32 = arr.as_mut_ptr().offset((step) as isize);
+    assert!(((*offset) == (arr[(2) as usize])));
+    offset = offset.offset(-((step) as isize));
+    assert!(((offset) == (&mut arr[(0) as usize] as *mut i32)));
     return 0;
 }
 pub unsafe fn __cpp2rust_init_globals() {}

tests/unit/out/unsafe/unary.rs

@@ -33,6 +33,18 @@ unsafe fn main_0() -> i32 {
     assert!(((d) == (1.5E+0)));
     assert!((((n) + (n)) == ((2) * (x2))));
     assert!(((a[(0) as usize]) == (a[(0) as usize])));
+    let mut wide: i128 = 5_i128;
+    let mut w1: i128 = wide.postfix_inc();
+    let mut w2: i128 = wide.prefix_inc();
+    let mut w3: i128 = wide.postfix_dec();
+    let mut w4: i128 = wide.prefix_dec();
+    assert!(
+        ((((w1) == (5_i128)) && ((w2) == (7_i128))) && ((w3) == (7_i128))) && ((w4) == (5_i128))
+    );
+    let mut uwide: u128 = 0_u128;
+    uwide.prefix_dec();
+    uwide.postfix_inc();
+    assert!(((uwide) == (0_u128)));
     return 0;
 }
 pub unsafe fn __cpp2rust_init_globals() {}

tests/unit/pointer_offset.cpp

@@ -17,5 +17,11 @@ int main() {
   for (int i = 0; i < 5; ++i)
     out += ptr[i];
   assert(out == 51);
+
+  long step = 2;
+  int *offset = arr + step;
+  assert(*offset == arr[2]);
+  offset = offset - step;
+  assert(offset == &arr[0]);
   return 0;
 }

tests/unit/unary.cpp

@@ -19,5 +19,16 @@ int main() {
   assert(d == 1.5);
   assert(+n + +n == 2 * x2);
   assert(+a[0] == a[0]);
+
+  __int128 wide = 5;
+  __int128 w1 = wide++;
+  __int128 w2 = ++wide;
+  __int128 w3 = wide--;
+  __int128 w4 = --wide;
+  assert(w1 == 5 && w2 == 7 && w3 == 7 && w4 == 5);
+  unsigned __int128 uwide = 0;
+  --uwide;
+  uwide++;
+  assert(uwide == 0);
   return 0;
 }