kg333
/
tenebrous-dicebot
forked from projectmoon/tenebrous-dicebot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updating match blocks for keep/drop

This commit is contained in:
Matthew Sparks 2021-09-17 21:45:30 -04:00
parent 8317f40f61
commit f904e3a948
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dicebot/src/basic/parser.rs
View File

@ -31,33 +31,25 @@ enum Sign {
Minus, Minus,
} }
// Parse a dice expression. Does not eat whitespace /// Parse a dice expression. Does not eat whitespace
fn parse_dice(input: &str) -> IResult<&str, Dice> { fn parse_dice(input: &str) -> IResult<&str, Dice> {
// parse main dice expression // parse main dice expression
let (mut input, (count, _, sides)) = tuple((digit1, tag("d"), digit1))(input)?; let (input, (count, _, sides)) = tuple((digit1, tag("d"), digit1))(input)?;
// check for keep expression (i.e. D&D 5E Advantage) // check for keep expression to keep highest dice (2d20k1)
let keep; let (keep, input) = match tuple::<&str, _, (_, _), _>((tag("k"), digit1))(input) {
match tuple::<&str, _, (_, _), _>((tag("k"), digit1))(input) {
// if ok, keep expression is present // if ok, keep expression is present
Ok(r) => { Ok(r) => (r.1.1, r.0),
input = r.0;
keep = r.1.1;
}
// otherwise absent and keep all dice // otherwise absent and keep all dice
Err(_) => keep = count, Err(_) => (input, "")
}; };
// check for drop expression (i.e. D&D 5E Disadvantage) // check for drop expression to drop highest dice (2d20dh1)
let drop; let (drop, input) = match tuple::<&str, _, (_, _), _>((tag("dh"), digit1))(input) {
match tuple::<&str, _, (_, _), _>((tag("d"), digit1))(input) { // if ok, keep expression is present
// if ok, drop expression is present Ok(r) => (r.1.1, r.0),
Ok(r) => {
input = r.0;
drop = r.1.1;
}
// otherwise absent and keep all dice // otherwise absent and keep all dice
Err(_) => drop = "0", Err(_) => (input, "")
}; };
let count: u32 = count.parse().unwrap(); let count: u32 = count.parse().unwrap();