Skip to content

Commit 1cbc436

Browse files
author
linzhijun
committed
fix
1 parent d4c81d5 commit 1cbc436

File tree

8 files changed

+601
-601
lines changed

8 files changed

+601
-601
lines changed

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

Lines changed: 32 additions & 32 deletions
Large diffs are not rendered by default.

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

Lines changed: 34 additions & 34 deletions
Large diffs are not rendered by default.

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public Function_IF(FunctionBase func1, FunctionBase func2, FunctionBase func3) :
1111
{
1212
}
1313

14-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
14+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
1515
{
1616
var args1 = func1.Evaluate(work, tempParameter); if (args1.IsNotBoolean) { args1 = args1.ToBoolean("Function '{0}' parameter {1} is error!", "If", 1); if (args1.IsError) { return args1; } }
1717
if (args1.BooleanValue) return func2.Evaluate(work, tempParameter);
@@ -30,7 +30,7 @@ public Function_IFERROR(FunctionBase func1, FunctionBase func2, FunctionBase fun
3030
{
3131
}
3232

33-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
33+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
3434
{
3535
var args1 = func1.Evaluate(work, tempParameter);
3636
if (args1.IsError) { return func2.Evaluate(work, tempParameter); }
@@ -52,7 +52,7 @@ public Function_ISNUMBER(FunctionBase func1) : base(func1)
5252
{
5353
}
5454

55-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
55+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
5656
{
5757
var args1 = func1.Evaluate(work, tempParameter);
5858
if (args1.IsNumber) { return Operand.True; }
@@ -70,7 +70,7 @@ public Function_ISTEXT(FunctionBase func1) : base(func1)
7070
{
7171
}
7272

73-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
73+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
7474
{
7575
var args1 = func1.Evaluate(work, tempParameter);
7676
if (args1.IsText) { return Operand.True; }
@@ -88,7 +88,7 @@ public Function_ISERROR(FunctionBase func1, FunctionBase func2) : base(func1, fu
8888
{
8989
}
9090

91-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
91+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
9292
{
9393
var args1 = func1.Evaluate(work, tempParameter);
9494
if (func2 != null) {
@@ -110,7 +110,7 @@ public Function_ISNULL(FunctionBase func1, FunctionBase func2) : base(func1, fun
110110
{
111111
}
112112

113-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
113+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
114114
{
115115
var args1 = func1.Evaluate(work, tempParameter);
116116
if (func2 != null) {
@@ -134,7 +134,7 @@ public Function_ISNULLORERROR(FunctionBase func1, FunctionBase func2) : base(fun
134134
{
135135
}
136136

137-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
137+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
138138
{
139139
var args1 = func1.Evaluate(work, tempParameter);
140140
if (func2 != null) {
@@ -158,7 +158,7 @@ public Function_ISEVEN(FunctionBase func1) : base(func1)
158158
{
159159
}
160160

161-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
161+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
162162
{
163163
var args1 = func1.Evaluate(work, tempParameter);
164164
if (args1.IsNumber) {
@@ -178,7 +178,7 @@ public Function_ISODD(FunctionBase func1) : base(func1)
178178
{
179179
}
180180

181-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
181+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
182182
{
183183
var args1 = func1.Evaluate(work, tempParameter);
184184
if (args1.IsNumber) {
@@ -198,7 +198,7 @@ public Function_ISLOGICAL(FunctionBase func1) : base(func1)
198198
{
199199
}
200200

201-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
201+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
202202
{
203203
var args1 = func1.Evaluate(work, tempParameter);
204204
if (args1.IsBoolean) { return Operand.True; }
@@ -216,7 +216,7 @@ public Function_ISNONTEXT(FunctionBase func1) : base(func1)
216216
{
217217
}
218218

219-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
219+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
220220
{
221221
var args1 = func1.Evaluate(work, tempParameter);
222222
if (args1.IsNotText) { return Operand.True; }
@@ -236,7 +236,7 @@ public Function_ISNULLOREMPTY(FunctionBase func1) : base(func1)
236236
{
237237
}
238238

239-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
239+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
240240
{
241241
var args1 = func1.Evaluate(work, tempParameter);
242242
if (args1.IsNull) { return Operand.True; }
@@ -255,7 +255,7 @@ public Function_ISNULLORWHITESPACE(FunctionBase func1) : base(func1)
255255
{
256256
}
257257

258-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
258+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
259259
{
260260
var args1 = func1.Evaluate(work, tempParameter);
261261
if (args1.IsNull) { return Operand.True; }
@@ -276,7 +276,7 @@ public Function_NOT(FunctionBase func1) : base(func1)
276276
{
277277
}
278278

279-
public override Operand Evaluate(AlgorithmEngine work, Func<string, Operand> tempParameter)
279+
public override Operand Evaluate(AlgorithmEngine work, Func<AlgorithmEngine, string, Operand> tempParameter)
280280
{
281281
var args1 = func1.Evaluate(work, tempParameter);
282282
if (args1.IsNotBoolean) { args1 = args1.ToBoolean("Function '{0}' parameter is error!", "Not"); if (args1.IsError) { return args1; } }

0 commit comments

Comments
 (0)