kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Do not trim script lines.

Browse Source
This commit is contained in:
Stephen Chung 2022-02-08 22:29:38 +08:00
parent 5e7db6e105
commit 0cf2cd5cfc
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/bin/rhai-repl.rs
View File

@ -10,7 +10,7 @@ const HISTORY_FILE: &str = ".rhai-repl-history";
/// Pretty-print error. /// Pretty-print error.
fn print_error(input: &str, mut err: EvalAltResult) { fn print_error(input: &str, mut err: EvalAltResult) {
let lines: Vec<_> = input.trim().split('\n').collect(); let lines: Vec<_> = input.split('\n').collect();
let pos = err.take_position(); let pos = err.take_position();
let line_no = if lines.len() > 1 { let line_no = if lines.len() > 1 {
@ -344,13 +344,13 @@ fn main() {
// Line continuation // Line continuation
Ok(mut line) if line.ends_with("\\") => { Ok(mut line) if line.ends_with("\\") => {
line.pop(); line.pop();
input += line.trim_end(); input += &line;
input.push('\n'); input.push('\n');
} }
Ok(line) => { Ok(line) => {
input += line.trim_end(); input += &line;
if !input.is_empty() && !input.starts_with('!') && input.trim() != "history" let cmd = input.trim();
{ if !cmd.is_empty() && !cmd.starts_with('!') && cmd.trim() != "history" {
if rl.add_history_entry(input.clone()) { if rl.add_history_entry(input.clone()) {
history_offset += 1; history_offset += 1;
} }
@ -368,14 +368,14 @@ fn main() {
} }
} }
let script = input.trim(); let cmd = input.trim();
if script.is_empty() { if cmd.is_empty() {
continue; continue;
} }
// Implement standard commands // Implement standard commands
match script { match cmd {
"help" => { "help" => {
print_help(); print_help();
continue; continue;
@ -473,8 +473,8 @@ fn main() {
} }
continue; continue;
} }
_ if script.starts_with("!?") => { _ if cmd.starts_with("!?") => {
let text = script[2..].trim(); let text = cmd[2..].trim();
if let Some((n, line)) = rl if let Some((n, line)) = rl
.history() .history()
.iter() .iter()
@ -489,8 +489,8 @@ fn main() {
} }
continue; continue;
} }
_ if script.starts_with('!') => { _ if cmd.starts_with('!') => {
if let Ok(num) = script[1..].parse::<usize>() { if let Ok(num) = cmd[1..].parse::<usize>() {
if num >= history_offset { if num >= history_offset {
if let Some(line) = rl.history().get(num - history_offset) { if let Some(line) = rl.history().get(num - history_offset) {
replacement = Some(line.clone()); replacement = Some(line.clone());
@ -499,7 +499,7 @@ fn main() {
} }
} }
} else { } else {
let prefix = script[1..].trim(); let prefix = cmd[1..].trim();
if let Some((n, line)) = rl if let Some((n, line)) = rl
.history() .history()
.iter() .iter()
@ -512,14 +512,14 @@ fn main() {
continue; continue;
} }
} }
eprintln!("History line not found: {}", &script[1..]); eprintln!("History line not found: {}", &cmd[1..]);
continue; continue;
} }
_ => (), _ => (),
} }
match engine match engine
.compile_with_scope(&scope, &script) .compile_with_scope(&scope, &input)
.map_err(Into::into) .map_err(Into::into)
.and_then(|r| { .and_then(|r| {
ast_u = r.clone(); ast_u = r.clone();