Skip to content

Commit 879635a

Browse files
committed
fix
1 parent 7d58480 commit 879635a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -737,11 +737,11 @@ public override Operand Calculate(AlgorithmEngine work)
737737
if (funcs.Length == 2) {
738738
return Operand.Create(text.AsSpan().IndexOf(args2.TextValue) + work.ExcelIndex);
739739
}
740-
var args3 = funcs[2].Calculate(work); if (args3.Type != OperandType.TEXT) { args3 = args3.ToText("Function INDEXOF parameter 3 is error!"); if (args3.IsError) { return args3; } }
740+
var args3 = funcs[2].Calculate(work); if (args3.Type != OperandType.NUMBER) { args3 = args3.ToNumber("Function INDEXOF parameter 3 is error!"); if (args3.IsError) { return args3; } }
741741
if (funcs.Length == 3) {
742742
return Operand.Create(text.AsSpan(args3.IntValue).IndexOf(args2.TextValue) + args3.IntValue + work.ExcelIndex);
743743
}
744-
var args4 = funcs[3].Calculate(work); if (args4.Type != OperandType.TEXT) { args4 = args4.ToText("Function INDEXOF parameter 4 is error!"); if (args4.IsError) { return args4; } }
744+
var args4 = funcs[3].Calculate(work); if (args4.Type != OperandType.NUMBER) { args4 = args4.ToNumber("Function INDEXOF parameter 4 is error!"); if (args4.IsError) { return args4; } }
745745
return Operand.Create(text.IndexOf(args2.TextValue, args3.IntValue, args4.IntValue) + work.ExcelIndex);
746746
}
747747
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
@@ -771,11 +771,11 @@ public override Operand Calculate(AlgorithmEngine work)
771771
if (funcs.Length == 2) {
772772
return Operand.Create(text.AsSpan().LastIndexOf(args2.TextValue) + work.ExcelIndex);
773773
}
774-
var args3 = funcs[2].Calculate(work); if (args3.Type != OperandType.TEXT) { args3 = args3.ToText("Function LASTINDEXOF parameter 3 is error!"); if (args3.IsError) { return args3; } }
774+
var args3 = funcs[2].Calculate(work); if (args3.Type != OperandType.NUMBER) { args3 = args3.ToNumber("Function LASTINDEXOF parameter 3 is error!"); if (args3.IsError) { return args3; } }
775775
if (funcs.Length == 3) {
776776
return Operand.Create(text.AsSpan(0, args3.IntValue).LastIndexOf(args2.TextValue) + work.ExcelIndex);
777777
}
778-
var args4 = funcs[3].Calculate(work); if (args4.Type != OperandType.TEXT) { args4 = args4.ToText("Function LASTINDEXOF parameter 4 is error!"); if (args4.IsError) { return args4; } }
778+
var args4 = funcs[3].Calculate(work); if (args4.Type != OperandType.NUMBER) { args4 = args4.ToNumber("Function LASTINDEXOF parameter 4 is error!"); if (args4.IsError) { return args4; } }
779779
return Operand.Create(text.LastIndexOf(args2.TextValue, args3.IntValue, args4.IntValue) + work.ExcelIndex);
780780
}
781781
public override void ToString(StringBuilder stringBuilder, bool addBrackets)

csharp/ToolGood.Algorithm.Fast/Internals/Functions/FunctionBase.math.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public Function_SQRT(FunctionBase func1) : base(func1)
8686

8787
public override Operand Calculate(AlgorithmEngine work)
8888
{
89-
var args1 = func1.Calculate(work); if (args1.Type != OperandType.NUMBER) { args1 = args1.ToNumber("Function SIGN parameter is error!"); if (args1.IsError) { return args1; } }
89+
var args1 = func1.Calculate(work); if (args1.Type != OperandType.NUMBER) { args1 = args1.ToNumber("Function SQRT parameter is error!"); if (args1.IsError) { return args1; } }
9090
return Operand.Create(Math.Sqrt((double)args1.NumberValue));
9191
}
9292
public override void ToString(StringBuilder stringBuilder, bool addBrackets)
@@ -105,7 +105,7 @@ public Function_TRUNC(FunctionBase func1) : base(func1)
105105

106106
public override Operand Calculate(AlgorithmEngine work)
107107
{
108-
var args1 = func1.Calculate(work); if (args1.Type != OperandType.NUMBER) { args1 = args1.ToNumber("Function SIGN parameter is error!"); if (args1.IsError) { return args1; } }
108+
var args1 = func1.Calculate(work); if (args1.Type != OperandType.NUMBER) { args1 = args1.ToNumber("Function TRUNC parameter is error!"); if (args1.IsError) { return args1; } }
109109
return Operand.Create((int)(args1.NumberValue));
110110
}
111111
public override void ToString(StringBuilder stringBuilder, bool addBrackets)

0 commit comments

Comments
 (0)