poc: adds rustyline to rhai-repl

This commit is contained in:
Jonathan Strong 2022-01-28 20:29:25 -05:00
parent 1d08c22f73
commit 16f13960f4
3 changed files with 58 additions and 22 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ Cargo.lock
benches/results
before*
after*
.rhai-repl-history.txt

View File

@ -15,12 +15,22 @@ include = ["**/*.rs", "scripts/*.rhai", "**/*.md", "Cargo.toml"]
keywords = ["scripting", "scripting-engine", "scripting-language", "embedded"]
categories = ["no-std", "embedded", "wasm", "parser-implementations"]
[lib]
name = "rhai"
path = "src/lib.rs"
[[bin]]
name = "rhai-repl"
path = "src/bin/rhai-repl.rs"
required-features = ["rustyline"]
[dependencies]
smallvec = { version = "1.7", default-features = false, features = ["union", "const_new" ] }
ahash = { version = "0.7", default-features = false }
num-traits = { version = "0.2", default-features = false }
smartstring = { version = "0.2.8", default-features = false }
rhai_codegen = { version = "1.2", path = "codegen", default-features = false }
rustyline = { versoin = "9", optional = true }
[dev-dependencies]
serde_bytes = "0.11"

View File

@ -1,3 +1,5 @@
use rustyline::error::ReadlineError;
use rustyline::Editor;
use rhai::{Dynamic, Engine, EvalAltResult, Module, Scope, AST, INT};
use std::{
@ -194,6 +196,12 @@ fn main() {
// Create scope
let mut scope = Scope::new();
// REPL line editor setup
let mut rl = Editor::<()>::new();
if rl.load_history(".rhai-repl-history.txt").is_err() {
println!("No previous history.");
}
// REPL loop
let mut input = String::new();
let mut main_ast = AST::empty();
@ -203,33 +211,48 @@ fn main() {
print_help();
'main_loop: loop {
print!("rhai-repl> ");
stdout().flush().expect("couldn't flush stdout");
input.clear();
loop {
match stdin().read_line(&mut input) {
Ok(0) => break 'main_loop,
Ok(_) => (),
Err(err) => panic!("input error: {}", err),
let readline = rl.readline("rhai-repl> ");
match readline {
Ok(line) => {
rl.add_history_entry(line.as_str());
input = line;
},
Err(ReadlineError::Interrupted) | Err(ReadlineError::Eof) => {
break 'main_loop
},
Err(err) => {
eprintln!("Error: {:?}", err);
break 'main_loop
}
let line = input.as_str().trim_end();
// Allow line continuation
if line.ends_with('\\') {
let len = line.len();
input.truncate(len - 1);
input.push('\n');
} else {
break;
}
print!("> ");
stdout().flush().expect("couldn't flush stdout");
}
//loop {
// match stdin().read_line(&mut input) {
// Ok(0) => break 'main_loop,
// Ok(_) => (),
// Err(err) => panic!("input error: {}", err),
// }
// let line = input.as_str().trim_end();
// // Allow line continuation
// if line.ends_with('\\') {
// let len = line.len();
// input.truncate(len - 1);
// input.push('\n');
// } else {
// break;
// }
// print!("> ");
// stdout().flush().expect("couldn't flush stdout");
//}
let script = input.trim();
if script.is_empty() {
@ -343,4 +366,6 @@ fn main() {
// Throw away all the statements, leaving only the functions
main_ast.clear_statements();
}
rl.save_history(".rhai-repl-history.txt").unwrap();
}