Compare commits

...

2 Commits

Author SHA1 Message Date
greg
16fdf37ba3 A solution for multiline entry
I don't really like this...
2019-02-02 01:00:09 -08:00
greg
3256935946 Slight refactor of REPL code
In preparation for multi-line REPL input
2019-02-02 00:38:06 -08:00

View File

@ -33,7 +33,7 @@ impl Repl {
languages,
current_language_index,
interpreter_directive_sigil: ':',
line_reader
line_reader,
}
}
@ -90,16 +90,7 @@ impl Repl {
},
Ok(ReadResult::Eof) => break,
Ok(ReadResult::Signal(_)) => break,
Ok(ReadResult::Input(ref input)) => {
self.line_reader.add_history_unique(input.to_string());
let output = match input.chars().nth(0) {
Some(ch) if ch == self.interpreter_directive_sigil => self.handle_interpreter_directive(input),
_ => Some(self.input_handler(input)),
};
if let Some(o) = output {
println!("=> {}", o);
}
}
Ok(ReadResult::Input(input)) => self.input_loop(input),
}
}
self.line_reader.save_history(HISTORY_SAVE_FILE).unwrap_or(());
@ -107,6 +98,42 @@ impl Repl {
println!("Exiting...");
}
fn input_loop(&mut self, input: String) {
use linefeed::ReadResult;
if input == "" {
return;
}
if input.chars().nth(0).unwrap() == self.interpreter_directive_sigil {
if let Some(output) = self.handle_interpreter_directive(&input) {
println!("{}", output);
}
return;
}
let mut lines = input;
self.line_reader.set_prompt("> ").unwrap();
loop {
match self.line_reader.read_line() {
Err(e) => {
println!("Terminal read error: {}", e);
return;
},
Ok(ReadResult::Eof) => break,
Ok(ReadResult::Signal(_)) => break,
Ok(ReadResult::Input(input)) => {
lines.push('\n'); //TODO not sure if this is needed?
lines.push_str(&input);
}
}
}
self.line_reader.add_history_unique(lines.clone());
let output = self.input_handler(&lines);
println!("=> {}", output);
}
fn input_handler(&mut self, input: &str) -> String {
let ref mut language = self.languages[self.current_language_index];
let interpreter_output = language.execute_pipeline(input, &self.options);