added rustyline
This commit is contained in:
parent
8c1610bcf9
commit
17165ff634
2 changed files with 24 additions and 17 deletions
|
@ -15,6 +15,7 @@ path = "src/main.rs"
|
|||
[dependencies]
|
||||
evalexpr = "11.0.0"
|
||||
pico-args = "0.5.0"
|
||||
rustyline = "14.0.0"
|
||||
termion = "1.5.6"
|
||||
|
||||
[profile.release]
|
||||
|
|
24
src/main.rs
24
src/main.rs
|
@ -5,6 +5,7 @@ use std::{
|
|||
stdout,
|
||||
|
||||
IsTerminal,
|
||||
Read,
|
||||
Write
|
||||
},
|
||||
process::exit
|
||||
|
@ -18,6 +19,7 @@ use evalexpr::{
|
|||
Value
|
||||
};
|
||||
use pico_args::Arguments;
|
||||
use rustyline::DefaultEditor;
|
||||
use termion::{
|
||||
color,
|
||||
style
|
||||
|
@ -43,7 +45,8 @@ fn main() {
|
|||
}
|
||||
|
||||
let mut context = context::build(&mut args);
|
||||
let quiet = args.contains(flag::QUIET) || !stdout().is_terminal();
|
||||
let is_terminal = stdin().is_terminal() && stdout().is_terminal();
|
||||
let quiet = args.contains(flag::QUIET) || !is_terminal;
|
||||
|
||||
// collect args and evaluate if present
|
||||
let expressions = args.finish();
|
||||
|
@ -53,27 +56,30 @@ fn main() {
|
|||
eval(&expression, &mut context, quiet);
|
||||
}
|
||||
} else {
|
||||
if !is_terminal {
|
||||
let mut buffer = String::with_capacity(0);
|
||||
if let Ok(_) = stdin().read_to_string(&mut buffer) {
|
||||
for expression in buffer.lines() {
|
||||
eval(&expression.to_string(), &mut context, quiet);
|
||||
}
|
||||
}
|
||||
} else if let Ok(mut rl) = DefaultEditor::new() {
|
||||
// enter interactive mode if no args are given
|
||||
version_text();
|
||||
println!("{}Interactive Mode{}", style::Faint, style::Reset);
|
||||
loop {
|
||||
print!("> ");
|
||||
stdout().flush().unwrap();
|
||||
let mut i_line = String::new();
|
||||
let line_result = stdin().read_line(&mut i_line);
|
||||
if line_result.is_err() {
|
||||
break;
|
||||
}
|
||||
let line = i_line.trim().to_string();
|
||||
if let Ok(line) = rl.readline("> ") {
|
||||
match line.as_str() {
|
||||
"" |
|
||||
"exit" => break,
|
||||
_ => eval(&line, &mut context, quiet)
|
||||
}
|
||||
}
|
||||
reset();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn eval(expression: &str, context: &mut HashMapContext, quiet: bool) {
|
||||
let result = eval_with_context_mut(expression, context);
|
||||
|
|
Loading…
Reference in a new issue