chore: minor percentile parse improvements

Author: zhudotexe

d20/diceast.py

@@ -55,16 +55,9 @@ def dice_op(self, opsel):
         return SetOperator.new(*opsel)
 
     def diceexpr(self, dice):
-        reduced_dice = []
-        for token in dice:
-            if isinstance(token, Token):
-                reduced_dice.append(token)
-            else:
-                reduced_dice.append(token.children[0])
-
-        if len(reduced_dice) == 1:
-            return Dice(1, *reduced_dice)
-        return Dice(*reduced_dice)
+        if len(dice) == 1:
+            return Dice(1, *dice)
+        return Dice(*dice)
 
     def selector(self, sel):
         return SetSelector(*sel)
@@ -423,12 +416,12 @@ class Dice(Node):  # diceexpr
     def __init__(self, num, size):
         """
         :type num: lark.Token or int
-        :type size: lark.Token or int
+        :type size: lark.Token or int or str
         """
         super().__init__()
         self.num = int(num)
-        if size.value == "%":
-            self.size = size.value
+        if str(size) == "%":
+            self.size = str(size)
         else:
             self.size = int(size)
 

tests/test_dice.py

@@ -33,6 +33,7 @@ def test_sane_totals():
         assert 1 <= r("1d20") <= 20
         assert 0 <= r("1d%") <= 90
         assert 0 <= r("1d%") % 10 <= 9
+        assert r("1d%") % 10 == 0
         assert 3 <= r("4d6kh3") <= 18
         assert 1 <= r("(((1d6)))") <= 6
         assert 4 <= r("(1d4, 2+2, 3d6kl1)kh1") <= 6