标准化

Author: linzhijun

csharp/ToolGood.Algorithm/AlgorithmEngineHelper.cs

@@ -306,7 +306,7 @@ public static bool IsKeywords(string parameter)
         /// <param name="exp"></param>
         /// <returns></returns>
         /// <exception cref="Exception"></exception>
-        public static DiyNameInfo GetDiyNames(String exp)
+        public static DiyNameInfo GetDiyNames(string exp)
         {
             if (string.IsNullOrWhiteSpace(exp)) {
                 throw new Exception("Parameter exp invalid !");

csharp/ToolGood.Algorithm/DiyNameInfo.cs

@@ -16,15 +16,15 @@ public sealed class DiyNameInfo
         /// <summary>
         /// 自定义方法
         /// </summary>
-        public List<String> Functions { get; private set; }
+        public List<string> Functions { get; private set; }
 
         /// <summary>
         /// 自定义类型
         /// </summary>
         public DiyNameInfo()
         {
             Parameters = new List<ParameterInfo>();
-            Functions = new List<String>();
+            Functions = new List<string>();
         }
     }
 

csharp/ToolGood.Algorithm/Internals/Base64.cs

@@ -58,7 +58,7 @@ public static byte[] FromBase64ForUrlString(string base64ForUrlInput)
             }
             var len = sb.Length;
             int padChars = (len % 4) == 0 ? 0 : (4 - (len % 4));
-            if (padChars > 0) sb.Append(String.Empty.PadRight(padChars, '='));
+            if (padChars > 0) sb.Append(string.Empty.PadRight(padChars, '='));
             return Convert.FromBase64String(sb.ToString());
         }
     }

csharp/ToolGood.Algorithm/Internals/ConditionTree.cs

@@ -38,7 +38,7 @@ public sealed class ConditionTree
         /// <summary>
         /// 出错信息
         /// </summary>
-        public String ErrorMessage { get; internal set; }
+        public string ErrorMessage { get; internal set; }
 
         internal ConditionTree()
         {

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

@@ -18,7 +18,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
 			return Operand.Create(F_base_ToDBC(args1.TextValue));
 		}
 
-		private static String F_base_ToDBC(String input)
+		private static string F_base_ToDBC(string input)
 		{
 			var sb = new StringBuilder(input);
 			for (int i = 0; i < input.Length; i++) {
@@ -50,7 +50,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
 			return Operand.Create(F_base_ToSBC(args1.TextValue));
 		}
 
-		private static String F_base_ToSBC(String input)
+		private static string F_base_ToSBC(string input)
 		{
 			var sb = new StringBuilder(input);
 			for (int i = 0; i < input.Length; i++) {

csharp/ToolGood.Algorithm/LitJson/JsonData.cs

@@ -144,7 +144,7 @@ void IJsonWrapper.SetJsonType(JsonType type)
                     break;
 
                 case JsonType.String:
-                    inst_string = default(String);
+                    inst_string = default(string);
                     break;
 
                 case JsonType.Double:

csharp/ToolGood.Algorithm/LitJson/JsonException.cs

@@ -5,12 +5,12 @@ namespace ToolGood.Algorithm.LitJson
     internal sealed class JsonException : ApplicationException
     {
         internal JsonException(ParserToken token, Exception inner_exception) :
-            base(String.Format("Invalid token '{0}' in input string", token), inner_exception)
+            base(string.Format("Invalid token '{0}' in input string", token), inner_exception)
         {
         }
 
         internal JsonException(int c) :
-            base(String.Format("Invalid character '{0}' in input string", (char)c))
+            base(string.Format("Invalid character '{0}' in input string", (char)c))
         {
         }
 

csharp/ToolGood.Algorithm/MyDate.cs

@@ -141,7 +141,7 @@ public MyDate(decimal num)
         /// </summary>
         /// <param name="txt"></param>
         /// <returns></returns>
-        public static MyDate Parse(String txt)
+        public static MyDate Parse(string txt)
         {
             var cultureInfo = CultureInfo.InvariantCulture;// CultureInfo.GetCultureInfo("zh-cn");
             var t = txt.Trim();

csharp/ToolGood.Algorithm/Operand.cs

@@ -130,6 +130,8 @@ public abstract class Operand
         /// </summary>
         public abstract OperandType Type { get; }
 
+        #region Value
+
         /// <summary>
         /// 数字值
         /// </summary>
@@ -172,6 +174,8 @@ public abstract class Operand
         /// </summary>
         public virtual MyDate DateValue => throw new NotImplementedException();
 
+        #endregion
+
         #region Create
 
         /// <summary>
@@ -443,6 +447,9 @@ public static Operand CreateNull()
         }
 
         #endregion Create
+
+        #region 转化类型
+
         /// <summary>
         /// 转数值类型
         /// </summary>
@@ -471,13 +478,13 @@ public static Operand CreateNull()
         /// <returns></returns>
         public virtual Operand ToBoolean(string errorMessage, params object[] args) { return Error(string.Format(errorMessage, args)); }
         /// <summary>
-        /// 转String类型
+        /// 转string类型
         /// </summary>
         /// <param name="errorMessage"></param>
         /// <returns></returns>
         public virtual Operand ToText(string errorMessage = null) { return Error(errorMessage ?? "Convert to string error!"); }
         /// <summary>
-        /// 转String类型
+        /// 转string类型
         /// </summary>
         /// <param name="errorMessage"></param>
         /// <param name="args"></param>
@@ -513,6 +520,8 @@ public static Operand CreateNull()
         /// <returns></returns>
         public virtual Operand ToArray(string errorMessage, params object[] args) { return Error(string.Format(errorMessage, args)); }
 
+        #endregion
+
         #region Operand
 
         #region number
@@ -673,6 +682,7 @@ public static implicit operator Operand(List<double> obj)
         }
 
         #endregion Operand
+
     }
 
 

csharp/ToolGood.Algorithm/UnitConversion/UnitFactorSynonyms.cs

@@ -36,7 +36,7 @@ internal bool Contains(string synonym)
 
         public override string ToString()
         {
-            return String.Join(", ", _synonyms);
+            return string.Join(", ", _synonyms);
         }
 
         // Allow strings to be interpreted as a UnitDictionaryKey