Skip to content

Commit 3183d51

Browse files
toolgoodtoolgood
committed
fix
1 parent 77dbecb commit 3183d51

File tree

11 files changed

+59
-58
lines changed

11 files changed

+59
-58
lines changed

‎csharp/ToolGood.Algorithm/AlgorithmEngineHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ public static DiyNameInfo GetDiyNames(String exp)
323323
if (antlrErrorListener.IsError) {
324324
throw new Exception(antlrErrorListener.ErrorMsg);
325325
}
326-
DiyNameVisitor visitor = new DiyNameVisitor();
326+
var visitor = new DiyNameVisitor();
327327
visitor.Visit(context);
328328
return visitor.diy;
329329
}
@@ -401,7 +401,7 @@ public static FunctionBase ParseFormula(string exp)
401401
/// <returns></returns>
402402
public static ConditionTree ParseCondition(string condition)
403403
{
404-
ConditionTree tree = new ConditionTree();
404+
var tree = new ConditionTree();
405405
if (string.IsNullOrWhiteSpace(condition)) {
406406
tree.Type = ConditionTreeType.Error;
407407
tree.ErrorMessage = "condition is null";

‎csharp/ToolGood.Algorithm/Internals/Base64.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static string ToBase64ForUrlString(byte[] input)
4949
/// <returns>Input base64ForUrl encoded string as the original byte array</returns>
5050
public static byte[] FromBase64ForUrlString(string base64ForUrlInput)
5151
{
52-
StringBuilder sb = new StringBuilder();
52+
var sb = new StringBuilder();
5353
foreach (var c in base64ForUrlInput) {
5454
if ((int)c >= 128) continue;
5555
var k = base64[c];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ public MyDate TryEvaluate_MyDate(AlgorithmEngine work, MyDate def, Func<string,
383383
/// <returns>A string that represents the current object.</returns>
384384
public override string ToString()
385385
{
386-
StringBuilder stringBuilder = new StringBuilder();
386+
var stringBuilder = new StringBuilder();
387387
ToString(stringBuilder, false);
388388
return stringBuilder.ToString();
389389
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
688688
}
689689
}
690690
if (args1.IsArray) {
691-
List<string> list = new List<string>();
691+
var list = new List<string>();
692692
var o = FunctionUtil.F_base_GetList(args1, list);
693693
if (o == false) return Operand.Error("Function '{0}' parameter {1} is error!", "Join", 1);
694694

@@ -700,7 +700,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
700700
args1 = args1.ToText("Function '{0}' parameter {1} is error!", "Join", 1);
701701
if (args1.IsError) { return args1; }
702702

703-
List<string> list = new List<string>();
703+
var list = new List<string>();
704704
for (int i = 1; i < args.Count; i++) {
705705
var o = FunctionUtil.F_base_GetList(args[i], list);
706706
if (o == false) return Operand.Error("Function '{0}' parameter {1} is error!", "Join", i + 1);

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
114114
var args = new List<Operand>(funcs.Length);
115115
for (int i = 0; i < funcs.Length; i++) { var aa = funcs[i].Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
116116

117-
List<decimal> list = new List<decimal>();
117+
var list = new List<decimal>();
118118
var o = FunctionUtil.F_base_GetList(args, list);
119119
if (o == false) { return Operand.Error("Function '{0}' parameter is error!", "Gcd"); }
120120

@@ -137,7 +137,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
137137
var args = new List<Operand>(funcs.Length);
138138
for (int i = 0; i < funcs.Length; i++) { var aa = funcs[i].Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
139139

140-
List<decimal> list = new List<decimal>();
140+
var list = new List<decimal>();
141141
var o = FunctionUtil.F_base_GetList(args, list);
142142
if (o == false) { return Operand.Error("Function '{0}' parameter is error!", "Lcm"); }
143143

@@ -1157,8 +1157,8 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
11571157
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { if (args1.IsError) { return args1; } }
11581158
var args2 = func2.Evaluate(work, tempParameter); if (args2.IsNotNumber) { if (args2.IsError) { return args2; } }
11591159

1160-
List<decimal> list1 = new List<decimal>();
1161-
List<decimal> list2 = new List<decimal>();
1160+
var list1 = new List<decimal>();
1161+
var list2 = new List<decimal>();
11621162

11631163
var o1 = FunctionUtil.F_base_GetList(args1, list1);
11641164
var o2 = FunctionUtil.F_base_GetList(args2, list2);
@@ -1192,8 +1192,8 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
11921192
{
11931193
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotNumber) { if (args1.IsError) { return args1; } }
11941194
var args2 = func2.Evaluate(work, tempParameter); if (args2.IsNotNumber) { if (args2.IsError) { return args2; } }
1195-
List<decimal> list1 = new List<decimal>();
1196-
List<decimal> list2 = new List<decimal>();
1195+
var list1 = new List<decimal>();
1196+
var list2 = new List<decimal>();
11971197
var o1 = FunctionUtil.F_base_GetList(args1, list1);
11981198
var o2 = FunctionUtil.F_base_GetList(args2, list2);
11991199
if (o1 == false) { return Operand.Error("Function '{0}' parameter {1} is error!", "Covar", 1); }
@@ -1354,7 +1354,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
13541354
{
13551355
var args = new List<Operand>();
13561356
foreach (var item in funcs) { var aa = item.Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
1357-
List<decimal> list = new List<decimal>();
1357+
var list = new List<decimal>();
13581358
var o = FunctionUtil.F_base_GetList(args, list);
13591359
if (o == false) { return Operand.Error("Function '{0}' parameter is error!", "Multinomial"); }
13601360

@@ -1386,7 +1386,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
13861386
var args = new List<Operand>(funcs.Length);
13871387
for (int i = 0; i < funcs.Length; i++) { var aa = funcs[i].Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
13881388

1389-
List<decimal> list = new List<decimal>();
1389+
var list = new List<decimal>();
13901390
var o = FunctionUtil.F_base_GetList(args, list);
13911391
if (o == false) { return Operand.Error("Function '{0}' parameter is error!", "Product"); }
13921392

@@ -1431,7 +1431,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
14311431
var args = new List<Operand>(funcs.Length);
14321432
for (int i = 0; i < funcs.Length; i++) { var aa = funcs[i].Evaluate(work, tempParameter); if (aa.IsError) { return aa; } args.Add(aa); }
14331433

1434-
List<decimal> list = new List<decimal>();
1434+
var list = new List<decimal>();
14351435
var o = FunctionUtil.F_base_GetList(args, list);
14361436
if (o == false) { return Operand.Error("Function '{0}' parameter is error!", "SumSQ"); }
14371437

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
2020

2121
private static String F_base_ToDBC(String input)
2222
{
23-
StringBuilder sb = new StringBuilder(input);
23+
var sb = new StringBuilder(input);
2424
for (int i = 0; i < input.Length; i++) {
2525
var c = input[i];
2626
if (c == 12288) {
@@ -52,7 +52,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
5252

5353
private static String F_base_ToSBC(String input)
5454
{
55-
StringBuilder sb = new StringBuilder(input);
55+
var sb = new StringBuilder(input);
5656
for (int i = 0; i < input.Length; i++) {
5757
var c = input[i];
5858
if (c == ' ') {
@@ -97,7 +97,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
9797
{
9898
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotText) { args1 = args1.ToText("Function '{0}' parameter is error!", "Clean"); if (args1.IsError) { return args1; } }
9999
var t = args1.TextValue;
100-
StringBuilder sb = new StringBuilder(t.Length);
100+
var sb = new StringBuilder(t.Length);
101101
for (int i = 0; i < t.Length; i++) {
102102
var c = t[i];
103103
if (c != '\f' && c != '\n' && c != '\r' && c != '\t' && c != '\v') {
@@ -141,7 +141,7 @@ public Function_CONCATENATE(FunctionBase[] funcs) : base(funcs)
141141

142142
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
143143
{
144-
StringBuilder sb = new StringBuilder();
144+
var sb = new StringBuilder();
145145
for (int i = 0; i < funcs.Length; i++) {
146146
var a = funcs[i].Evaluate(work, tempParameter); if (a.IsNotText) { a = a.ToText("Function '{0}' parameter {1} is error!", "Concatenate", i + 1); if (a.IsError) { return a; } }
147147
sb.Append(a.TextValue);
@@ -281,7 +281,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
281281
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotText) { args1 = args1.ToText("Function '{0}' parameter is error!", "Proper"); if (args1.IsError) { return args1; } }
282282

283283
var text = args1.TextValue;
284-
StringBuilder sb = new StringBuilder(text);
284+
var sb = new StringBuilder(text);
285285
bool isFirst = true;
286286
for (int i = 0; i < text.Length; i++) {
287287
var t = text[i];
@@ -327,7 +327,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
327327
var length = args3.IntValue;
328328
var newtext = args4.TextValue;
329329

330-
StringBuilder sb = new StringBuilder(oldtext.Length + newtext.Length);
330+
var sb = new StringBuilder(oldtext.Length + newtext.Length);
331331
for (int i = 0; i < oldtext.Length; i++) {
332332
if (i < start) {
333333
sb.Append(oldtext[i]);
@@ -361,7 +361,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
361361
if (length < 0) {
362362
return Operand.Error("Function '{0}' parameter {1} is error!", "Rept", 2);
363363
}
364-
StringBuilder sb = new StringBuilder(newtext.Length * length);
364+
var sb = new StringBuilder(newtext.Length * length);
365365
for (int i = 0; i < length; i++) {
366366
sb.Append(newtext);
367367
}
@@ -469,7 +469,7 @@ public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tem
469469
int index = args4.IntValue;
470470

471471
int index2 = 0;
472-
StringBuilder sb = new StringBuilder(text.Length + newtext.Length);
472+
var sb = new StringBuilder(text.Length + newtext.Length);
473473
for (int i = 0; i < text.Length; i++) {
474474
bool b = true;
475475
for (int j = 0; j < oldtext.Length; j++) {

0 commit comments

Comments
 (0)