1.3.1.6版本

Author: toolgood

README.md

@@ -816,4 +816,7 @@ ToolGood.Algorithm֧
 	<tr>
         <td>RemoveBoth</td><td>RemoveBoth(文本,左边文本,右边文本,同时匹配:0/1(默认0))<br>匹配方式, 匹配左边，成功则去除左边字符串。匹配右边，成功则去除右边字符串。</td> <td></td>
     </tr>
+	<tr>
+        <td>P<br>param</td><td>P(文本)<br>动态查询参数。</td> <td></td>
+    </tr>
 </table>

ToolGood.Algorithm.Test/AlgorithmEngine/AlgorithmEngineTest.cs

@@ -121,7 +121,14 @@ public void Cylinder_Test()
             c.TryEvaluate("[直径]*pi()", 0.0);            //圆的长
             c.TryEvaluate("[半径]*[半径]*pi()*[高]", 0.0); //圆的体积
 
-            var t= c.TryEvaluate("log([半径])", 0.0); 
+            if (c.Parse("[直径1]*pi()")==false) {
+                Assert.AreEqual("参数[直径1]无效!", c.LastError);
+            }
+
+            c.TryEvaluate("p('半径')*[半径]*pi()*[高]", 0.0); //圆的体积
+
+
+
         }
 
     }

ToolGood.Algorithm/AlgorithmEngine.cs

@@ -14,7 +14,14 @@ public partial class AlgorithmEngine
         private Dictionary<string, Func<List<Operand>, Operand>> funcDict = new Dictionary<string, Func<List<Operand>, Operand>>();
         private bool _useExcelIndex = true;
         private int excelIndex = 1;
+        /// <summary>
+        /// 使用EXCEL索引
+        /// </summary>
         public bool UseExcelIndex { get { return _useExcelIndex; } set { _useExcelIndex = value; excelIndex = value ? 1 : 0; } }
+        /// <summary>
+        /// 最后一个错误
+        /// </summary>
+        public string LastError { get; private set; }
 
         public AlgorithmEngine()
         {
@@ -47,22 +54,63 @@ protected void AddFunction(string funName, Func<List<Operand>, Operand> function
 
         public bool Parse(string exp)
         {
-            m_tokens.Clear();//清空语法单元堆栈
             if (string.IsNullOrEmpty(exp) || exp.Trim() == "" || !this.isMatching(exp)) {
+                LastError = "exp无效";
                 return false;
             }
-            m_tokens = parse(exp);
+            string error;
+            m_tokens = parse(exp, out error);
             return true;
         }
+        public bool Parse(string exp ,out string error)
+        {
+            if (string.IsNullOrEmpty(exp) || exp.Trim() == "" || !this.isMatching(exp)) {
+                error = "exp无效";
+                LastError = "exp无效";
+                return false;
+            }
+            m_tokens = parse(exp, out error);
+            return true;
+        }
+
         public bool Parse(string name, string exp)
         {
             if (string.IsNullOrEmpty(exp) || exp.Trim() == "" || !this.isMatching(exp)) {
+                LastError = "exp无效";
+                return false;
+            }
+            string error;
+            tokenDict[name] = parse(exp,out error);
+            LastError = error;
+            return true;
+        }
+        public bool Parse(string name, string exp, out string error)
+        {
+            if (string.IsNullOrEmpty(exp) || exp.Trim() == "" || !this.isMatching(exp)) {
+                error = "exp无效";
+                LastError = "exp无效";
                 return false;
             }
-            tokenDict[name] = parse(exp);
+            tokenDict[name] = parse(exp, out error);
+            LastError = error;
             return true;
         }
 
+
+        private Stack<object> parse(string exp,out string error)
+        {
+            error = null;
+            var tmp = parse(exp);
+            var names = GetParameterNames(tmp);
+            foreach (var item in names) {
+                if (GetParameter(new Operand(item)) == null) {
+                    error = $"参数{item}无效!";
+                    return null;
+                }
+            }
+            return tmp;
+        }
+
         private Stack<object> parse(string exp)
         {
             Stack<object> operands = new Stack<object>();             //操作数堆栈
@@ -350,9 +398,13 @@ private List<string> splitText(string exp)
         #region GetParameterNames
 
         public List<string> GetParameterNames()
+        {
+            return GetParameterNames(m_tokens);
+        }
+        private List<string> GetParameterNames(Stack<object> tokens )
         {
             List<string> list = new List<string>();
-            foreach (var item in m_tokens) {
+            foreach (var item in tokens) {
                 var curOpd = item as Operand;
                 if (curOpd != null) {
                     if (curOpd.Type == OperandType.PARAMETER) {
@@ -364,6 +416,7 @@ public List<string> GetParameterNames()
             return list;
         }
 
+
         #endregion
 
         #region Evaluate
@@ -491,6 +544,7 @@ private object evaluate(Stack<object> tokens)
             if (opds.Count == 1) {
                 var outopd = opds.Pop();
                 if (outopd.Type == OperandType.ERROR) {
+                    LastError = outopd.StringValue;
                     throw new Exception(outopd.StringValue);
                 }
                 value = outopd.Value;

ToolGood.Algorithm/AlgorithmEngine.csharp.cs

@@ -62,6 +62,18 @@ private void AddCSharp()
 
             addFunc("ToUpper", Func_Upper); //将文本转换为大写形式 
             addFunc("ToLower", Func_Lower); //将文本参数转换为数字 
+
+            addFunc("P", Func_P);
+            addFunc("param", Func_P);
+         }
+
+        private Operand Func_P(List<Operand> arg)
+        {
+            CheckArgsCount("P", arg, new OperandType[][] { new OperandType[] { OperandType.STRING } });
+            if (arg[0].StringValue.StartsWith("[")) {
+                return GetParameter(new Operand(OperandType.Any, arg[0].StringValue));
+            }
+            return GetParameter(new Operand(OperandType.Any, "[" + arg[0].StringValue + "]"));
         }
 
         private Operand Func_UrlDecode(List<Operand> arg)

ToolGood.Algorithm/ToolGood.Algorithm.csproj

@@ -23,11 +23,11 @@
     <RootNamespace>ToolGood.Algorithm</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <FileVersion>1.3.1.5</FileVersion>
-    <Version>1.3.1.5</Version>
+    <FileVersion>1.3.1.6</FileVersion>
+    <Version>1.3.1.6</Version>
     <PackageReleaseNotes></PackageReleaseNotes>
     <Product>ToolGood.Algorithm</Product>
-    <AssemblyVersion>1.3.1.5</AssemblyVersion>
+    <AssemblyVersion>1.3.1.6</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">