newline fix

[rust-101.git] / src / part08.rs

diff --git a/src/part08.rs b/src/part08.rs
index cacff46862b5649cb1bcc144189b7522db6b524e..7b471b9d827bdb1c6a5d47f836b334a9d9a1b714 100644 (file)
--- a/src/part08.rs
+++ b/src/part08.rs
@@ -20,15 +20,17 @@ fn overflowing_add(a: u64, b: u64, carry: bool) -> (u64, bool) {
     //@ function (see [the documentation](http://doc.rust-lang.org/stable/std/primitive.u64.html#method.wrapping_add),
     //@ there are similar functions for other arithmetic operations). There are also similar functions
     //@ `checked_add` etc. to enforce the overflow check.
     //@ function (see [the documentation](http://doc.rust-lang.org/stable/std/primitive.u64.html#method.wrapping_add),
     //@ there are similar functions for other arithmetic operations). There are also similar functions
     //@ `checked_add` etc. to enforce the overflow check.

-    let sum = u64::wrapping_add(a, b);
+    let sum = a.wrapping_add(b);

     // If an overflow happened, then the sum will be smaller than *both* summands. Without an overflow, of course, it will be
     // at least as large as both of them. So, let's just pick one and check.
     if sum >= a {
         // The addition did not overflow. <br/>
         // **Exercise 08.1**: Write the code to handle adding the carry in this case.
     // If an overflow happened, then the sum will be smaller than *both* summands. Without an overflow, of course, it will be
     // at least as large as both of them. So, let's just pick one and check.
     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 = sum.wrapping_add(if carry { 1 } else { 0 });/*@@*/
+        let had_overflow = sum_total < sum;                         /*@@*/
+        (sum_total, had_overflow)                                   /*@@*/

     } else {
     } else {

-        // The addition *did* overflow. It is impossible for the addition of the carry
+        // 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.
         (sum + if carry { 1 } else { 0 }, true)                     /*@*/
     }
         // to overflow again, as we are just adding 0 or 1.
         (sum + if carry { 1 } else { 0 }, true)                     /*@*/
     }


@@ -82,7 +84,10 @@ impl ops::Add<BigInt> for BigInt {
             carry = new_carry;                                                  /*@*/
         }
         // **Exercise 08.2**: Handle the final `carry`, and return the sum.
             carry = new_carry;                                                  /*@*/
         }
         // **Exercise 08.2**: Handle the final `carry`, and return the sum.

-        unimplemented!()
+        if carry {                                                              /*@@*/
+            result_vec.push(1);                                                 /*@@*/
+        }                                                                       /*@@*/
+        BigInt { data: result_vec }                                             /*@@*/

     }
 }
 
     }
 }
 


@@ -101,6 +106,8 @@ impl<'a, 'b> ops::Add<&'a BigInt> for &'b BigInt {
     }
 }
 
     }
 }
 

+// **Exercise 08.4**: Implement the two missing combinations of arguments for `Add`. You should not have to duplicate the implementation.
+

 // ## Modules
 //@ As you learned, tests can be written right in the middle of your development in Rust. However, it is
 //@ considered good style to bundle all tests together. This is particularly useful in cases where
 // ## Modules
 //@ As you learned, tests can be written right in the middle of your development in Rust. However, it is
 //@ considered good style to bundle all tests together. This is particularly useful in cases where


@@ -111,13 +118,15 @@ impl<'a, 'b> ops::Add<&'a BigInt> for &'b BigInt {
 //@ Rust would not bother compiling them when you just build your program for normal use. Other than that, tests work as usually.
 #[cfg(test)]
 mod tests {
 //@ Rust would not bother compiling them when you just build your program for normal use. Other than that, tests work as usually.
 #[cfg(test)]
 mod tests {

-    #[test]
+    use part05::BigInt;
+
+    /*#[test]*/

     fn test_add() {
         let b1 = BigInt::new(1 << 32);
         let b2 = BigInt::from_vec(vec![0, 1]);
 
         assert_eq!(&b1 + &b2, BigInt::from_vec(vec![1 << 32, 1]));
     fn test_add() {
         let b1 = BigInt::new(1 << 32);
         let b2 = BigInt::from_vec(vec![0, 1]);
 
         assert_eq!(&b1 + &b2, BigInt::from_vec(vec![1 << 32, 1]));

-        // **Exercise 08.4**: Add some more cases to this test.
+        // **Exercise 08.5**: Add some more cases to this test.

     }
 }
 //@ As already mentioned, outside of the module, only those items declared public with `pub` may be used. Submodules can access
     }
 }
 //@ As already mentioned, outside of the module, only those items declared public with `pub` may be used. Submodules can access


@@ -140,7 +149,7 @@ mod tests {
 //@ from other files. This ensures that the directory structure mirrors the structure of the modules, with `mod.rs`, `lib.rs`
 //@ and `main.rs` representing a directory or crate itself (similar to, e.g., `__init__.py` in Python).
 
 //@ from other files. This ensures that the directory structure mirrors the structure of the modules, with `mod.rs`, `lib.rs`
 //@ and `main.rs` representing a directory or crate itself (similar to, e.g., `__init__.py` in Python).
 

-// **Exercise 08.4**: Write a subtraction function, and testcases for it. Decide for yourself how you want to handle negative results.
+// **Exercise 08.6**: Write a subtraction function, and testcases for it. Decide for yourself how you want to handle negative results.

 // For example, you may want to return an `Option`, to panic, or to return `0`.
 
 // For example, you may want to return an `Option`, to panic, or to return `0`.
 

-//@ [index](main.html) | [previous](part07.html) | [next](main.html)
+//@ [index](main.html) | [previous](part07.html) | [next](part09.html)