Fix warnings in main.rs.

cthulahoops · cthulahoops · commit 59ed5405f440 · 2018-07-28T12:29:13.000+01:00
diff --git a/src/main.rs b/src/main.rs
@@ -12,7 +12,6 @@ use rustpython_parser::parser;
 use rustpython_vm::{VirtualMachine, Executor};
 use rustpython_vm::compile;
 use rustpython_vm::eval::eval;
-use rustpython_vm::pyobject::PyObjectRef;
 use std::io;
 use std::io::prelude::*;
 use std::path::Path;
@@ -49,7 +48,13 @@ fn run_script(script_file: &String) {
             let code_obj = compile::compile(&mut vm, &source, compile::Mode::Exec).unwrap();
             debug!("Code object: {:?}", code_obj.borrow());
             let vars = vm.new_dict(); // Keep track of local variables
-            vm.run_code_obj(code_obj, vars);
+            match vm.run_code_obj(code_obj, vars) {
+                Ok(_value) => {
+                }
+                Err(exc) => {
+                    panic!("Exception: {:?}", exc);
+                }
+            }
         }
         Err(msg) => {
             error!("Parsing went horribly wrong: {}", msg);
@@ -70,13 +75,20 @@ fn run_shell() {
         let mut input = String::new();
         print!(">>>>> "); // Use 5 items. pypy has 4, cpython has 3.
         io::stdout().flush().ok().expect("Could not flush stdout");
-        io::stdin().read_line(&mut input);
-        // input = input.trim().to_string();
-        debug!("You entered {:?}", input);
-        let result = eval(&mut vm, &input, vars.clone());
-        match result {
-            Ok(value) => println!("{}", vm.to_str(value)),
-            Err(value) => println!("Error: {:?}", value),
+        match io::stdin().read_line(&mut input) {
+            Ok(0) => {
+                break;
+            }
+            Ok(_) => {
+                debug!("You entered {:?}", input);
+                match eval(&mut vm, &input, vars.clone()) {
+                    Ok(value) => println!("{}", vm.to_str(value)),
+                    Err(value) => println!("Error: {:?}", value),
+                };
+            }
+            Err(msg) => {
+                panic!("Error: {:?}", msg)
+            }
         };
     }
 }
