fix

Author: linzhijun

csharp/ToolGood.Algorithm.Test/AlgorithmEngine/StringTest.cs

@@ -1,4 +1,4 @@
-using PetaTest;
+using PetaTest;
 
 namespace ToolGood.Algorithm.Test.String
 {
@@ -141,7 +141,10 @@ public void LEFT_test()
             AlgorithmEngine engine = new AlgorithmEngine();
             var t = engine.TryEvaluate("LEFT('123222',3)", "");
             Assert.AreEqual(t, "123");
-        }
+
+			t = engine.TryEvaluate("LEFT('123222',30)", "");
+			Assert.AreEqual(t, "123222");
+		}
 
         [Test]
         public void LEN_test()
@@ -200,7 +203,10 @@ public void RIGHT_test()
             AlgorithmEngine engine = new AlgorithmEngine();
             var t = engine.TryEvaluate("RIGHT(\"123q\",3)", "");
             Assert.AreEqual(t, "23q");
-        }
+
+			t = engine.TryEvaluate("RIGHT(\"123q\",30)", "");
+			Assert.AreEqual(t, "123q");
+		}
 
         [Test]
         public void RMB_test()

csharp/ToolGood.Algorithm/Internals/Functions/String/Function_LEFT.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using ToolGood.Algorithm.Enums;
 
@@ -27,8 +27,10 @@ public override Operand Evaluate(AlgorithmEngine engine, Func<AlgorithmEngine, s
 			if (args2.IntValue < 0) {
 				return ParameterError(2);
 			}
-			int length = Math.Min(args2.IntValue, args1.TextValue.Length);
-			return Operand.Create(args1.TextValue.Substring(0, length));
+			if(args2.IntValue>= args1.TextValue.Length) {
+				return args1;
+			}
+			return Operand.Create(args1.TextValue.Substring(0, args2.IntValue));
 		}
 		public override OperandType GetResultType()
 		{

csharp/ToolGood.Algorithm/Internals/Functions/String/Function_MID.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using ToolGood.Algorithm.Enums;
 
@@ -15,26 +15,29 @@ public Function_MID(FunctionBase[] funcs) : base(funcs)
 		public override Operand Evaluate(AlgorithmEngine engine, Func<AlgorithmEngine, string, Operand> tempParameter)
 		{
 			var args1 = GetText_1(engine, tempParameter);
-			if (args1.IsErrorOrNone) { return args1; }
+			if(args1.IsErrorOrNone) { return args1; }
 			var args2 = GetNumber_2(engine, tempParameter);
-			if (args2.IsErrorOrNone) { return args2; }
+			if(args2.IsErrorOrNone) { return args2; }
 			var args3 = GetNumber_3(engine, tempParameter);
-			if (args3.IsErrorOrNone) { return args3; }
+			if(args3.IsErrorOrNone) { return args3; }
 
 			var text = args1.TextValue;
 			var startIndex = args2.IntValue - engine.ExcelIndex;
 			var length = args3.IntValue;
 
-			if (startIndex < 0) {
+			if(startIndex < 0) {
 				return ParameterError(2);
 			}
-			if (length < 0) {
+			if(length < 0) {
 				return ParameterError(3);
 			}
-			if (startIndex >= text.Length) {
+			if(startIndex == 0 && length >= text.Length) {
+				return args1;
+			}
+			if(startIndex >= text.Length) {
 				return Operand.Create(string.Empty);
 			}
-			if (startIndex + length > text.Length) {
+			if(startIndex + length > text.Length) {
 				length = text.Length - startIndex;
 			}
 			return Operand.Create(text.Substring(startIndex, length));

csharp/ToolGood.Algorithm/Internals/Functions/String/Function_RIGHT.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using ToolGood.Algorithm.Enums;
 
@@ -15,21 +15,24 @@ public Function_RIGHT(FunctionBase[] funcs) : base(funcs)
 		public override Operand Evaluate(AlgorithmEngine engine, Func<AlgorithmEngine, string, Operand> tempParameter)
 		{
 			var args1 = GetText_1(engine, tempParameter);
-			if (args1.IsErrorOrNone) { return args1; }
+			if(args1.IsErrorOrNone) { return args1; }
 
-			if (args1.TextValue.Length == 0) {
+			if(args1.TextValue.Length == 0) {
 				return Operand.Create(string.Empty);
 			}
-			if (func2 == null) {
+			if(func2 == null) {
 				return Operand.Create(args1.TextValue.Substring(args1.TextValue.Length - 1, 1));
 			}
 			var args2 = GetNumber_2(engine, tempParameter);
-			if (args2.IsErrorOrNone) { return args2; }
-			if (args2.IntValue < 0) {
+			if(args2.IsErrorOrNone) { return args2; }
+			if(args2.IntValue < 0) {
 				return ParameterError(2);
 			}
-			int length = Math.Min(args2.IntValue, args1.TextValue.Length);
-			int start = args1.TextValue.Length - length;
+			if(args2.IntValue >= args1.TextValue.Length) {
+				return args1;
+			}
+			int length = args2.IntValue;
+			int start = args1.TextValue.Length - args2.IntValue;
 			return Operand.Create(args1.TextValue.Substring(start, length));
 		}
 		public override OperandType GetResultType()

csharp/ToolGood.Algorithm/ToolGood.Algorithm.csproj

@@ -19,7 +19,7 @@
     <Product>ToolGood.Algorithm</Product>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <SignAssembly>true</SignAssembly>
-    <Version>6.2.5.26</Version>
+    <Version>6.2.5.27</Version>
     <AssemblyOriginatorKeyFile>ToolGood.Algorithm.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\ToolGood.Algorithm.xml</DocumentationFile>