fix #15

Author: toolgood

csharp/ToolGood.Algorithm2/Internals/MathVisitor.cs

@@ -310,20 +310,19 @@ public Operand VisitAndOr_fun(mathParser.AndOr_funContext context)
         #region flow
         public Operand VisitIF_fun(mathParser.IF_funContext context)
         {
-            var args = new List<Operand>();
-            foreach (var item in context.expr()) { var aa = this.Visit(item); if (aa.IsError) { return aa; } args.Add(aa); }
+            var exprs = context.expr();
 
-            var b = args[0].ToBoolean("Function IF first parameter is error!");
+            var b = Visit(exprs[0]).ToBoolean("Function IF first parameter is error!");
             if (b.IsError) { return b; }
 
             if (b.BooleanValue) {
-                if (args.Count > 1) {
-                    return args[1];
+                if (exprs.Length > 1) {
+                    return Visit(exprs[1]);
                 }
                 return Operand.True;
             }
-            if (args.Count == 3) {
-                return args[2];
+            if (exprs.Length == 3) {
+                return Visit(exprs[2]);
             }
             return Operand.False;
         }

java/toolgood.algorithm/src/main/java/toolgood/algorithm/internals/MathVisitor.java

@@ -402,28 +402,19 @@ public Operand visitAndOr_fun(final AndOr_funContext context) {
     }
 
     public Operand visitIF_fun(final IF_funContext context) {
-        final List<Operand> args = new ArrayList<Operand>();
-        for (final ExprContext item : context.expr()) {
-            final Operand aa = visit(item);
-            if (aa.IsError()) {
-                return aa;
-            }
-            args.add(aa);
-        }
+        List<ExprContext> exprs = context.expr();
 
-        final Operand b = args.get(0).ToBoolean("Function IF first parameter is error!");
-        if (b.IsError()) {
-            return b;
-        }
+        Operand b = visit(exprs.get(0)).ToBoolean("Function IF first parameter is error!");
+        if (b.IsError()) { return b; }
 
         if (b.BooleanValue()) {
-            if (args.size() > 1) {
-                return args.get(1);
+            if (exprs.size() > 1) {
+                return visit(exprs.get(1));
             }
             return Operand.True;
         }
-        if (args.size() == 3) {
-            return args.get(2);
+        if (exprs.size() == 3) {
+            return visit(exprs.get(2));
         }
         return Operand.False;
     }