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

[cli] Handle line comments in EDN input. (#759) (#761) r=grisha

Browse source 
What was happening is that ["[;", "]"] would get glued to "[; ]",
which of course can never complete.

It would be good to add tests of this, but the existing multi-line
`InputReader` makes that challenging and I don't want to invest the
time to improve it: I expect it to be overhauled as part of a
transition away from parsing with `combine` and toward parsing with
`rust-peg`.
This commit is contained in:
Nick Alexander 2018-06-22 14:34:16 -07:00 committed by GitHub
parent 60a57ea493
commit 8e2d795778
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 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

@ -133,13 +133,13 @@ impl InputReader {
// If there is no in process command, we parse the read in line as a new command. // If there is no in process command, we parse the read in line as a new command.
let cmd = match &self.in_process_cmd { let cmd = match &self.in_process_cmd {
&Some(Command::QueryPrepared(ref args)) => { &Some(Command::QueryPrepared(ref args)) => {
Ok(Command::QueryPrepared(args.clone() + " " + &line)) Ok(Command::QueryPrepared(args.clone() + "\n" + &line))
}, },
&Some(Command::Query(ref args)) => { &Some(Command::Query(ref args)) => {
Ok(Command::Query(args.clone() + " " + &line)) Ok(Command::Query(args.clone() + "\n" + &line))
}, },
&Some(Command::Transact(ref args)) => { &Some(Command::Transact(ref args)) => {
Ok(Command::Transact(args.clone() + " " + &line)) Ok(Command::Transact(args.clone() + "\n" + &line))
}, },
_ => { _ => {
command(&self.buffer) command(&self.buffer)