Add divider. Closes #12 (#10)

pylover · Sep 12, 2020 · ad79a5a · ad79a5a
1 parent 23cd808
commit ad79a5a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/sunrise/actions.py b/sunrise/actions.py
@@ -10,13 +10,15 @@ def execute(self):
 
 
 class Calculator(Action):
-    operators = ['+', '-', '*', '/']
+    operators = ['+', '-', '*']
 
     def __init__(self, operator, a, b):
         self.operator = {
             'Add': '+',
             'Sub': '-',
             'subtract': '-',
+            'Div': '//',
+            '/': '//',
         }[operator] if operator not in self.operators else operator
         self.numbers = [a, b]
 
@@ -41,6 +43,18 @@ def execute(self):
         ),
         Calculator
     ),
+    (
+        re.compile(
+            r'(?P<operator>Div)\s*(?P<b>\d+)\s*(into)\s*(?P<a>\d+)'
+        ),
+        Calculator
+    ),
+    (
+        re.compile(
+            r'(?P<operator>Div)\s*(?P<a>\d+)\s*(by)\s*(?P<b>\d+)'
+        ),
+        Calculator
+    ),
 ]
 
 

diff --git a/tests/test_calculator.py b/tests/test_calculator.py
@@ -6,5 +6,6 @@ def test_parser():
     assert '6' == do('Add 2 by 4')
     assert '2' == do('subtract 2 from 4')
     assert '2' == do('4 - 2')
-
-
+    assert '2' == do('4 / 2')
+    assert '2' == do('Div 4 by 2')
+    assert '2' == do('Div 2 into 4')