make dice result total and result properties

Author: zhudotexe

d20/dice.py

@@ -70,10 +70,17 @@ def __init__(self, the_ast, the_roll, stringifier):
         """
         self.ast = the_ast
         self.expr = the_roll
-        self.total = int(the_roll.total)
-        self.result = stringifier.stringify(the_roll)
+        self.stringifier = stringifier
         self.comment = the_roll.comment
 
+    @property
+    def total(self):
+        return int(self.expr.total)
+
+    @property
+    def result(self):
+        return self.stringifier.stringify(self.expr)
+
     @property
     def crit(self):
         """

setup.py

@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name="d20",
-    version="1.0.1",
+    version="1.0.2",
     author="Andrew Zhu",
     author_email="[email protected]",
     description="A formal grammar-based dice parser and roller for D&D and other dice systems.",

tests/test_dice.py

@@ -197,3 +197,13 @@ def test_ma_op():
     assert r("10d6ma1") == 10
     assert r("10d6ma0") == 0
     assert 10 <= r("10d6ma5") <= 50
+
+
+# modifying the tree directly
+def test_correct_results():
+    result = roll("1+2+3")
+    assert result.total == 6
+    assert result.result == "1 + 2 + 3 = `6`"
+    result.expr.roll = BinOp(result.expr.roll, '+', Literal(4))
+    assert result.total == 10
+    assert result.result == "1 + 2 + 3 + 4 = `10`"