Merge d651f54 into 6cd8d34

pylover · Sep 10, 2020 · 4d4e20d · 4d4e20d
2 parents 6cd8d34 + d651f54
commit 4d4e20d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/sunrise/actions.py b/sunrise/actions.py
@@ -16,6 +16,7 @@ def __init__(self, operator, a, b):
         self.operator = {
             'Add': '+',
             'Sub': '-',
+            'Div': '/',
         }[operator] if operator not in self.operators else operator
         self.numbers = [a, b]
 
@@ -34,6 +35,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
@@ -4,5 +4,6 @@
 def test_parser():
     assert '6' == do('2 + 4')
     assert '6' == do('Add 2 by 4')
-
-
+    assert '2.0' == do('4 / 2')
+    assert '2.0' == do('Div 4 by 2')
+    assert '2.0' == do('Div 2 into 4')