Use more platform checks

coolreader18 · coolreader18 · commit bd749eae2de5 · 2019-07-12T20:18:54.000-05:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,12 +25,14 @@ clap = "2.31.2"
 rustpython-compiler = {path = "compiler", version = "0.1.0"}
 rustpython-parser = {path = "parser", version = "0.1.0"}
 rustpython-vm = {path = "vm", version = "0.1.0"}
-#rustyline = "4.1.0"
 xdg = "2.2.0"
 
 flame = { version = "0.2", optional = true }
 flamescope = { version = "0.1", optional = true }
 
+[target.'cfg(not(target_os = "redox"))'.dependencies]
+rustyline = "4.1.0"
+
 [dev-dependencies.cpython]
 version = "0.2"
 
diff --git a/src/main.rs b/src/main.rs
@@ -16,7 +16,6 @@ use rustpython_vm::{
     util, VirtualMachine,
 };
 
-//use rustyline::{error::ReadlineError, Editor};
 use std::io::{self, BufRead, Write};
 use std::path::PathBuf;
 use std::process;
@@ -299,76 +298,90 @@ fn get_prompt(vm: &VirtualMachine, prompt_name: &str) -> String {
         .unwrap_or_else(String::new)
 }
 
+#[cfg(not(target_os = "redox"))]
 fn run_shell(vm: &VirtualMachine) -> PyResult {
+    use rustyline::{error::ReadlineError, Editor};
+    
     println!(
         "Welcome to the magnificent Rust Python {} interpreter \u{1f631} \u{1f596}",
         crate_version!()
     );
     let vars = vm.new_scope_with_builtins();
 
-    // // Read a single line:
-    // let mut input = String::new();
-    // let mut repl = Editor::<()>::new();
-
-    // // Retrieve a `history_path_str` dependent on the OS
-    // let repl_history_path_str = &get_history_path();
-    // if repl.load_history(repl_history_path_str).is_err() {
-    //     println!("No previous history.");
-    // }
-
-    // let mut continuing = false;
-
-    // loop {
-    //     let prompt = if continuing {
-    //         get_prompt(vm, "ps2")
-    //     } else {
-    //         get_prompt(vm, "ps1")
-    //     };
-    //     match repl.readline(&prompt) {
-    //         Ok(line) => {
-    //             debug!("You entered {:?}", line);
-    //             input.push_str(&line);
-    //             input.push('\n');
-    //             repl.add_history_entry(line.trim_end());
-
-    //             if continuing {
-    //                 if line.is_empty() {
-    //                     continuing = false;
-    //                 } else {
-    //                     continue;
-    //                 }
-    //             }
-
-    //             match shell_exec(vm, &input, vars.clone()) {
-    //                 Err(CompileError {
-    //                     error: CompileErrorType::Parse(ParseErrorType::EOF),
-    //                     ..
-    //                 }) => {
-    //                     continuing = true;
-    //                     continue;
-    //                 }
-    //                 _ => {
-    //                     input = String::new();
-    //                 }
-    //             }
-    //         }
-    //         Err(ReadlineError::Interrupted) => {
-    //             // TODO: Raise a real KeyboardInterrupt exception
-    //             println!("^C");
-    //             continuing = false;
-    //             continue;
-    //         }
-    //         Err(ReadlineError::Eof) => {
-    //             break;
-    //         }
-    //         Err(err) => {
-    //             println!("Error: {:?}", err);
-    //             break;
-    //         }
-    //     };
-    // }
-    // repl.save_history(repl_history_path_str).unwrap();
+    // Read a single line:
+    let mut input = String::new();
+    let mut repl = Editor::<()>::new();
 
+    // Retrieve a `history_path_str` dependent on the OS
+    let repl_history_path_str = &get_history_path();
+    if repl.load_history(repl_history_path_str).is_err() {
+        println!("No previous history.");
+    }
+
+    let mut continuing = false;
+
+    loop {
+        let prompt = if continuing {
+            get_prompt(vm, "ps2")
+        } else {
+            get_prompt(vm, "ps1")
+        };
+        match repl.readline(&prompt) {
+            Ok(line) => {
+                debug!("You entered {:?}", line);
+                input.push_str(&line);
+                input.push('\n');
+                repl.add_history_entry(line.trim_end());
+
+                if continuing {
+                    if line.is_empty() {
+                        continuing = false;
+                    } else {
+                        continue;
+                    }
+                }
+
+                match shell_exec(vm, &input, vars.clone()) {
+                    Err(CompileError {
+                        error: CompileErrorType::Parse(ParseErrorType::EOF),
+                        ..
+                    }) => {
+                        continuing = true;
+                        continue;
+                    }
+                    _ => {
+                        input = String::new();
+                    }
+                }
+            }
+            Err(ReadlineError::Interrupted) => {
+                // TODO: Raise a real KeyboardInterrupt exception
+                println!("^C");
+                continuing = false;
+                continue;
+            }
+            Err(ReadlineError::Eof) => {
+                break;
+            }
+            Err(err) => {
+                println!("Error: {:?}", err);
+                break;
+            }
+        };
+    }
+    repl.save_history(repl_history_path_str).unwrap();
+
+    Ok(vm.get_none())
+}
+
+#[cfg(target_os = "redox")]
+fn run_shell(vm: &VirtualMachine) -> PyResult {
+     println!(
+        "Welcome to the magnificent Rust Python {} interpreter \u{1f631} \u{1f596}",
+        crate_version!()
+    );
+    let vars = vm.new_scope_with_builtins();
+    
     let stdin = io::stdin();
     let stdout = io::stdout();
     let mut stdout = stdout.lock();
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -612,6 +612,7 @@ fn os_stat(
     target_os = "linux",
     target_os = "macos",
     target_os = "android",
+    target_os = "redox",
     windows
 )))]
 fn os_stat(
