Adding enum for exclusive drop/keep

dicebot/src/basic/dice.rs

@@ -12,25 +12,39 @@ use std::ops::{Deref, DerefMut};
 pub struct Dice {
     pub(crate) count: u32,
     pub(crate) sides: u32,
-    pub(crate) keep: u32,
+    pub(crate) keep_drop: KeepOrDrop,
-    pub(crate) drop: u32,
 }
 
 impl fmt::Display for Dice {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if self.keep != self.count {
+        match self.keep_drop {
-            write!(f, "{}d{}k{}", self.count, self.sides, self.keep)
+            KeepOrDrop::Keep(keep) => {
-        } else if self.drop != 0 {
+                if keep != self.count {
-            write!(f, "{}d{}d{}", self.count, self.sides, self.drop)
+                    write!(f, "{}d{}k{}", self.count, self.sides, keep)
                 } else {
                     write!(f, "{}d{}", self.count, self.sides)
                 }
             }
+            KeepOrDrop::Drop(drop) => {
+                if drop != 0 {
+                    write!(f, "{}d{}dh{}", self.count, self.sides, drop)
+                } else {
+                    write!(f, "{}d{}", self.count, self.sides)
+                }
+            }
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum KeepOrDrop {
+    Keep (u32),
+    Drop (u32),
 }
 
 impl Dice {
-    pub fn new(count: u32, sides: u32, keep: u32, drop: u32) -> Dice {
+    pub fn new(count: u32, sides: u32, keep_drop: KeepOrDrop) -> Dice {
-        Dice { count, sides, keep, drop }
+        Dice { count, sides, keep_drop }
     }
 }
 

dicebot/src/basic/parser.rs

@@ -41,7 +41,7 @@ fn parse_dice(input: &str) -> IResult<&str, Dice> {
         // if ok, keep expression is present
         Ok(r) => (r.1.1, r.0),
         // otherwise absent and keep all dice
-        Err(_) => (count, input)
+        Err(_) => ("", input)
     };
 
     // check for drop expression to drop highest dice (2d20dh1)
@@ -49,26 +49,41 @@ fn parse_dice(input: &str) -> IResult<&str, Dice> {
         // if ok, keep expression is present
         Ok(r) => (r.1.1, r.0),
         // otherwise absent and keep all dice
-        Err(_) => ("0", input)
+        Err(_) => ("", input)
     };
 
     let count: u32 = count.parse().unwrap();
 
     // don't allow keep greater than number of dice, and don't allow keep zero
-    let mut keep: u32  = keep.parse().unwrap();
+    let keep_drop = match keep.parse::<u32>() {
-    if keep > count || keep == 0 {
+        // Ok, there's a keep value, check and create Keep
-        keep = count;
+        Ok(i) => {
+            if i > count || i == 0 {
+                KeepOrDrop::Keep(count)
+            } else {
+                KeepOrDrop::Keep(i)
             }
-
+        },
-    // don't allow drop greater than or equal to number of dice
+        // Err, check if drop works
-    let mut drop: u32  = drop.parse().unwrap();
+        Err(_) => {
-    if drop >= count {
+            match drop.parse::<u32>() {
-        drop = 0;
+                // Ok, there's a drop value, check and create Drop
+                Ok(i) => {
+                    if i >= count {
+                        KeepOrDrop::Keep(count)
+                    } else {
+                        KeepOrDrop::Drop(i)
                     }
+                },
+                // Err, there's neither keep nor drop
+                Err(_) => KeepOrDrop::Keep(count),
+            }
+        },
+    };
 
     Ok((
         input,
-        Dice::new(count, sides.parse().unwrap(), keep, drop),
+        Dice::new(count, sides.parse().unwrap(), keep_drop),
     ))
 }
 
@@ -140,29 +155,29 @@ mod tests {
     use super::*;
     #[test]
     fn dice_test() {
-        assert_eq!(parse_dice("2d4"), Ok(("", Dice::new(2, 4, 2, 0))));
+        assert_eq!(parse_dice("2d4"), Ok(("", Dice::new(2, 4, KeepOrDrop::Keep(2)))));
-        assert_eq!(parse_dice("20d40"), Ok(("", Dice::new(20, 40, 20, 0))));
+        assert_eq!(parse_dice("20d40"), Ok(("", Dice::new(20, 40, KeepOrDrop::Keep(20)))));
-        assert_eq!(parse_dice("8d7"), Ok(("", Dice::new(8, 7, 8, 0))));
+        assert_eq!(parse_dice("8d7"), Ok(("", Dice::new(8, 7, KeepOrDrop::Keep(8)))));
-        assert_eq!(parse_dice("2d20k1"), Ok(("", Dice::new(2, 20, 1, 0))));
+        assert_eq!(parse_dice("2d20k1"), Ok(("", Dice::new(2, 20, KeepOrDrop::Keep(1)))));
-        assert_eq!(parse_dice("100d10k90"), Ok(("", Dice::new(100, 10, 90, 0))));
+        assert_eq!(parse_dice("100d10k90"), Ok(("", Dice::new(100, 10, KeepOrDrop::Keep(90)))));
-        assert_eq!(parse_dice("11d10k10"), Ok(("", Dice::new(11, 10, 10, 0))));
+        assert_eq!(parse_dice("11d10k10"), Ok(("", Dice::new(11, 10, KeepOrDrop::Keep(10)))));
-        assert_eq!(parse_dice("12d10k11"), Ok(("", Dice::new(12, 10, 11, 0))));
+        assert_eq!(parse_dice("12d10k11"), Ok(("", Dice::new(12, 10, KeepOrDrop::Keep(11)))));
-        assert_eq!(parse_dice("12d10k13"), Ok(("", Dice::new(12, 10, 12, 0))));
+        assert_eq!(parse_dice("12d10k13"), Ok(("", Dice::new(12, 10, KeepOrDrop::Keep(12)))));
-        assert_eq!(parse_dice("12d10k0"), Ok(("", Dice::new(12, 10, 12, 0))));
+        assert_eq!(parse_dice("12d10k0"), Ok(("", Dice::new(12, 10, KeepOrDrop::Keep(12)))));
-        assert_eq!(parse_dice("20d40dh5"), Ok(("", Dice::new(20, 40, 20, 5))));
+        assert_eq!(parse_dice("20d40dh5"), Ok(("", Dice::new(20, 40, KeepOrDrop::Drop(5)))));
-        assert_eq!(parse_dice("8d7dh9"), Ok(("", Dice::new(8, 7, 8, 0))));
+        assert_eq!(parse_dice("8d7dh9"), Ok(("", Dice::new(8, 7, KeepOrDrop::Keep(8)))));
-        assert_eq!(parse_dice("8d7dh8"), Ok(("", Dice::new(8, 7, 8, 0))));
+        assert_eq!(parse_dice("8d7dh8"), Ok(("", Dice::new(8, 7, KeepOrDrop::Keep(8)))));
     }
 
     #[test]
     fn element_test() {
         assert_eq!(
             parse_element("  \t\n\r\n 8d7 \n"),
-            Ok((" \n", Element::Dice(Dice::new(8, 7, 8, 0))))
+            Ok((" \n", Element::Dice(Dice::new(8, 7, KeepOrDrop::Keep(8)))))
         );
         assert_eq!(
             parse_element("  \t\n\r\n 3d20k2 \n"),
-            Ok((" \n", Element::Dice(Dice::new(3, 20, 2, 0))))
+            Ok((" \n", Element::Dice(Dice::new(3, 20, KeepOrDrop::Keep(2)))))
         );
         assert_eq!(
             parse_element("  \t\n\r\n 8 \n"),
@@ -184,21 +199,21 @@ mod tests {
             parse_signed_element("  \t\n\r\n- 8d4 \n"),
             Ok((
                 " \n",
-                SignedElement::Negative(Element::Dice(Dice::new(8, 4, 8, 0)))
+                SignedElement::Negative(Element::Dice(Dice::new(8, 4, KeepOrDrop::Keep(8))))
             ))
         );
         assert_eq!(
             parse_signed_element("  \t\n\r\n- 8d4k4 \n"),
             Ok((
                 " \n",
-                SignedElement::Negative(Element::Dice(Dice::new(8, 4, 4, 0)))
+                SignedElement::Negative(Element::Dice(Dice::new(8, 4, KeepOrDrop::Keep(4))))
             ))
         );
         assert_eq!(
             parse_signed_element("  \t\n\r\n+ 8d4 \n"),
             Ok((
                 " \n",
-                SignedElement::Positive(Element::Dice(Dice::new(8, 4, 8, 0)))
+                SignedElement::Positive(Element::Dice(Dice::new(8, 4, KeepOrDrop::Keep(8))))
             ))
         );
     }
@@ -210,7 +225,7 @@ mod tests {
             Ok((
                 "",
                 ElementExpression(vec![SignedElement::Positive(Element::Dice(Dice::new(
-                    8, 4, 8, 0
+                    8, 4, KeepOrDrop::Keep(8)
                 )))])
             ))
         );
@@ -219,7 +234,7 @@ mod tests {
             Ok((
                 "",
                 ElementExpression(vec![
-                    SignedElement::Positive(Element::Dice(Dice::new(2, 20, 1, 0))),
+                    SignedElement::Positive(Element::Dice(Dice::new(2, 20, KeepOrDrop::Keep(1)))),
                     SignedElement::Positive(Element::Bonus(5)),
                 ])
             ))
@@ -229,7 +244,7 @@ mod tests {
             Ok((
                 " \n ",
                 ElementExpression(vec![SignedElement::Negative(Element::Dice(Dice::new(
-                    8, 4, 8, 0
+                    8, 4, KeepOrDrop::Keep(8)
                 )))])
             ))
         );
@@ -238,11 +253,11 @@ mod tests {
             Ok((
                 " 1d5 ",
                 ElementExpression(vec![
-                    SignedElement::Positive(Element::Dice(Dice::new(3, 4, 2, 0))),
+                    SignedElement::Positive(Element::Dice(Dice::new(3, 4, KeepOrDrop::Keep(2)))),
                     SignedElement::Positive(Element::Bonus(7)),
                     SignedElement::Negative(Element::Bonus(5)),
-                    SignedElement::Negative(Element::Dice(Dice::new(6, 12, 6, 3))),
+                    SignedElement::Negative(Element::Dice(Dice::new(6, 12, KeepOrDrop::Drop(3)))),
-                    SignedElement::Positive(Element::Dice(Dice::new(1, 1, 1, 0))),
+                    SignedElement::Positive(Element::Dice(Dice::new(1, 1, KeepOrDrop::Keep(1)))),
                     SignedElement::Positive(Element::Bonus(53)),
                 ])
             ))

dicebot/src/basic/roll.rs

@@ -4,6 +4,7 @@
  * project.
  */
 use crate::basic::dice;
+use crate::basic::dice::KeepOrDrop;
 use rand::prelude::*;
 use std::fmt;
 use std::ops::{Deref, DerefMut};
@@ -86,7 +87,10 @@ impl Roll for dice::Dice {
         // sort rolls in descending order
         rolls.sort_by(|a, b| b.cmp(a));
 
-        DiceRoll(rolls,self.keep as usize, self.drop as usize)
+        match self.keep_drop {
+            KeepOrDrop::Keep(k)  => DiceRoll(rolls,k as usize, 0),
+            KeepOrDrop::Drop(dh) => DiceRoll(rolls,self.count as usize, dh as usize),
+        }
     }
 }