Merge pull request #46 from Vlek/keep_notation

Keep notation

.pylintrc

@@ -0,0 +1,4 @@
+# Good variable names which should always be accepted.
+# We have to go with this because they haven't fixed this yet:
+# https://github.com/PyCQA/pylint/issues/2018
+good-names=x

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyroll"
-version = "2.0.0"
+version = "2.1.0"
 description = "Dice roller with all of the features you could want."
 authors = ["Derek 'Vlek' McCammond <[email protected]>"]
 license = "gpl-3.0"
@@ -35,4 +35,4 @@ requires = ["poetry>=0.12"]
 build-backend = "poetry.masonry.api"
 
 [tool.poetry.scripts]
-roll = 'roll.click_dice:roll_cli'
+roll = 'roll.click.click_dice:roll_cli'

roll/__init__.py

@@ -1 +1 @@
-from .roll import roll
+from roll.roll import roll

roll/click_dice.py → roll/click/click_dice.py

@@ -15,10 +15,11 @@
 
 from typing import List, Union
 
-import click
-
+import roll.parser.operations as ops
 from roll import roll
-from roll.diceparser import EvaluationResults, RollOption
+from roll.parser.types import EvaluationResults, RollOption
+
+import click
 
 
 @click.command()
@@ -57,18 +58,24 @@ def roll_cli(expression: List[str] = None,
     """
     command_input = ' '.join(expression) if expression is not None else ''
 
+    # Because of how we are now evaluating during parsing, we have to go back
+    # to the old way of having some globalish variable for handing off the
+    # type of roll that we're attempting to do.
+    ops.ROLL_TYPE = roll_option
+
     result: Union[int, float, EvaluationResults] = roll(
         command_input, verbose, roll_option,
     )
 
-    if verbose and isinstance(result, dict):
-        for r in result['rolls']:
+    if verbose and isinstance(result, EvaluationResults):
+        for r in result.rolls:
             click.echo(
-                f"{r['dice']}: {r['rolls']}"
+                f"{r.dice}: {r.rolls}"
             )
 
-        click.echo(result['total'])
-
+        click.echo(result.total)
+    elif isinstance(result, EvaluationResults):
+        click.echo(result.total)
     else:
         click.echo(result)