Operation results are parsed

Author: Bernardo-MG

dice_notation/algebra.py

@@ -32,6 +32,9 @@ def __repr__(self):
         return '<class %s>(left=%r, right=%r, operator=%r)' % \
                (self.__class__.__name__, self._left, self._right, self._operator)
 
+    def value(self):
+        return self._operation(self._left.value(), self._right.value())
+
     @property
     def left(self):
         """
@@ -70,3 +73,23 @@ def operator(self):
     @operator.setter
     def operator(self, operator):
         self._operator = operator
+
+
+class Number(object):
+    """
+    A numeric constant
+    """
+
+    def __init__(self, value):
+        super(Number, self).__init__()
+        self._value = value
+
+    def __str__(self):
+        return '%s' % (self._value)
+
+    def __repr__(self):
+        return '<class %s>(value=%r)' % \
+               (self.__class__.__name__, self._value)
+
+    def value(self):
+        return self._value

dice_notation/parser/DiceNotationListener.py

@@ -3,7 +3,7 @@
 
 import logging
 from dice_notation.dice import Dice
-from dice_notation.algebra import BinaryOperation
+from dice_notation.algebra import BinaryOperation, Number
 
 # This class defines a complete listener for a parse tree produced by DiceNotationParser.
 class DiceNotationListener(ParseTreeListener):
@@ -132,7 +132,7 @@ def exitDice(self, ctx):
     # Enter a parse tree produced by DiceNotationParser#number.
     def enterNumber(self, ctx):
         self._logger.debug("Entering number %s", ctx.getText())
-        value = int(ctx.getText())
+        value = Number(int(ctx.getText()))
         self._nodes.append(value)
 
     # Exit a parse tree produced by DiceNotationParser#number.

dice_notation/parser/dice.py

@@ -27,4 +27,4 @@ def parse(self, input):
 
         expression = listener.expression()
         self._logger.debug("Parsed expression %s", expression)
-        return expression
+        return expression.value()

tests/parser/number/test_dice_parser_number_add.py

@@ -37,8 +37,7 @@ def test_add_toNegative(self):
         """
         result = self.parser.parse("-1+2")
 
-        # TODO: currently not supported
-        # self.assertEqual(1, result)
+        self.assertEqual(1, result)
 
 
 class TestAddLong(unittest.TestCase):