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

Address review comments

Browse source
This commit is contained in:
Emily Toop 2017-05-09 16:25:37 +01:00
parent bad508de02
commit 171209d060
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@
// CONDITIONS OF ANY KIND, either express or implied. See the License for the // CONDITIONS OF ANY KIND, either express or implied. See the License for the
// specific language governing permissions and limitations under the License. // specific language governing permissions and limitations under the License.
use std::io::{self, stdin, BufRead, BufReader}; use std::io::{stdin, BufReader};
use linefeed::Reader; use linefeed::Reader;
use linefeed::terminal::DefaultTerminal; use linefeed::terminal::DefaultTerminal;
@ -18,7 +18,7 @@ use self::InputResult::*;
/// Possible results from reading input from `InputReader` /// Possible results from reading input from `InputReader`
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum InputResult { pub enum InputResult {
/// rusti command as input; (name, rest of line) /// mentat command as input; (name, rest of line)
Command(String, Option<String>), Command(String, Option<String>),
/// An empty line /// An empty line
Empty, Empty,
@ -88,7 +88,7 @@ impl InputReader {
Some(ref mut r) => { Some(ref mut r) => {
r.set_prompt(prompt); r.set_prompt(prompt);
r.read_line().ok().and_then(|line| line) r.read_line().ok().and_then(|line| line)
} },
None => self.read_stdin() None => self.read_stdin()
} }
} }

1
tools/cli/src/mentat_cli/lib.rs
View file

@ -7,6 +7,7 @@
// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR // under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// CONDITIONS OF ANY KIND, either express or implied. See the License for the // CONDITIONS OF ANY KIND, either express or implied. See the License for the
// specific language governing permissions and limitations under the License. // specific language governing permissions and limitations under the License.
#![crate_name = "mentat_cli"] #![crate_name = "mentat_cli"]
#[macro_use] extern crate log; #[macro_use] extern crate log;

10
tools/cli/src/mentat_cli/repl.rs
View file

@ -13,9 +13,8 @@ use input::InputResult::{Command, Empty, More, Eof};
/// Starting prompt /// Starting prompt
const DEFAULT_PROMPT: &'static str = "mentat=> "; const DEFAULT_PROMPT: &'static str = "mentat=> ";
/// Prompt when further input is being read /// Prompt when further input is being read
// TODO: Should this actually reflect the current open brace?
const MORE_PROMPT: &'static str = "mentat.> "; const MORE_PROMPT: &'static str = "mentat.> ";
/// Prompt when a `.block` command is in effect
const BLOCK_PROMPT: &'static str = "mentat+> ";
/// Executes input and maintains state of persistent items. /// Executes input and maintains state of persistent items.
pub struct Repl { pub struct Repl {
@ -27,7 +26,6 @@ impl Repl {
Repl{} Repl{}
} }
/// Runs the REPL interactively. /// Runs the REPL interactively.
pub fn run(&mut self) { pub fn run(&mut self) {
let mut more = false; let mut more = false;
@ -35,12 +33,6 @@ impl Repl {
loop { loop {
let res = input.read_input(if more { MORE_PROMPT } else { DEFAULT_PROMPT }); let res = input.read_input(if more { MORE_PROMPT } else { DEFAULT_PROMPT });
// let res = if self.read_block {
// self.read_block = false;
// input.read_block_input(BLOCK_PROMPT)
// } else {
// input.read_input(if more { MORE_PROMPT } else { DEFAULT_PROMPT })
// };
match res { match res {
Command(name, args) => { Command(name, args) => {