fix

Author: linzhijun

csharp/ToolGood.Algorithm/Internals/Functions/FunctionBase.csharp.cs

@@ -207,10 +207,8 @@ public Function_REGEX(FunctionBase func1, FunctionBase func2) : base(func1, func
 
         public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
         {
-            var args1 = func1.Evaluate(work, tempParameter).ToText("Function '{0}' parameter {1} is error!", "Regex", 1);
-            if (args1.IsError) { return args1; }
-            var args2 = func2.Evaluate(work, tempParameter).ToText("Function '{0}' parameter {1} is error!", "Regex", 2);
-            if (args2.IsError) { return args2; }
+            var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotText) { args1 = args1.ToText("Function '{0}' parameter {1} is error!", "Regex", 1); if (args1.IsError) { return args1; } }
+            var args2 = func2.Evaluate(work, tempParameter); if (args2.IsNotText) { args2 = args2.ToText("Function '{0}' parameter {1} is error!", "Regex", 2); if (args2.IsError) { return args2; } }
 
             var b = Regex.Match(args1.TextValue, args2.TextValue);
             if (b.Success == false) {
@@ -869,7 +867,8 @@ public Function_HAS(FunctionBase func1, FunctionBase func2) : base(func1, func2)
         public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
         {
             var args1 = func1.Evaluate(work, tempParameter); if (args1.IsError) { return args1; }
-            var args2 = func2.Evaluate(work, tempParameter).ToText("Function '{0}' parameter {1} is error!", "Has", 2); if (args2.IsError) { return args2; }
+            var args2 = func2.Evaluate(work, tempParameter);
+            if (args2.IsNotText) { args2 = args2.ToText("Function '{0}' parameter {1} is error!", "Has", 2); if (args2.IsError) { return args2; } }
 
             if (args1.IsArrayJson) {
                 return Operand.Create(((OperandKeyValueList)args1).ContainsKey(args2));
@@ -921,7 +920,7 @@ public Function_HASVALUE(FunctionBase func1, FunctionBase func2) : base(func1, f
         public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
         {
             var args1 = func1.Evaluate(work, tempParameter); if (args1.IsError) { return args1; }
-            var args2 = func2.Evaluate(work, tempParameter).ToText("Function '{0}' parameter {1} is error!", "HasValue", 2); if (args2.IsError) { return args2; }
+            var args2 = func2.Evaluate(work, tempParameter); if (args2.IsNotText) { args2 = args2.ToText("Function '{0}' parameter {1} is error!", "HasValue", 2); if (args2.IsError) { return args2; } }
 
             if (args1.IsArrayJson) {
                 return Operand.Create(((OperandKeyValueList)args1).ContainsValue(args2));