projects
/
rust-101.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make it so that I can actually run stuff that relies on the solution of exercises
[rust-101.git]
/
workspace
/
src
/
part08.rs
diff --git
a/workspace/src/part08.rs
b/workspace/src/part08.rs
index 61f665f26cb8c5a4af203031536e2367c2d715c1..2d3b5d8f677a58456075d70bf3033470185ab28a 100644
(file)
--- a/
workspace/src/part08.rs
+++ b/
workspace/src/part08.rs
@@
-13,7
+13,9
@@
fn overflowing_add(a: u64, b: u64, carry: bool) -> (u64, bool) {
if sum >= a {
// The addition did not overflow. <br/>
// **Exercise 08.1**: Write the code to handle adding the carry in this case.
if sum >= a {
// The addition did not overflow. <br/>
// **Exercise 08.1**: Write the code to handle adding the carry in this case.
- unimplemented!()
+ let sum_total = u64::wrapping_add(sum, if carry { 1 } else { 0 }); /*@@*/
+ let had_overflow = sum_total < sum; /*@@*/
+ (sum_total, had_overflow) /*@@*/
} else {
// Otherwise, the addition *did* overflow. It is impossible for the addition of the carry
// to overflow again, as we are just adding 0 or 1.
} else {
// Otherwise, the addition *did* overflow. It is impossible for the addition of the carry
// to overflow again, as we are just adding 0 or 1.
@@
-52,7
+54,10
@@
impl ops::Add<BigInt> for BigInt {
unimplemented!()
}
// **Exercise 08.2**: Handle the final `carry`, and return the sum.
unimplemented!()
}
// **Exercise 08.2**: Handle the final `carry`, and return the sum.
- unimplemented!()
+ if carry { /*@@*/
+ result_vec.push(1); /*@@*/
+ } /*@@*/
+ BigInt { data: result_vec } /*@@*/
}
}
}
}