修改 代码

Author: toolgood

csharp/ToolGood.Algorithm2.Test/AlgorithmEngine/AlgorithmEngineTest.cs

@@ -124,6 +124,13 @@ public void base_test()
 
         }
 
+        [Test]
+        public void base_test2()
+        {
+            AlgorithmEngine engine = new AlgorithmEngine();
+            var t = engine.TryEvaluate("1+(3*2+2)/2 & '11' & '11:20'*9 & isnumber(22)*3", "");
+  
+        }
 
         [Test]
         public void Cylinder_Test()
@@ -138,9 +145,6 @@ public void Cylinder_Test()
             }
 
             c.TryEvaluate("['半径']*[半径]*pi()*[高]", 0.0); //圆的体积
-
-
-
         }
 
     }

csharp/ToolGood.Algorithm2/AlgorithmEngine.cs

@@ -133,17 +133,17 @@ public double TryEvaluate(string exp, double def)
         public string TryEvaluate(string exp, string def)
         {
             if (Parse(exp)) {
-                try {
+                //try {
                     var obj = Evaluate();
                     obj = obj.ToString("");
                     if (obj.IsError) {
                         LastError = obj.ErrorMsg;
                         return def;
                     }
                     return obj.StringValue;
-                } catch (Exception ex) {
-                    LastError = ex.Message;
-                }
+                //} catch (Exception ex) {
+                //    LastError = ex.Message;
+                //}
             }
             return def;
         }

csharp/ToolGood.Algorithm2/Date.cs

@@ -51,12 +51,12 @@ public override string ToString()
                 }
             }
             if (Day != null) {
-                return ((TimeSpan)this).ToString("dd HH:mm:ss");
+                return ((TimeSpan)this).ToString();
             }
             if (Second == 0) {
-                return ((TimeSpan)this).ToString("HH:mm");
+                return ((TimeSpan)this).ToString("hh':'mm");
             }
-            return ((TimeSpan)this).ToString("HH:mm:ss");
+            return ((TimeSpan)this).ToString();
         }
 
         public string ToString(string f)