Merge branch 'hw6' of https://github.com/themultiplexer/bsys-ws17-grp11 into hw6

hw6/task1/src/main.rs

@@ -70,16 +70,25 @@ fn concatenate_strings<'a>(s1: &'a str, s2: &'a str) -> String {
 }
 
 /// Splits the given String reference and returns it as Vector.
-/*fn split_into_strings<'2>(s1:&'a str) -> Vec<&'a str> {
-    s1.to_string().split_whitespace().collect()
-}*/
+fn split_into_strings<'a>(s1: &'a str) -> Vec<String> {
+    s1.to_string()
+        .split_whitespace()
+        .map(|s| s.to_string())
+        .collect()
+}
+
 /// Calculates the sum of the given Strings and returns them as a Result.
 fn sum_strings(v: Vec<&str>) -> Result<i32, &str> {
     let mut sum = 0;
     for x in v {
         match x.parse::<i32>() {
             Ok(val) => {
-                sum += val;
+                match i32::checked_add(sum, val) {
+                    Some(y) => {
+                        sum = y;
+                    }
+                    None => return Err("Overflow would happen in sum_strings()"),
+                }
             }
             Err(_) => return Err("Given String is not a int"),
         }
@@ -93,7 +102,12 @@ fn mul_strings(v: Vec<&str>) -> Result<i32, &str> {
     for x in v {
         match x.parse::<i32>() {
             Ok(val) => {
-                prod *= val;
+                match i32::checked_mul(prod, val) {
+                    Some(y) => {
+                        prod = y;
+                    }
+                    None => return Err("Overflow would happen in mul_strings()"),
+                }
             }
             Err(_) => return Err("Given String is not a int"),
         }

hw6/task2/src/shell.rs

@@ -0,0 +1,47 @@
+struct Shell<R, W> {
+    pub reader: R,
+    pub writer: W,
+    pub should_exit: bool,
+    pub name: String,
+}
+
+impl Shell<R, W> {
+    /// Creates a new Shell.
+    pub fn new(input: R, output: W, name: String) -> Self {
+        Shell {
+            reader = input,
+            writer = output,
+            should_exit = false,
+            name = name,
+        }
+    }
+    /// Initializes the Shell Loop
+    pub fn start() -> Result<Self, &str> {
+    }
+    /// Waits for user inputs.
+    fn shell_loop() -> Result {
+    }
+    /// Prints the shell prompt.
+    fn prompt() -> Result<Option, &str> {
+    }
+    /// Runs a command.
+    fn run(&str) {
+    }
+}
+
+impl BufRead for Shell<R, W> {
+    fn fill_buf(&mut self) -> Result<&[u8]> {}
+    fn consume(&mut self, amt: usize) {}
+}
+
+impl Write for Shell<R, W> {
+    fn write(&mut self, buf: &[u8]) -> Result<usize> {}
+    fn flush(&mut self) -> Result<()> {}
+}
+
+
+let mut s = Shell::new();
+    match s.start() {
+        Ok(_) => process::exit(0),
+        Err(_) => process::exit(1),
+    }