greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Few more linefeed-related changes

Browse Source
This commit is contained in:
greg 2017-01-13 12:10:02 -08:00
parent 4eb7683f47
commit d7181afa91
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.rs
View File

@ -97,7 +97,7 @@ struct Repl<'a> {
impl<'a> Repl<'a> { impl<'a> Repl<'a> {
fn new(trace_evaluation: bool) -> Repl<'a> { fn new(trace_evaluation: bool) -> Repl<'a> {
let mut reader: linefeed::Reader<_> = linefeed::Reader::new("").unwrap(); let mut reader: linefeed::Reader<_> = linefeed::Reader::new("Schala").unwrap();
reader.set_prompt(">> "); reader.set_prompt(">> ");
Repl { Repl {
show_tokens: false, show_tokens: false,
@ -114,25 +114,23 @@ impl<'a> Repl<'a> {
loop { loop {
match self.reader.read_line() { match self.reader.read_line() {
Err(e) => { Err(e) => {
println!("Terminal read error: {:?}", e); println!("Terminal read error: {}", e);
break;
}, },
Ok(Eof) => { Ok(Eof) => {
println!("Exiting...");
break; break;
} }
Ok(Input(ref input)) => { Ok(Input(ref input)) => {
self.reader.add_history(input.clone());
if self.handle_interpreter_directive(input) { if self.handle_interpreter_directive(input) {
continue; continue;
} }
let output = self.input_handler(input); let output = self.input_handler(input);
println!("{}", output); println!("=> {}", output);
} }
Ok(Signal(signal)) => { _ => (),
println!("Received signal: {:?}", signal);
},
} }
} }
println!("Exiting...");
} }
fn input_handler(&mut self, input: &str) -> String { fn input_handler(&mut self, input: &str) -> String {