恢复 Operand.cs

Author: lzj

csharp/ToolGood.Algorithm2/Operand.cs

@@ -19,25 +19,18 @@ public abstract class Operand : IDisposable
         /// False 值
         /// </summary>
         public static readonly Operand False = Operand.Create(false);
-        private bool _isError = false;
-        private string _errorMsg = null;
-
-        public Operand() { }
-        public Operand(string errMsg) { _isError = true; _errorMsg = errMsg; }
-
-
         /// <summary>
         /// 是否为空
         /// </summary>
         public virtual bool IsNull => false;
         /// <summary>
         /// 是否出错
         /// </summary>
-        public virtual bool IsError => _isError;
+        public virtual bool IsError => false;
         /// <summary>
         /// 错误信息
         /// </summary>
-        public virtual string ErrorMsg => _errorMsg;
+        public virtual string ErrorMsg => null;
         /// <summary>
         /// 操作数类型
         /// </summary>
@@ -333,12 +326,7 @@ public Operand ToNumber(string errorMessage = null)
                     return Create(d);
                 }
             }
-            _isError = true;
-            if (null == _errorMsg)
-            {
-                _errorMsg = errorMessage;
-            }
-            return this;
+            return Error(errorMessage);
         }
         /// <summary>
         /// 转bool类型
@@ -358,12 +346,7 @@ public Operand ToBoolean(string errorMessage = null)
                 if (TextValue.Equals("1", StringComparison.OrdinalIgnoreCase)) { return Create(true); }
                 if (TextValue.Equals("0", StringComparison.OrdinalIgnoreCase)) { return Create(false); }
             }
-            _isError = true;
-            if (null == _errorMsg)
-            {
-                _errorMsg = errorMessage;
-            }
-            return this;
+            return Error(errorMessage);
         }
         /// <summary>
         /// 转String类型
@@ -378,12 +361,7 @@ public Operand ToText(string errorMessage = null)
             if (Type == OperandType.BOOLEAN) { return Create(BooleanValue ? "TRUE" : "FALSE"); }
             if (Type == OperandType.DATE) { return Create(DateValue.ToString()); }
 
-            _isError = true;
-            if (null == _errorMsg)
-            {
-                _errorMsg = errorMessage;
-            }
-            return this;
+            return Error(errorMessage);
         }
         /// <summary>
         /// 转Date类型
@@ -400,12 +378,7 @@ public Operand ToDate(string errorMessage = null)
                 if (TimeSpan.TryParse(TextValue, cultureInfo, out TimeSpan t)) { return Create(new Date(t)); }
                 if (DateTime.TryParse(TextValue, cultureInfo, DateTimeStyles.None, out DateTime d)) { return Create(new Date(d)); }
             }
-            _isError = true;
-            if (null == _errorMsg)
-            {
-                _errorMsg = errorMessage;
-            }
-            return this;
+            return Error(errorMessage);
         }
         /// <summary>
         /// 转Json类型
@@ -429,12 +402,7 @@ public Operand ToJson(string errorMessage = null)
                     catch (Exception) { }
                 }
             }
-            _isError = true;
-            if (null == _errorMsg)
-            {
-                _errorMsg = errorMessage;
-            }
-            return this;
+            return Error(errorMessage);
         }
         /// <summary>
         /// 转Array类型
@@ -466,29 +434,9 @@ public Operand ToArray(string errorMessage = null)
                     return Create(list);
                 }
             }
-            _isError = true;
-            if (null == _errorMsg)
-            {
-                _errorMsg = errorMessage;
-            }
-            return this;
+            return Error(errorMessage);
         }
 
-        ///// <summary>
-        ///// 设置失败
-        ///// </summary>
-        ///// <param name="errorMessage"></param>
-        ///// <returns></returns>
-        //public Operand SetError(string errorMessage)
-        //{
-        //    _isError = true;
-        //    if (null==_errorMsg)
-        //    {
-        //        _errorMsg = errorMessage;
-        //    }
-        //    return this;
-        //}
-
         void IDisposable.Dispose() { }
 
 
@@ -570,7 +518,7 @@ public static implicit operator Operand(List<double> obj)
     abstract class Operand<T> : Operand
     {
         public T Value { get; private set; }
-        public Operand(T obj):base()
+        public Operand(T obj)
         {
             Value = obj;
         }
@@ -616,8 +564,12 @@ public OperandArray(List<Operand> obj) : base(obj) { }
     class OperandError : Operand
     {
         public override OperandType Type => OperandType.ERROR;
-        public OperandError(string msg):base(msg)
+        public override bool IsError => true;
+        private string _errorMsg;
+        public override string ErrorMsg => _errorMsg;
+        public OperandError(string msg)
         {
+            _errorMsg = msg;
         }
     }