修改 算法

Author: toolgood

ToolGood.Algorithm/AlgorithmEngine.cs

@@ -179,7 +179,7 @@ private List<object> parse(string exp)
 
             while (curPos < texts.Count) {
                 //获取 当前操作数
-                curOpd = getOperand(texts,ref curPos);
+                curOpd = getOperand(texts, ref curPos);
                 if (curOpd != "") {
                     if (operators.Count > 0 && hasPoint) {
                         Operator op = operators.Pop();
@@ -307,7 +307,7 @@ private int getFunctionCount(List<string> texts, int curPos)
             }
             return count + hasCount;
         }
-        private string getOperand(List<string> texts,ref int curPos)
+        private string getOperand(List<string> texts, ref int curPos)
         {
             var t = texts[curPos];
             if (t.StartsWith("[")) {
@@ -322,7 +322,7 @@ private string getOperand(List<string> texts,ref int curPos)
             if (curPos > 0 && t == "-" && curPos + 1 < texts.Count) {
                 if (m_Operators2.Contains(texts[curPos - 1])) {
                     curPos++;
-                    return t + texts[curPos ];
+                    return t + texts[curPos];
                 }
             }
 
@@ -1136,7 +1136,9 @@ private Operand getChild(List<Operand> ops)
                         }
                     } else {
                         var v = json[op];
-                        if (v.IsString) {
+                        if (v == null) {
+                            return new Operand(OperandType.JSON, v);
+                        } else if (v.IsString) {
                             return new Operand(v.ToString());
                         } else if (v.IsBoolean) {
                             return new Operand(OperandType.BOOLEAN, bool.Parse(v.ToString()));
@@ -1148,6 +1150,8 @@ private Operand getChild(List<Operand> ops)
                             return new Operand(OperandType.NUMBER, double.Parse(v.ToString()));
                         } else if (v.IsObject) {
                             return new Operand(OperandType.JSON, v);
+                        } else if (v.IsArray) {
+                            return new Operand(OperandType.JSON, v);
                         }
                     }
                 }