Skip to content

Commit 4dd7b3c

Browse files
lucic71lucic71
committed
Delete extra paren layer
1 parent eaa0d9a commit 4dd7b3c

7 files changed

Lines changed: 59 additions & 65 deletions

File tree

‎cpp2rust/converter/converter.cpp‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,12 +1306,8 @@ bool Converter::Convert(clang::Expr *expr,
13061306
expr && implicit_convert_to &&
13071307
NeedsImplicitScalarCast(expr->IgnoreImplicit()->getType(),
13081308
*implicit_convert_to);
1309-
PushParen outer(*this, needs_conversion);
1310-
bool result;
1311-
{
1312-
PushParen inner(*this, needs_conversion);
1313-
result = TraverseStmt(expr);
1314-
}
1309+
PushParen paren(*this, needs_conversion);
1310+
bool result = TraverseStmt(expr);
13151311
if (needs_conversion) {
13161312
ConvertCast(*implicit_convert_to);
13171313
computed_expr_type_ = ComputedExprType::FreshValue;

‎tests/unit/out/refcount/memcpy_struct_struct.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,8 @@ fn main_0() -> i32 {
7777
.to_any()
7878
.memcpy(
7979
&(((table.as_pointer() as Ptr<Entry>).offset(0 as isize)) as Ptr<Entry>).to_any(),
80-
((((*table_size.borrow()) as u64)
81-
.wrapping_mul(::std::mem::size_of::<Entry>() as u64)) as usize)
82-
as usize,
80+
(((*table_size.borrow()) as u64).wrapping_mul(::std::mem::size_of::<Entry>() as u64)
81+
as usize) as usize,
8382
);
8483
(((table.as_pointer() as Ptr<Entry>).offset((*table_size.borrow()) as isize)) as Ptr<Entry>)
8584
.to_any()

‎tests/unit/out/refcount/size_t_ssize_t.rs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ fn main_0() -> i32 {
3131
let ul: Value<u64> = Rc::new(RefCell::new(10_u64));
3232
let sz: Value<usize> = Rc::new(RefCell::new(20_usize));
3333
let mixed: Value<usize> = Rc::new(RefCell::new(
34-
((((*sz.borrow()) as u64).wrapping_add((*ul.borrow()))) as usize),
34+
(((*sz.borrow()) as u64).wrapping_add((*ul.borrow())) as usize),
3535
));
3636
assert!(((*mixed.borrow()) == 30_usize));
3737
assert!(((*sz.borrow()) > ((*ul.borrow()) as usize)));
3838
assert!((((*ul.borrow()) as usize) < (*sz.borrow())));
3939
assert!(!((*sz.borrow()) == ((*ul.borrow()) as usize)));
4040
let chain: Value<usize> = Rc::new(RefCell::new(
41-
((((((*sz.borrow()) as u64).wrapping_add((*ul.borrow()))).wrapping_add(5_u64))
42-
.wrapping_add(::std::mem::size_of::<i64>() as u64)) as usize),
41+
(((((*sz.borrow()) as u64).wrapping_add((*ul.borrow()))).wrapping_add(5_u64))
42+
.wrapping_add(::std::mem::size_of::<i64>() as u64) as usize),
4343
));
4444
assert!(
4545
((*chain.borrow())
@@ -64,8 +64,8 @@ fn main_0() -> i32 {
6464
assert!(((*sz.borrow()) == 21_usize));
6565
let fr: Value<usize> = Rc::new(RefCell::new(
6666
({
67-
let _a: usize = (((::std::mem::size_of::<i32>() as u64)
68-
.wrapping_add((*sz.borrow()) as u64)) as usize);
67+
let _a: usize = ((::std::mem::size_of::<i32>() as u64)
68+
.wrapping_add((*sz.borrow()) as u64) as usize);
6969
let _b: usize = ((*ul.borrow()) as usize);
7070
add_sizes_0(_a, _b)
7171
}),
@@ -83,7 +83,7 @@ fn main_0() -> i32 {
8383
));
8484
assert!(((*fr2.borrow()) == 21_u64));
8585
let lo: Value<usize> = Rc::new(RefCell::new(
86-
(({
86+
({
8787
let __tmp_0: Value<u64> = Rc::new(RefCell::new(((*sz.borrow()) as u64)));
8888
let __tmp_1: Value<u64> = Rc::new(RefCell::new(
8989
(::std::mem::size_of::<i64>() as u64).wrapping_add((*ul.borrow())),
@@ -94,10 +94,10 @@ fn main_0() -> i32 {
9494
__tmp_1.as_pointer()
9595
}
9696
.read())
97-
}) as usize),
97+
} as usize),
9898
));
9999
let hi: Value<usize> = Rc::new(RefCell::new(
100-
(({
100+
({
101101
let __tmp_0: Value<u64> = Rc::new(RefCell::new(
102102
(::std::mem::size_of::<i32>() as u64).wrapping_add((*sz.borrow()) as u64),
103103
));
@@ -107,21 +107,21 @@ fn main_0() -> i32 {
107107
ul.as_pointer()
108108
}
109109
.read())
110-
}) as usize),
110+
} as usize),
111111
));
112112
assert!(((*lo.borrow()) == (::std::mem::size_of::<i64>() as usize).wrapping_add(10_usize)));
113113
assert!(((*hi.borrow()) == (::std::mem::size_of::<i32>() as usize).wrapping_add(21_usize)));
114114
let bound: Value<usize> = Rc::new(RefCell::new(
115-
(({
115+
({
116116
let __tmp_0: Value<u64> = Rc::new(RefCell::new(((*sz.borrow()) as u64)));
117-
let __tmp_1: Value<u64> = Rc::new(RefCell::new(((4_usize) as u64)));
117+
let __tmp_1: Value<u64> = Rc::new(RefCell::new((4_usize as u64)));
118118
(if __tmp_0.as_pointer().read() <= __tmp_1.as_pointer().read() {
119119
__tmp_0.as_pointer()
120120
} else {
121121
__tmp_1.as_pointer()
122122
}
123123
.read())
124-
}) as usize),
124+
} as usize),
125125
));
126126
assert!(((*bound.borrow()) == 4_usize));
127127
let data: Value<Box<[i32]>> = Rc::new(RefCell::new(
@@ -147,11 +147,11 @@ fn main_0() -> i32 {
147147
}
148148
assert!(((*total.borrow()) == 56_usize));
149149
let cond: Value<usize> = Rc::new(RefCell::new(
150-
((if ((*sz.borrow()) > ((*ul.borrow()) as usize)) {
150+
(if ((*sz.borrow()) > ((*ul.borrow()) as usize)) {
151151
((*sz.borrow()) as u64).wrapping_add(::std::mem::size_of::<i32>() as u64)
152152
} else {
153153
(*ul.borrow())
154-
}) as usize),
154+
} as usize),
155155
));
156156
assert!(((*cond.borrow()) == (21_usize).wrapping_add(::std::mem::size_of::<i32>() as usize)));
157157
let arr: Value<Box<[usize]>> =
@@ -182,7 +182,7 @@ fn main_0() -> i32 {
182182
assert!(((*sm.borrow()) == 15_isize));
183183
assert!(((*sm.borrow()) > ((*l.borrow()) as isize)));
184184
let smin: Value<isize> = Rc::new(RefCell::new(
185-
(({
185+
({
186186
let __tmp_0: Value<i64> = Rc::new(RefCell::new(((*sd.borrow()) as i64)));
187187
let __tmp_1: Value<i64> = Rc::new(RefCell::new(((*sm.borrow()) as i64)));
188188
(if __tmp_0.as_pointer().read() <= __tmp_1.as_pointer().read() {
@@ -191,10 +191,10 @@ fn main_0() -> i32 {
191191
__tmp_1.as_pointer()
192192
}
193193
.read())
194-
}) as isize),
194+
} as isize),
195195
));
196196
let smax: Value<isize> = Rc::new(RefCell::new(
197-
(({
197+
({
198198
let __tmp_0: Value<i64> = Rc::new(RefCell::new(((*sd.borrow()) as i64)));
199199
let __tmp_1: Value<i64> = Rc::new(RefCell::new(((*sm.borrow()) as i64)));
200200
(if __tmp_0.as_pointer().read() >= __tmp_1.as_pointer().read() {
@@ -203,7 +203,7 @@ fn main_0() -> i32 {
203203
__tmp_1.as_pointer()
204204
}
205205
.read())
206-
}) as isize),
206+
} as isize),
207207
));
208208
assert!(((*smin.borrow()) == (-7_i32 as isize)));
209209
assert!(((*smax.borrow()) == 15_isize));

‎tests/unit/out/unsafe/memcpy_struct_struct.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,11 @@ unsafe fn main_0() -> i32 {
5454
];
5555
let mut table_size: usize = 4_usize;
5656
{
57-
if (((table_size as u64).wrapping_mul(::std::mem::size_of::<Entry>() as u64)) as usize) != 0
58-
{
57+
if ((table_size as u64).wrapping_mul(::std::mem::size_of::<Entry>() as u64) as usize) != 0 {
5958
::std::ptr::copy_nonoverlapping(
6059
((&mut table[(0) as usize] as *mut Entry) as *const Entry as *const ::libc::c_void),
6160
((&mut table[(table_size)] as *mut Entry) as *mut Entry as *mut ::libc::c_void),
62-
(((table_size as u64).wrapping_mul(::std::mem::size_of::<Entry>() as u64)) as usize)
61+
((table_size as u64).wrapping_mul(::std::mem::size_of::<Entry>() as u64) as usize)
6362
as usize,
6463
)
6564
}

‎tests/unit/out/unsafe/size_t_ssize_t.rs‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ unsafe fn main_0() -> i32 {
2525
assert!(((n) == ((::std::mem::size_of::<i32>() as usize).wrapping_add(4_usize))));
2626
let mut ul: u64 = 10_u64;
2727
let mut sz: usize = 20_usize;
28-
let mut mixed: usize = (((sz as u64).wrapping_add(ul)) as usize);
28+
let mut mixed: usize = ((sz as u64).wrapping_add(ul) as usize);
2929
assert!(((mixed) == (30_usize)));
30-
assert!(((sz) > ((ul) as usize)));
31-
assert!((((ul) as usize) < (sz)));
32-
assert!(!((sz) == ((ul) as usize)));
33-
let mut chain: usize = (((((sz as u64).wrapping_add(ul)).wrapping_add(5_u64))
34-
.wrapping_add(::std::mem::size_of::<i64>() as u64)) as usize);
30+
assert!(((sz) > (ul as usize)));
31+
assert!(((ul as usize) < (sz)));
32+
assert!(!((sz) == (ul as usize)));
33+
let mut chain: usize = ((((sz as u64).wrapping_add(ul)).wrapping_add(5_u64))
34+
.wrapping_add(::std::mem::size_of::<i64>() as u64) as usize);
3535
assert!(
3636
((chain)
3737
== (((((20) + (10)) + (5)) as usize)
@@ -50,8 +50,8 @@ unsafe fn main_0() -> i32 {
5050
sz = (sz).wrapping_add(1_usize);
5151
assert!(((sz) == (21_usize)));
5252
let mut fr: usize = (unsafe {
53-
let _a: usize = (((::std::mem::size_of::<i32>() as u64).wrapping_add(sz as u64)) as usize);
54-
let _b: usize = ((ul) as usize);
53+
let _a: usize = ((::std::mem::size_of::<i32>() as u64).wrapping_add(sz as u64) as usize);
54+
let _b: usize = (ul as usize);
5555
add_sizes_0(_a, _b)
5656
});
5757
assert!(
@@ -60,38 +60,38 @@ unsafe fn main_0() -> i32 {
6060
.wrapping_add(10_usize)))
6161
);
6262
let mut fr2: u64 = (unsafe {
63-
let _x: u64 = ((sz) as u64);
63+
let _x: u64 = (sz as u64);
6464
take_ulong_1(_x)
6565
});
6666
assert!(((fr2) == (21_u64)));
67-
let mut lo: usize = (({
68-
let mut __tmp_0 = ((sz) as u64);
67+
let mut lo: usize = ({
68+
let mut __tmp_0 = (sz as u64);
6969
let mut __tmp_1 = (::std::mem::size_of::<i64>() as u64).wrapping_add(ul);
7070
(*if *&mut __tmp_0 <= *&mut __tmp_1 {
7171
(&mut __tmp_0) as *const _
7272
} else {
7373
(&mut __tmp_1) as *const _
7474
})
75-
}) as usize);
76-
let mut hi: usize = (({
75+
} as usize);
76+
let mut hi: usize = ({
7777
let mut __tmp_0 = (::std::mem::size_of::<i32>() as u64).wrapping_add(sz as u64);
7878
(*if *&mut __tmp_0 >= *&mut ul {
7979
(&mut __tmp_0) as *const _
8080
} else {
8181
(&mut ul) as *const _
8282
})
83-
}) as usize);
83+
} as usize);
8484
assert!(((lo) == ((::std::mem::size_of::<i64>() as usize).wrapping_add(10_usize))));
8585
assert!(((hi) == ((::std::mem::size_of::<i32>() as usize).wrapping_add(21_usize))));
86-
let mut bound: usize = (({
87-
let mut __tmp_0 = ((sz) as u64);
88-
let mut __tmp_1 = ((4_usize) as u64);
86+
let mut bound: usize = ({
87+
let mut __tmp_0 = (sz as u64);
88+
let mut __tmp_1 = (4_usize as u64);
8989
(*if *&mut __tmp_0 <= *&mut __tmp_1 {
9090
(&mut __tmp_0) as *const _
9191
} else {
9292
(&mut __tmp_1) as *const _
9393
})
94-
}) as usize);
94+
} as usize);
9595
assert!(((bound) == (4_usize)));
9696
let mut data: [i32; 8] = [0_i32; 8];
9797
let mut count: usize = (::std::mem::size_of::<[i32; 8]>() as usize)
@@ -108,11 +108,11 @@ unsafe fn main_0() -> i32 {
108108
i.postfix_inc();
109109
}
110110
assert!(((total) == (56_usize)));
111-
let mut cond: usize = ((if ((sz) > ((ul) as usize)) {
111+
let mut cond: usize = (if ((sz) > (ul as usize)) {
112112
(sz as u64).wrapping_add(::std::mem::size_of::<i32>() as u64)
113113
} else {
114114
ul
115-
}) as usize);
115+
} as usize);
116116
assert!(((cond) == ((21_usize).wrapping_add(::std::mem::size_of::<i32>() as usize))));
117117
let mut arr: [usize; 4] = [0_usize, 1_usize, 2_usize, 3_usize];
118118
let mut idx: usize = (if ((::std::mem::size_of::<i32>()) > (2_usize)) {
@@ -131,27 +131,27 @@ unsafe fn main_0() -> i32 {
131131
assert!(((sd) == (-7_i32 as isize)));
132132
assert!(((sd) < (0_isize)));
133133
let mut l: i64 = 3_i64;
134-
let mut sm: isize = ((((s2) as i64) + (l)) as isize);
134+
let mut sm: isize = (((s2 as i64) + (l)) as isize);
135135
assert!(((sm) == (15_isize)));
136-
assert!(((sm) > ((l) as isize)));
137-
let mut smin: isize = (({
138-
let mut __tmp_0 = ((sd) as i64);
139-
let mut __tmp_1 = ((sm) as i64);
136+
assert!(((sm) > (l as isize)));
137+
let mut smin: isize = ({
138+
let mut __tmp_0 = (sd as i64);
139+
let mut __tmp_1 = (sm as i64);
140140
(*if *&mut __tmp_0 <= *&mut __tmp_1 {
141141
(&mut __tmp_0) as *const _
142142
} else {
143143
(&mut __tmp_1) as *const _
144144
})
145-
}) as isize);
146-
let mut smax: isize = (({
147-
let mut __tmp_0 = ((sd) as i64);
148-
let mut __tmp_1 = ((sm) as i64);
145+
} as isize);
146+
let mut smax: isize = ({
147+
let mut __tmp_0 = (sd as i64);
148+
let mut __tmp_1 = (sm as i64);
149149
(*if *&mut __tmp_0 >= *&mut __tmp_1 {
150150
(&mut __tmp_0) as *const _
151151
} else {
152152
(&mut __tmp_1) as *const _
153153
})
154-
}) as isize);
154+
} as isize);
155155
assert!(((smin) == (-7_i32 as isize)));
156156
assert!(((smax) == (15_isize)));
157157
let mut delta: isize = ((sz as isize) - (ul as isize));

‎tests/unit/out/unsafe/union_addrof_external.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ pub unsafe fn fill_1(mut out: *mut ::libc::c_void, mut cap: usize) {
5353
src[(5) as usize] = 0_u8;
5454
src[(6) as usize] = 0_u8;
5555
src[(7) as usize] = 1_u8;
56-
let mut n: usize = ((if ((((::std::mem::size_of::<[u8; 16]>()) < (cap)) as i32) != 0) {
57-
((::std::mem::size_of::<[u8; 16]>()) as u64)
56+
let mut n: usize = (if ((((::std::mem::size_of::<[u8; 16]>()) < (cap)) as i32) != 0) {
57+
(::std::mem::size_of::<[u8; 16]>() as u64)
5858
} else {
59-
((cap) as u64)
60-
}) as usize);
59+
(cap as u64)
60+
} as usize);
6161
{
6262
if n != 0 {
6363
::std::ptr::copy_nonoverlapping(

‎tests/unit/out/unsafe/union_flex_array_member.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub fn main() {
3232
unsafe fn main_0() -> i32 {
3333
let mut tail_size: usize = 32_usize;
3434
let mut n: *mut node = (libcc2rs::malloc_unsafe(
35-
(((::std::mem::size_of::<node>() as u64).wrapping_add(tail_size as u64)) as usize),
35+
((::std::mem::size_of::<node>() as u64).wrapping_add(tail_size as u64) as usize),
3636
) as *mut node);
3737
(*n).len = tail_size;
3838
let mut i: usize = 0_usize;

0 commit comments

Comments
 (0)