From d50d9208668e4223dfd5644c304df54b3c2af149 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Tue, 31 Jul 2018 14:22:45 -0400
Subject: [PATCH] Refactor script running to separate method

---
 src/main.rs | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index b713af78c..a3baf8401 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -38,25 +38,26 @@ fn main() {
     }
 }
 
-fn run_script(script_file: &String) {
+fn _run_string(source: &String) {
     let mut vm = VirtualMachine::new();
+    let code_obj = compile::compile(&mut vm, &source, compile::Mode::Exec).unwrap();
+    debug!("Code object: {:?}", code_obj.borrow());
+    let builtins = vm.get_builtin_scope();
+    let vars = vm.new_scope(Some(builtins)); // Keep track of local variables
+    match vm.run_code_obj(code_obj, vars) {
+        Ok(_value) => {}
+        Err(exc) => {
+            panic!("Exception: {:?}", exc);
+        }
+    }
+}
+
+fn run_script(script_file: &String) {
     debug!("Running file {}", script_file);
     // Parse an ast from it:
     let filepath = Path::new(script_file);
     match parser::read_file(filepath) {
-        Ok(source) => {
-            let code_obj = compile::compile(&mut vm, &source, compile::Mode::Exec).unwrap();
-            debug!("Code object: {:?}", code_obj.borrow());
-            let builtins = vm.get_builtin_scope();
-            let vars = vm.new_scope(Some(builtins)); // Keep track of local variables
-            match vm.run_code_obj(code_obj, vars) {
-                Ok(_value) => {
-                }
-                Err(exc) => {
-                    panic!("Exception: {:?}", exc);
-                }
-            }
-        }
+        Ok(source) => _run_string(&source),
         Err(msg) => {
             error!("Parsing went horribly wrong: {}", msg);
             std::process::exit(1);