fix

Author: linzhijun

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

@@ -672,20 +672,20 @@ public override void ToString(StringBuilder stringBuilder, bool addBrackets)
         }
     }
 
-    internal class Function_WEEKNUM : Function_N
+    internal class Function_WEEKNUM : Function_2
     {
-        public Function_WEEKNUM(FunctionBase[] funcs) : base(funcs)
+        public Function_WEEKNUM(FunctionBase func1, FunctionBase func2) : base(func1, func2)
         {
         }
 
         public override Operand Calculate(AlgorithmEngine work)
         {
-            var args1 = funcs[0].Calculate(work); if (args1.Type != OperandType.DATE) { args1 = args1.ToMyDate("Function '{0}' parameter {1} is error!", "WeekNum", 1); if (args1.IsError) { return args1; } }
+            var args1 = func1.Calculate(work); if (args1.Type != OperandType.DATE) { args1 = args1.ToMyDate("Function '{0}' parameter {1} is error!", "WeekNum", 1); if (args1.IsError) { return args1; } }
             var startMyDate = (DateTime)args1.DateValue;
 
             var days = startMyDate.DayOfYear + (int)(new DateTime(startMyDate.Year, 1, 1).DayOfWeek);
-            if (funcs.Length == 2) {
-                var args2 = funcs[1].Calculate(work); if (args2.Type != OperandType.NUMBER) { args2 = args2.ToNumber("Function '{0}' parameter {1} is error!", "WeekNum", 2); if (args2.IsError) { return args2; } }
+            if (func2 != null) {
+                var args2 = func2.Calculate(work); if (args2.Type != OperandType.NUMBER) { args2 = args2.ToNumber("Function '{0}' parameter {1} is error!", "WeekNum", 2); if (args2.IsError) { return args2; } }
                 if (args2.IntValue == 2) {
                     days--;
                 }

csharp/ToolGood.Algorithm/Internals/MathFunctionVisitor.cs

@@ -1091,11 +1091,10 @@ public FunctionBase VisitWORKDAY_fun(mathParser.WORKDAY_funContext context)
         public FunctionBase VisitWEEKNUM_fun(mathParser.WEEKNUM_funContext context)
         {
             var exprs = context.expr();
-            FunctionBase[] args = new FunctionBase[exprs.Length];
-            for (int i = 0; i < exprs.Length; i++) {
-                args[i] = exprs[i].Accept(this);
-            }
-            return new Function_WEEKNUM(args);
+            var args1 = exprs[0].Accept(this);
+            if (exprs.Length == 1) return new Function_WEEKNUM(args1, null);
+            var args2 = exprs[1].Accept(this);
+            return new Function_WEEKNUM(args1, args2);
         }
 
         public FunctionBase VisitADDMONTHS_fun(mathParser.ADDMONTHS_funContext context)