完善运算表达式

zhanghe06 · zhanghe06 · commit 016fa3a06b0a · 2015-11-25T11:17:33.000+08:00
diff --git a/test/test_arithmetic.py b/test/test_arithmetic.py
@@ -38,6 +38,27 @@ def multiply(x, y):
     return result
 
 
+def split_exp(exp_str):
+    """
+    &#20998;&#35299;&#36816;&#31639;&#34920;&#36798;&#24335;
+    """
+    r_list = []
+    t_list = []
+    for i in exp_str:
+        if i.isdigit() or i == '.':
+            t_list.append(i)
+        elif t_list:
+            r_list.append(''.join(t_list))
+            t_list = []
+            r_list.append(i)
+        else:
+            r_list.append(i)
+    if t_list:
+        r_list.append(''.join(t_list))
+        del t_list[:]
+    return r_list
+
+
 def get_reversed_polish(exp):
     """
     &#33719;&#21462;&#36870;&#27874;&#20848;&#24335;
@@ -54,7 +75,7 @@ def get_reversed_polish(exp):
     r_list = []
     s_list = []
     for i in exp:
-        if i.isdigit():
+        if type(eval(i)) in [int, float]:
             r_list.append(i)
         if i in priority.keys():
             if i == '(' or not s_list:
@@ -79,11 +100,12 @@ def get_reversed_polish(exp):
     return r_list
 
 
-def expression(exp):
+def calculate_exp(exp_str):
     """
     &#35745;&#31639;&#34920;&#36798;&#24335;
     """
-    exp = get_reversed_polish(exp)
+    exp_list = split_exp(exp_str)  # &#20998;&#35299;&#34920;&#36798;&#24335;
+    exp = get_reversed_polish(exp_list)  # &#33719;&#21462;&#36870;&#27874;&#20848;&#24335;
     s_list = []
     for i in exp:
         if i.isdigit():
@@ -110,15 +132,15 @@ def test_expression():
     &#34920;&#36798;&#24335;&#27979;&#35797;
     """
     exp_01 = '2+3*(5-2)'
-    print expression(exp_01)
+    print calculate_exp(exp_01)
     print eval(exp_01)
 
     exp_02 = '2*(1+2/2)'
-    print expression(exp_02)
+    print calculate_exp(exp_02)
     print eval(exp_02)
 
     exp_03 = '2*(1+2/2)*(1+2)'
-    print expression(exp_03)
+    print calculate_exp(exp_03)
     print eval(exp_03)
 
 
