Skip to content

Commit e2b09d6

Browse files
toolgoodtoolgood
committed
fix
1 parent ae7ae39 commit e2b09d6

File tree

4 files changed

+134
-172
lines changed

4 files changed

+134
-172
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ public override Operand Calculate(AlgorithmEngine work)
980980
var index = 1;
981981
bool b = true;
982982
foreach (var item in funcs) {
983-
var a = item.Calculate(work).ToBoolean($"Function AND parameter {index++} is error!");
983+
var a = item.Calculate(work).ToBoolean("Function AND parameter {0} is error!", index++);
984984
if (a.IsError) { return a; }
985985
if (a.BooleanValue == false) b = false;
986986
}
@@ -1004,7 +1004,7 @@ public override Operand Calculate(AlgorithmEngine work)
10041004
var index = 1;
10051005
bool b = false;
10061006
foreach (var item in funcs) {
1007-
var a = item.Calculate(work).ToBoolean($"Function OR parameter {index++} is error!");
1007+
var a = item.Calculate(work).ToBoolean("Function OR parameter {0} is error!", index++);
10081008
if (a.IsError) { return a; }
10091009
if (a.BooleanValue) b = true;
10101010
}

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public Function_BASE64TOTEXT(FunctionBase[] funcs) : base(funcs)
9595
public override Operand Calculate(AlgorithmEngine work)
9696
{
9797
var args = new List<Operand>(); int index = 1;
98-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function BASE64TOTEXT parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
98+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function BASE64TOTEXT parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
9999
try {
100100
Encoding encoding;
101101
if (args.Count == 1) {
@@ -123,7 +123,7 @@ public Function_BASE64URLTOTEXT(FunctionBase[] funcs) : base(funcs)
123123
public override Operand Calculate(AlgorithmEngine work)
124124
{
125125
var args = new List<Operand>(); int index = 1;
126-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function BASE64URLTOTEXT parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
126+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function BASE64URLTOTEXT parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
127127
try {
128128
Encoding encoding;
129129
if (args.Count == 1) {
@@ -151,7 +151,7 @@ public Function_TEXTTOBASE64(FunctionBase[] funcs) : base(funcs)
151151
public override Operand Calculate(AlgorithmEngine work)
152152
{
153153
var args = new List<Operand>(); int index = 1;
154-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function TEXTTOBASE64 parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
154+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function TEXTTOBASE64 parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
155155
try {
156156
Encoding encoding;
157157
if (args.Count == 1) {
@@ -181,7 +181,7 @@ public Function_TEXTTOBASE64URL(FunctionBase[] funcs) : base(funcs)
181181
public override Operand Calculate(AlgorithmEngine work)
182182
{
183183
var args = new List<Operand>(); int index = 1;
184-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function TEXTTOBASE64URL parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
184+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function TEXTTOBASE64URL parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
185185
try {
186186
Encoding encoding;
187187
if (args.Count == 1) {
@@ -290,7 +290,7 @@ public Function_MD5(FunctionBase[] funcs) : base(funcs)
290290
public override Operand Calculate(AlgorithmEngine work)
291291
{
292292
var args = new List<Operand>(); int index = 1;
293-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function MD5 parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
293+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function MD5 parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
294294
try {
295295
Encoding encoding;
296296
if (args.Count == 1) {
@@ -319,7 +319,7 @@ public Function_SHA1(FunctionBase[] funcs) : base(funcs)
319319
public override Operand Calculate(AlgorithmEngine work)
320320
{
321321
var args = new List<Operand>(); int index = 1;
322-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function SHA1 parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
322+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function SHA1 parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
323323
try {
324324
Encoding encoding;
325325
if (args.Count == 1) {
@@ -348,7 +348,7 @@ public Function_SHA256(FunctionBase[] funcs) : base(funcs)
348348
public override Operand Calculate(AlgorithmEngine work)
349349
{
350350
var args = new List<Operand>(); int index = 1;
351-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function SHA256 parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
351+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function SHA256 parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
352352
try {
353353
Encoding encoding;
354354
if (args.Count == 1) {
@@ -377,7 +377,7 @@ public Function_SHA512(FunctionBase[] funcs) : base(funcs)
377377
public override Operand Calculate(AlgorithmEngine work)
378378
{
379379
var args = new List<Operand>(); int index = 1;
380-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function SHA512 parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
380+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function SHA512 parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
381381
try {
382382
Encoding encoding;
383383
if (args.Count == 1) {
@@ -406,7 +406,7 @@ public Function_CRC32(FunctionBase[] funcs) : base(funcs)
406406
public override Operand Calculate(AlgorithmEngine work)
407407
{
408408
var args = new List<Operand>(); int index = 1;
409-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function CRC32 parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
409+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function CRC32 parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
410410
try {
411411
Encoding encoding;
412412
if (args.Count == 1) {
@@ -435,7 +435,7 @@ public Function_HMACMD5(FunctionBase[] funcs) : base(funcs)
435435
public override Operand Calculate(AlgorithmEngine work)
436436
{
437437
var args = new List<Operand>(); int index = 1;
438-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function HMACMD5 parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
438+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function HMACMD5 parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
439439
try {
440440
Encoding encoding;
441441
if (args.Count == 2) {
@@ -464,7 +464,7 @@ public Function_HMACSHA1(FunctionBase[] funcs) : base(funcs)
464464
public override Operand Calculate(AlgorithmEngine work)
465465
{
466466
var args = new List<Operand>(); int index = 1;
467-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function HMACSHA1 parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
467+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function HMACSHA1 parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
468468
try {
469469
Encoding encoding;
470470
if (args.Count == 2) {
@@ -493,7 +493,7 @@ public Function_HMACSHA256(FunctionBase[] funcs) : base(funcs)
493493
public override Operand Calculate(AlgorithmEngine work)
494494
{
495495
var args = new List<Operand>(); int index = 1;
496-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function HMACSHA256 parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
496+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function HMACSHA256 parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
497497
try {
498498
Encoding encoding;
499499
if (args.Count == 2) {
@@ -522,7 +522,7 @@ public Function_HMACSHA512(FunctionBase[] funcs) : base(funcs)
522522
public override Operand Calculate(AlgorithmEngine work)
523523
{
524524
var args = new List<Operand>(); int index = 1;
525-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function HMACSHA512 parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
525+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function HMACSHA512 parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
526526
try {
527527
Encoding encoding;
528528
if (args.Count == 2) {
@@ -551,7 +551,7 @@ public Function_TRIMSTART(FunctionBase[] funcs) : base(funcs)
551551
public override Operand Calculate(AlgorithmEngine work)
552552
{
553553
var args = new List<Operand>(); int index = 1;
554-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function TRIMSTART parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
554+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function TRIMSTART parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
555555
if (args.Count == 1) {
556556
return Operand.Create(args[0].TextValue.TrimStart());
557557
} else {
@@ -574,7 +574,7 @@ public Function_TRIMEND(FunctionBase[] funcs) : base(funcs)
574574
public override Operand Calculate(AlgorithmEngine work)
575575
{
576576
var args = new List<Operand>(); int index = 1;
577-
foreach (var item in funcs) { var a = item.Calculate(work).ToText($"Function TRIMEND parameter {index++} is error!"); if (a.IsError) { return a; } args.Add(a); }
577+
foreach (var item in funcs) { var a = item.Calculate(work).ToText("Function TRIMEND parameter {0} is error!", index++); if (a.IsError) { return a; } args.Add(a); }
578578
if (args.Count == 1) {
579579
return Operand.Create(args[0].TextValue.TrimEnd());
580580
} else {
@@ -693,7 +693,7 @@ public override Operand Calculate(AlgorithmEngine work)
693693
List<string> list = new List<string>();
694694
for (int i = 1; i < args.Count; i++) {
695695
var o = FunctionUtil.F_base_GetList(args[i], list);
696-
if (o == false) return Operand.Error($"Function JOIN parameter {i + 1} is error!");
696+
if (o == false) return Operand.Error("Function JOIN parameter {i + 1} is error!");
697697
}
698698
return Operand.Create(string.Join(args1.TextValue, list));
699699
}

0 commit comments

Comments
 (0)