Browse Source

rename ParamterInfo to ParameterInfo

Lith 10 months ago
parent
commit
38605c2032

+ 8 - 8
src/Vit.Linq/ExpressionTree/ComponentModel/ExpressionNode/ExpressionNodeCloner.cs

@@ -1,10 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Xml.Linq;
+using System.Reflection;
 
-namespace Vit.Linq.ExpressionTree.ComponentModel 
+namespace Vit.Linq.ExpressionTree.ComponentModel
 {
     public class ExpressionNodeCloner
     {
@@ -21,9 +20,10 @@ namespace Vit.Linq.ExpressionTree.ComponentModel
             return CloneChildren(node, new ExpressionNode());
         }
 
-        public virtual ExpressionNode CloneChildren(ExpressionNode source, ExpressionNode dest)
+        static PropertyInfo[] properties = typeof(ExpressionNode).GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+        public virtual ExpressionNode CloneChildren(ExpressionNode source, ExpressionNode destination)
         {
-            foreach (var p in typeof(ExpressionNode).GetProperties())
+            foreach (var p in properties)
             {
                 if (p.CanRead && p.CanWrite)
                 {
@@ -45,16 +45,16 @@ namespace Vit.Linq.ExpressionTree.ComponentModel
                     {
                         value = members.Select(member => new MemberBind { name = member.name, value = Clone(member.value) }).ToList();
                     }
-                    p.SetValue(dest, value);
+                    p.SetValue(destination, value);
                 }
             }
             var codeArg = source.GetCodeArg();
             if (codeArg != null)
             {
                 foreach (var kv in codeArg)
-                    dest.SetCodeArg(kv.Key, kv.Value);
+                    destination.SetCodeArg(kv.Key, kv.Value);
             }
-            return dest;
+            return destination;
         }
     }
 }

+ 6 - 6
src/Vit.Linq/ExpressionTree/ComponentModel/ExpressionNode/ExpressionNode_Member.cs

@@ -5,8 +5,8 @@ namespace Vit.Linq.ExpressionTree.ComponentModel
 
     public interface ExpressionNode_Member : IExpressionNode
     {
-        public string parameterName { get;   }
-        public ExpressionNode objectValue { get;  }
+        public string parameterName { get; }
+        public ExpressionNode objectValue { get; }
 
         public string memberName { get; }
 
@@ -64,9 +64,9 @@ namespace Vit.Linq.ExpressionTree.ComponentModel
         }
     }
 
-    public class ParamterInfo
+    public class ParameterInfo
     {
-        internal ParamterInfo(object value, Type type)
+        internal ParameterInfo(object value, Type type)
         {
             this.value = value;
             this.type = type;
@@ -81,7 +81,7 @@ namespace Vit.Linq.ExpressionTree.ComponentModel
     }
     public class ExpressionNode_FreeParameter : ExpressionNode
     {
-        protected ParamterInfo parameter;
+        protected ParameterInfo parameter;
 
         public override string parameterName
         {
@@ -89,7 +89,7 @@ namespace Vit.Linq.ExpressionTree.ComponentModel
             get => parameter?.parameterName;
         }
 
-        public static ExpressionNode Member(ParamterInfo parameter)
+        public static ExpressionNode Member(ParameterInfo parameter)
         {
             var node = new ExpressionNode_FreeParameter
             {

+ 10 - 10
src/Vit.Linq/ExpressionTree/DataConvertArgument.cs

@@ -11,23 +11,23 @@ namespace Vit.Linq.ExpressionTree
     {
         public bool autoReduce { get; set; } = false;
 
-        public Func<object,Type, bool> isArgument { get; set; }
+        public Func<object, Type, bool> isArgument { get; set; }
 
 
-        public virtual bool IsArgument(ConstantExpression constant) 
+        public virtual bool IsArgument(ConstantExpression constant)
         {
             var value = constant.Value;
             var type = constant.Type;
 
-            return IsArgument(value,type);
+            return IsArgument(value, type);
         }
 
-        public virtual bool IsArgument(object value,Type type)
+        public virtual bool IsArgument(object value, Type type)
         {
             if (isArgument != null)
-                return isArgument(value,type);
+                return isArgument(value, type);
+
 
-         
             if (!type.IsArray && type.IsGenericType && typeof(IQueryable).IsAssignableFrom(type))
             {
                 return true;
@@ -222,20 +222,20 @@ namespace Vit.Linq.ExpressionTree
 
         }
 
-        internal List<ParamterInfo> globalParameters { get; private set; }
+        internal List<ParameterInfo> globalParameters { get; private set; }
 
 
         public ExpressionNode CreateParameter(object value, Type type)
         {
-            ParamterInfo parameter;
+            ParameterInfo parameter;
 
             parameter = globalParameters?.FirstOrDefault(p => p.value?.GetHashCode() == value.GetHashCode());
 
             if (parameter == null)
             {
-                if (globalParameters == null) globalParameters = new List<ParamterInfo>();
+                if (globalParameters == null) globalParameters = new List<ParameterInfo>();
 
-                parameter = new ParamterInfo(value: value, type: type);
+                parameter = new ParameterInfo(value: value, type: type);
                 globalParameters.Add(parameter);
             }
             return ExpressionNode_FreeParameter.Member(parameter);

+ 1 - 1
src/Vit.Linq/ExpressionTree/ExpressionConvertService.ToData.cs

@@ -13,7 +13,7 @@ namespace Vit.Linq.ExpressionTree
             return ConvertToData(expression, out _, autoReduce: autoReduce, isArgument: isArgument);
         }
 
-        public ExpressionNode ConvertToData(Expression expression, out ParamterInfo[] parameters, bool autoReduce = true, Func<object, Type, bool> isArgument = null)
+        public ExpressionNode ConvertToData(Expression expression, out ParameterInfo[] parameters, bool autoReduce = true, Func<object, Type, bool> isArgument = null)
         {
             var arg = new DataConvertArgument { convertService = this, autoReduce = autoReduce, isArgument = isArgument };
 

+ 0 - 3
src/Vit.Linq/ExpressionTree/ExpressionConvertor/Constant.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections;
-using System.Data;
-using System.Linq;
 using System.Linq.Expressions;
 
 using Vit.Linq.ExpressionTree.ComponentModel;

+ 3 - 3
src/Vit.Linq/Filter/ComponentModel/IFilterRule.cs

@@ -21,13 +21,13 @@ namespace Vit.Linq.Filter.ComponentModel
 
 
         /// <summary>
-        ///  Supported value : 
-        ///  
+        ///  Supported value :
+        ///
         ///     "IsNull", "IsNotNull" ,
         ///     "=", "!=", "&gt;", "&lt;" , "&gt;=", "&lt;=", 
         ///     "In" , "NotIn" ,
         ///     "Contains", "NotContains", "StartsWith", "EndsWith" , "IsNullOrEmpty", "IsNotNullOrEmpty"
-        ///     
+        ///
         ///    //TODO [array]   "is empty", "is not empty"
         /// </summary>
         string @operator { get; set; }