Move readline.rs into the vm crate

coolreader18 · coolreader18 · commit 645314b21583 · 2020-02-29T12:02:36.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,6 +27,7 @@ rustpython-parser = {path = "parser", version = "0.1.1"}
 rustpython-vm = {path = "vm", version = "0.1.1"}
 dirs = "2.0"
 num-traits = "0.2.8"
+cfg-if = "0.1"
 
 flame = { version = "0.2", optional = true }
 flamescope = { version = "0.1", optional = true }
diff --git a/src/shell.rs b/src/shell.rs
@@ -1,9 +1,8 @@
-mod readline;
-#[cfg(not(target_os = "wasi"))]
-mod rustyline_helper;
+mod helper;
 
 use rustpython_compiler::{compile, error::CompileError, error::CompileErrorType};
 use rustpython_parser::error::ParseErrorType;
+use rustpython_vm::readline::{Readline, ReadlineResult};
 use rustpython_vm::{
     exceptions::{print_exception, PyBaseExceptionRef},
     obj::objtype,
@@ -12,8 +11,6 @@ use rustpython_vm::{
     VirtualMachine,
 };
 
-use readline::{Readline, ReadlineResult};
-
 enum ShellExecResult {
     Ok,
     PyErr(PyBaseExceptionRef),
@@ -49,7 +46,7 @@ pub fn run_shell(vm: &VirtualMachine, scope: Scope) -> PyResult<()> {
         crate_version!()
     );
 
-    let mut repl = Readline::new(vm, scope.clone());
+    let mut repl = Readline::new(helper::ShellHelper::new(vm, scope.clone()));
     let mut full_input = String::new();
 
     // Retrieve a `history_path_str` dependent on the OS
diff --git a/src/shell/helper.rs b/src/shell/helper.rs
@@ -2,10 +2,6 @@ use rustpython_vm::obj::objstr::PyStringRef;
 use rustpython_vm::pyobject::{PyIterable, PyResult, TryFromObject};
 use rustpython_vm::scope::{NameProtocol, Scope};
 use rustpython_vm::VirtualMachine;
-use rustyline::{
-    completion::Completer, highlight::Highlighter, hint::Hinter, validate::Validator, Context,
-    Helper,
-};
 
 pub struct ShellHelper<'vm> {
     vm: &'vm VirtualMachine,
@@ -146,24 +142,32 @@ impl<'vm> ShellHelper<'vm> {
     }
 }
 
-impl Completer for ShellHelper<'_> {
-    type Candidate = String;
+cfg_if::cfg_if! {
+    if #[cfg(not(target_os = "wasi"))] {
+        use rustyline::{
+            completion::Completer, highlight::Highlighter, hint::Hinter, validate::Validator, Context,
+            Helper,
+        };
+        impl Completer for ShellHelper<'_> {
+            type Candidate = String;
+
+            fn complete(
+                &self,
+                line: &str,
+                pos: usize,
+                _ctx: &Context,
+            ) -> rustyline::Result<(usize, Vec<String>)> {
+                Ok(self
+                    .complete_opt(&line[0..pos])
+                    // as far as I can tell, there's no better way to do both completion
+                    // and indentation (or even just indentation)
+                    .unwrap_or_else(|| (line.len(), vec!["\t".to_owned()])))
+            }
+        }
 
-    fn complete(
-        &self,
-        line: &str,
-        pos: usize,
-        _ctx: &Context,
-    ) -> rustyline::Result<(usize, Vec<String>)> {
-        Ok(self
-            .complete_opt(&line[0..pos])
-            // as far as I can tell, there's no better way to do both completion
-            // and indentation (or even just indentation)
-            .unwrap_or_else(|| (line.len(), vec!["\t".to_owned()])))
+        impl Hinter for ShellHelper<'_> {}
+        impl Highlighter for ShellHelper<'_> {}
+        impl Validator for ShellHelper<'_> {}
+        impl Helper for ShellHelper<'_> {}
     }
 }
-
-impl Hinter for ShellHelper<'_> {}
-impl Highlighter for ShellHelper<'_> {}
-impl Validator for ShellHelper<'_> {}
-impl Helper for ShellHelper<'_> {}
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -89,6 +89,7 @@ gethostname = "0.2.0"
 subprocess = "0.2.2"
 num_cpus = "1"
 socket2 = { version = "0.3", features = ["unix"] }
+rustyline = "6.0"
 
 [target.'cfg(not(any(target_arch = "wasm32", target_os = "redox")))'.dependencies]
 dns-lookup = "1.0"
diff --git a/vm/src/lib.rs b/vm/src/lib.rs
@@ -70,6 +70,7 @@ pub mod obj;
 pub mod py_serde;
 mod pyhash;
 pub mod pyobject;
+pub mod readline;
 pub mod scope;
 mod sequence;
 pub mod slots;
diff --git a/vm/src/readline.rs b/vm/src/readline.rs
@@ -1,8 +1,6 @@
 use std::io;
 use std::path::Path;
 
-use rustpython_vm::{scope::Scope, VirtualMachine};
-
 type OtherError = Box<dyn std::error::Error>;
 type OtherResult<T> = Result<T, OtherError>;
 
@@ -19,13 +17,16 @@ pub enum ReadlineResult {
 mod basic_readline {
     use super::*;
 
-    pub struct BasicReadline<'vm> {
-        vm: &'vm VirtualMachine,
+    pub trait Helper {}
+    impl<T> Helper for T {}
+
+    pub struct Readline<H: Helper> {
+        helper: H,
     }
 
-    impl<'vm> BasicReadline<'vm> {
-        pub fn new(vm: &'vm VirtualMachine, _scope: Scope) -> Self {
-            BasicReadline { vm }
+    impl<H: Helper> Readline<H> {
+        pub fn new(helper: H) -> Self {
+            Readline { helper }
         }
 
         pub fn load_history(&mut self, _path: &Path) -> OtherResult<()> {
@@ -60,16 +61,19 @@ mod basic_readline {
     }
 }
 
-#[cfg(not(target_os = "wasi"))]
+#[cfg(not(target_arch = "wasm32"))]
 mod rustyline_readline {
-    use super::{super::rustyline_helper::ShellHelper, *};
+    use super::*;
+
+    pub trait Helper: rustyline::Helper {}
+    impl<T: rustyline::Helper> Helper for T {}
 
-    pub struct RustylineReadline<'vm> {
-        repl: rustyline::Editor<ShellHelper<'vm>>,
+    pub struct Readline<H: Helper> {
+        repl: rustyline::Editor<H>,
     }
 
-    impl<'vm> RustylineReadline<'vm> {
-        pub fn new(vm: &'vm VirtualMachine, scope: Scope) -> Self {
+    impl<H: Helper> Readline<H> {
+        pub fn new(helper: H) -> Self {
             use rustyline::{At, Cmd, CompletionType, Config, Editor, KeyPress, Movement, Word};
             let mut repl = Editor::with_config(
                 Config::builder()
@@ -85,8 +89,8 @@ mod rustyline_readline {
                 KeyPress::ControlRight,
                 Cmd::Move(Movement::ForwardWord(1, At::AfterEnd, Word::Vi)),
             );
-            repl.set_helper(Some(ShellHelper::new(vm, scope)));
-            RustylineReadline { repl }
+            repl.set_helper(Some(helper));
+            Readline { repl }
         }
 
         pub fn load_history(&mut self, path: &Path) -> OtherResult<()> {
@@ -126,17 +130,18 @@ mod rustyline_readline {
     }
 }
 
-#[cfg(target_os = "wasi")]
-type ReadlineInner<'vm> = basic_readline::BasicReadline<'vm>;
+#[cfg(target_arch = "wasm32")]
+use basic_readline as readline_inner;
+#[cfg(not(target_arch = "wasm32"))]
+use rustyline_readline as readline_inner;
 
-#[cfg(not(target_os = "wasi"))]
-type ReadlineInner<'vm> = rustyline_readline::RustylineReadline<'vm>;
+pub use readline_inner::Helper;
 
-pub struct Readline<'vm>(ReadlineInner<'vm>);
+pub struct Readline<H: Helper>(readline_inner::Readline<H>);
 
-impl<'vm> Readline<'vm> {
-    pub fn new(vm: &'vm VirtualMachine, scope: Scope) -> Self {
-        Readline(ReadlineInner::new(vm, scope))
+impl<H: Helper> Readline<H> {
+    pub fn new(helper: H) -> Self {
+        Readline(readline_inner::Readline::new(helper))
     }
     pub fn load_history(&mut self, path: &Path) -> OtherResult<()> {
         self.0.load_history(path)
