greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

improve the handling of complete and incomplete commands in input.rs

Browse source
This commit is contained in:
Emily Toop 2017-06-01 13:49:06 +01:00
parent 831f7032ce
commit 223a53cf9a
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tools/cli/src/mentat_cli/input.rs
View file

@ -158,20 +158,17 @@ impl InputReader {
} }
}; };
match cmd { let (is_complete, _) = cmd.is_complete();
Command::Query(_) | if is_complete {
Command::Transact(_) if !cmd.is_complete().0 => { self.buffer.clear();
// a query or transact is complete if it contains a valid edn. self.in_process_cmd = None;
// if the command is not complete, ask for more from the repl and remember Ok(InputResult::MetaCommand(cmd))
// which type of command we've found here. } else {
self.in_process_cmd = Some(cmd); // a query or transact is complete if it contains a valid edn.
Ok(More) // if the command is not complete, ask for more from the repl and remember
}, // which type of command we've found here.
_ => { self.in_process_cmd = Some(cmd);
self.buffer.clear(); Ok(More)
self.in_process_cmd = None;
Ok(InputResult::MetaCommand(cmd))
}
} }
} }