forked from projectmoon/tenebrous-dicebot
Allow extraneous whitespace at the end of command input.
This commit is contained in:
parent
32573d2e7c
commit
8484e9ffde
|
@ -167,7 +167,7 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "chronicle-dicebot"
|
name = "chronicle-dicebot"
|
||||||
version = "0.4.0"
|
version = "0.5.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"dirs",
|
"dirs",
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
use crate::cofd::dice::DicePool;
|
use crate::cofd::dice::DicePool;
|
||||||
use crate::dice::ElementExpression;
|
use crate::dice::ElementExpression;
|
||||||
|
use crate::parser::trim;
|
||||||
use crate::roll::Roll;
|
use crate::roll::Roll;
|
||||||
|
|
||||||
pub mod parser;
|
pub mod parser;
|
||||||
|
@ -65,11 +66,16 @@ impl Command for PoolRollCommand {
|
||||||
/// command was recognized.
|
/// command was recognized.
|
||||||
pub fn parse_command(s: &str) -> Result<Option<Box<dyn Command>>, String> {
|
pub fn parse_command(s: &str) -> Result<Option<Box<dyn Command>>, String> {
|
||||||
match parser::parse_command(s) {
|
match parser::parse_command(s) {
|
||||||
Ok((input, result)) => match (input, &result) {
|
Ok((input, command)) => match (input, &command) {
|
||||||
//This clause prevents bot from spamming messages to itself
|
//This clause prevents bot from spamming messages to itself
|
||||||
//after executing a previous command.
|
//after executing a previous command.
|
||||||
("", Some(_)) | (_, None) => Ok(result),
|
("", Some(_)) | (_, None) => Ok(command),
|
||||||
_ => Err(format!("{}: malformed dice expression", s)),
|
|
||||||
|
//Any unconsumed input (except whitespace) is considered a parsing error.
|
||||||
|
(extra, _) => match trim(extra).as_str() {
|
||||||
|
"" => Ok(command),
|
||||||
|
_ => Err(format!("{}: malformed dice expression", s)),
|
||||||
|
},
|
||||||
},
|
},
|
||||||
Err(err) => Err(err.to_string()),
|
Err(err) => Err(err.to_string()),
|
||||||
}
|
}
|
||||||
|
@ -87,10 +93,38 @@ mod tests {
|
||||||
#[test]
|
#[test]
|
||||||
fn roll_malformed_expression_test() {
|
fn roll_malformed_expression_test() {
|
||||||
assert!(parse_command("!roll 1d20asdlfkj").is_err());
|
assert!(parse_command("!roll 1d20asdlfkj").is_err());
|
||||||
|
assert!(parse_command("!roll 1d20asdlfkj ").is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn roll_dice_pool_expression_test() {
|
fn roll_dice_pool_malformed_expression_test() {
|
||||||
assert!(parse_command("!pool 8abc").is_err());
|
assert!(parse_command("!pool 8abc").is_err());
|
||||||
|
assert!(parse_command("!pool 8abc ").is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn pool_whitespace_test() {
|
||||||
|
assert!(parse_command("!pool 8ns3 ")
|
||||||
|
.map(|p| p.is_some())
|
||||||
|
.expect("was error"));
|
||||||
|
assert!(parse_command(" !pool 8ns3")
|
||||||
|
.map(|p| p.is_some())
|
||||||
|
.expect("was error"));
|
||||||
|
assert!(parse_command(" !pool 8ns3 ")
|
||||||
|
.map(|p| p.is_some())
|
||||||
|
.expect("was error"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn roll_whitespace_test() {
|
||||||
|
assert!(parse_command("!roll 1d4 + 5d6 -3 ")
|
||||||
|
.map(|p| p.is_some())
|
||||||
|
.expect("was error"));
|
||||||
|
assert!(parse_command("!roll 1d4 + 5d6 -3 ")
|
||||||
|
.map(|p| p.is_some())
|
||||||
|
.expect("was error"));
|
||||||
|
assert!(parse_command(" !roll 1d4 + 5d6 -3 ")
|
||||||
|
.map(|p| p.is_some())
|
||||||
|
.expect("was error"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,3 +9,7 @@ pub fn eat_whitespace(input: &str) -> IResult<&str, &str> {
|
||||||
let (input, whitespace) = take_while(is_whitespace)(input)?;
|
let (input, whitespace) = take_while(is_whitespace)(input)?;
|
||||||
Ok((input, whitespace))
|
Ok((input, whitespace))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn trim(input: &str) -> String {
|
||||||
|
input.chars().filter(|c| !c.is_whitespace()).collect()
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue