Update evaluate.py

iKostanOrg · Oct 30, 2024 · c260c5c · c260c5c
1 parent 8a8a248
commit c260c5c
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/kyu_2/evaluate_mathematical_expression/evaluate.py b/kyu_2/evaluate_mathematical_expression/evaluate.py
@@ -158,7 +158,7 @@ def calc(string: str) -> float:
     return float(string)
 
 
-def check_conditions(strings, string, temp) -> (str, str):
+def check_conditions(strings, string, temp) -> [str, str]:
     """
     Check conditions
     :param strings:
@@ -170,9 +170,10 @@ def check_conditions(strings, string, temp) -> (str, str):
         if s.isdigit():
             temp += s
 
+        if (s in ''.join(OPERATORS) + '()' or i == len(string) - 1) and temp:
+            strings.append(temp)
+
         if s in '()':
-            if temp != '':
-                strings.append(temp)
             strings.append(s)
 
             if i + 1 < len(string):
@@ -182,17 +183,13 @@ def check_conditions(strings, string, temp) -> (str, str):
             break
 
         if s in OPERATORS:
-            if temp != '':
-                strings.append(temp)
             strings.append(s)
 
             if i + 1 < len(string):
                 string = string[i + 1:]
             break
 
         if i == len(string) - 1:
-            if temp != '':
-                strings.append(temp)
             string = ''
 
     return temp, string